diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 643a7e1..bd5bc57 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -203,6 +203,7 @@ } searchButton.setOnClickListener { + keywords = wellCodeView.text.toString() pageIndex = 1 obtainSearchResult() rightDrawerLayout.closeDrawer(GravityCompat.END) diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 643a7e1..bd5bc57 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -203,6 +203,7 @@ } searchButton.setOnClickListener { + keywords = wellCodeView.text.toString() pageIndex = 1 obtainSearchResult() rightDrawerLayout.closeDrawer(GravityCompat.END) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt index e6e6045..aa5a6be 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt @@ -68,7 +68,12 @@ contentModels.add(bean) it.data!!.list?.forEach { contentTypeBean -> - contentModels.add(contentTypeBean) + if (contentTypeBean.name.contains("液位") || + contentTypeBean.name.contains("水") || + contentTypeBean.name.contains("噪声") + ) { + contentModels.add(contentTypeBean) + } } contentTypeAdapter = object : TagAdapter(contentModels) { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 643a7e1..bd5bc57 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -203,6 +203,7 @@ } searchButton.setOnClickListener { + keywords = wellCodeView.text.toString() pageIndex = 1 obtainSearchResult() rightDrawerLayout.closeDrawer(GravityCompat.END) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt index e6e6045..aa5a6be 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt @@ -68,7 +68,12 @@ contentModels.add(bean) it.data!!.list?.forEach { contentTypeBean -> - contentModels.add(contentTypeBean) + if (contentTypeBean.name.contains("液位") || + contentTypeBean.name.contains("水") || + contentTypeBean.name.contains("噪声") + ) { + contentModels.add(contentTypeBean) + } } contentTypeAdapter = object : TagAdapter(contentModels) { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 69b8b35..bdae44e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -1,8 +1,9 @@ package com.casic.qd.smartwell.view -import android.view.View +import android.content.Context import androidx.lifecycle.ViewModelProvider import com.casic.qd.smartwell.R +import com.casic.qd.smartwell.extensions.toTypeName import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.WellViewModel @@ -11,13 +12,17 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class WellDetailActivity : KotlinBaseActivity() { + private val context: Context = this@WellDetailActivity private lateinit var wellDetailViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_detail @@ -44,12 +49,12 @@ wellNameView.text = wellDetail.wellName wellCodeView.text = wellDetail.wellCode - val typeName = if (wellDetail.wellTypeName.toString().isBlank()) { - resources.getString(R.string.unknown) + val wellType = if (wellDetail.wellType.toString().isBlank()) { + "10" } else { - wellDetail.wellTypeName.toString() + wellDetail.wellType } - wellTypeView.text = typeName + wellTypeView.text = wellType.toTypeName() ownershipView.text = wellDetail.deptName val depth = if (wellDetail.deep.toString().isBlank()) { resources.getString(R.string.unknown) @@ -59,27 +64,12 @@ wellDepthView.text = depth //绑定窨井位置 val wellPosition = wellDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("闸井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - tipsImageView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition } }) wellDetailViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 643a7e1..bd5bc57 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -203,6 +203,7 @@ } searchButton.setOnClickListener { + keywords = wellCodeView.text.toString() pageIndex = 1 obtainSearchResult() rightDrawerLayout.closeDrawer(GravityCompat.END) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt index e6e6045..aa5a6be 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt @@ -68,7 +68,12 @@ contentModels.add(bean) it.data!!.list?.forEach { contentTypeBean -> - contentModels.add(contentTypeBean) + if (contentTypeBean.name.contains("液位") || + contentTypeBean.name.contains("水") || + contentTypeBean.name.contains("噪声") + ) { + contentModels.add(contentTypeBean) + } } contentTypeAdapter = object : TagAdapter(contentModels) { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 69b8b35..bdae44e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -1,8 +1,9 @@ package com.casic.qd.smartwell.view -import android.view.View +import android.content.Context import androidx.lifecycle.ViewModelProvider import com.casic.qd.smartwell.R +import com.casic.qd.smartwell.extensions.toTypeName import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.WellViewModel @@ -11,13 +12,17 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class WellDetailActivity : KotlinBaseActivity() { + private val context: Context = this@WellDetailActivity private lateinit var wellDetailViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_detail @@ -44,12 +49,12 @@ wellNameView.text = wellDetail.wellName wellCodeView.text = wellDetail.wellCode - val typeName = if (wellDetail.wellTypeName.toString().isBlank()) { - resources.getString(R.string.unknown) + val wellType = if (wellDetail.wellType.toString().isBlank()) { + "10" } else { - wellDetail.wellTypeName.toString() + wellDetail.wellType } - wellTypeView.text = typeName + wellTypeView.text = wellType.toTypeName() ownershipView.text = wellDetail.deptName val depth = if (wellDetail.deep.toString().isBlank()) { resources.getString(R.string.unknown) @@ -59,27 +64,12 @@ wellDepthView.text = depth //绑定窨井位置 val wellPosition = wellDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("闸井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - tipsImageView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition } }) wellDetailViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index a512774..cfbcfc9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -25,30 +25,38 @@ val areaDataModel = MutableLiveData() fun obtainAlarmType() = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmType() val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success typeModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmContent(type) val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success contentModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 643a7e1..bd5bc57 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -203,6 +203,7 @@ } searchButton.setOnClickListener { + keywords = wellCodeView.text.toString() pageIndex = 1 obtainSearchResult() rightDrawerLayout.closeDrawer(GravityCompat.END) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt index e6e6045..aa5a6be 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt @@ -68,7 +68,12 @@ contentModels.add(bean) it.data!!.list?.forEach { contentTypeBean -> - contentModels.add(contentTypeBean) + if (contentTypeBean.name.contains("液位") || + contentTypeBean.name.contains("水") || + contentTypeBean.name.contains("噪声") + ) { + contentModels.add(contentTypeBean) + } } contentTypeAdapter = object : TagAdapter(contentModels) { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 69b8b35..bdae44e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -1,8 +1,9 @@ package com.casic.qd.smartwell.view -import android.view.View +import android.content.Context import androidx.lifecycle.ViewModelProvider import com.casic.qd.smartwell.R +import com.casic.qd.smartwell.extensions.toTypeName import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.WellViewModel @@ -11,13 +12,17 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class WellDetailActivity : KotlinBaseActivity() { + private val context: Context = this@WellDetailActivity private lateinit var wellDetailViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_detail @@ -44,12 +49,12 @@ wellNameView.text = wellDetail.wellName wellCodeView.text = wellDetail.wellCode - val typeName = if (wellDetail.wellTypeName.toString().isBlank()) { - resources.getString(R.string.unknown) + val wellType = if (wellDetail.wellType.toString().isBlank()) { + "10" } else { - wellDetail.wellTypeName.toString() + wellDetail.wellType } - wellTypeView.text = typeName + wellTypeView.text = wellType.toTypeName() ownershipView.text = wellDetail.deptName val depth = if (wellDetail.deep.toString().isBlank()) { resources.getString(R.string.unknown) @@ -59,27 +64,12 @@ wellDepthView.text = depth //绑定窨井位置 val wellPosition = wellDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("闸井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - tipsImageView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition } }) wellDetailViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index a512774..cfbcfc9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -25,30 +25,38 @@ val areaDataModel = MutableLiveData() fun obtainAlarmType() = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmType() val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success typeModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmContent(type) val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success contentModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) 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 58775d2..9adbf82 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,152 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 643a7e1..bd5bc57 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -203,6 +203,7 @@ } searchButton.setOnClickListener { + keywords = wellCodeView.text.toString() pageIndex = 1 obtainSearchResult() rightDrawerLayout.closeDrawer(GravityCompat.END) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt index e6e6045..aa5a6be 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt @@ -68,7 +68,12 @@ contentModels.add(bean) it.data!!.list?.forEach { contentTypeBean -> - contentModels.add(contentTypeBean) + if (contentTypeBean.name.contains("液位") || + contentTypeBean.name.contains("水") || + contentTypeBean.name.contains("噪声") + ) { + contentModels.add(contentTypeBean) + } } contentTypeAdapter = object : TagAdapter(contentModels) { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 69b8b35..bdae44e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -1,8 +1,9 @@ package com.casic.qd.smartwell.view -import android.view.View +import android.content.Context import androidx.lifecycle.ViewModelProvider import com.casic.qd.smartwell.R +import com.casic.qd.smartwell.extensions.toTypeName import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.WellViewModel @@ -11,13 +12,17 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class WellDetailActivity : KotlinBaseActivity() { + private val context: Context = this@WellDetailActivity private lateinit var wellDetailViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_detail @@ -44,12 +49,12 @@ wellNameView.text = wellDetail.wellName wellCodeView.text = wellDetail.wellCode - val typeName = if (wellDetail.wellTypeName.toString().isBlank()) { - resources.getString(R.string.unknown) + val wellType = if (wellDetail.wellType.toString().isBlank()) { + "10" } else { - wellDetail.wellTypeName.toString() + wellDetail.wellType } - wellTypeView.text = typeName + wellTypeView.text = wellType.toTypeName() ownershipView.text = wellDetail.deptName val depth = if (wellDetail.deep.toString().isBlank()) { resources.getString(R.string.unknown) @@ -59,27 +64,12 @@ wellDepthView.text = depth //绑定窨井位置 val wellPosition = wellDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("闸井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - tipsImageView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition } }) wellDetailViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index a512774..cfbcfc9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -25,30 +25,38 @@ val areaDataModel = MutableLiveData() fun obtainAlarmType() = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmType() val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success typeModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmContent(type) val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success contentModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) 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 58775d2..9adbf82 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,152 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - + + + android:layout_toEndOf="@id/tempView" + android:scrollbars="vertical"> - - - - - + android:layout_gravity="center_vertical" + android:gravity="end" + android:paddingHorizontal="@dimen/dp_10" + android:text="@string/unknown" + android:textColor="@color/subTextColor" + android:textSize="@dimen/textFontSize" /> + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt index e8c4412..fce6569 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/String.kt @@ -82,6 +82,25 @@ } } +fun String.toTypeName(): String { + return when (this) { + "1" -> "给水井" + "2" -> "污水井" + "3" -> "燃气井" + "4" -> "热力井" + "5" -> "电力井" + "6" -> "交通井" + "7" -> "路灯井" + "8" -> "通信井" + "9" -> "监控井" + "11" -> "氧气井" + "12" -> "二氧化碳井" + else -> { + "其他" + } + } +} + //拼接图片地址 fun String.combineImagePath(): String { if (this.isEmpty()) return this diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt index 809e6c0..51f8cb6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt @@ -19,6 +19,8 @@ import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* +import kotlinx.android.synthetic.main.activity_order_completed_detail.dispatchDateView +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.* @@ -54,36 +56,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 76f8077..1c78aff 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -33,6 +33,8 @@ import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* +import kotlinx.android.synthetic.main.activity_order_in_handle_detail.dispatchDateView +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.* import java.io.File @@ -103,36 +105,15 @@ 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(this)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(this)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition + //现场情况 val firstState = orderDetail.firstState.toString() currentStateView.text = firstState diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index dd87a66..a8828a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -28,9 +28,10 @@ import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* +import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.dispatchDateView +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.* import java.io.File @@ -103,37 +104,14 @@ 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(context)) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor(context)) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 ac18ef0..f21bae3 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 @@ -19,8 +19,8 @@ import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import com.pengxh.kt.lite.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 : KotlinBaseActivity() { @@ -61,26 +61,12 @@ devCodeView.text = orderDetail.devcode alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - locationTipsView.visibility = View.VISIBLE - locationTipsView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("窨井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }).build() - .show() - } + wellLocationView.textSize = 12f } else { - locationTipsView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition dispatchDateView.text = orderDetail.createTime //导航 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 8b95aa8..c02bcae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -25,8 +25,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class OrderSearchResultActivity : KotlinBaseActivity() { @@ -142,8 +142,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) workOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt index edad500..1fdddfd 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchAlarmActivity.kt @@ -4,6 +4,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.AreaModel +import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AlarmViewModel import com.casic.qd.smartwell.vm.AreaViewModel @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet.BottomListSheetBuilder import kotlinx.android.synthetic.main.activity_alarm_search.* import kotlinx.android.synthetic.main.include_base_title.* @@ -75,7 +77,12 @@ val sheetBuilder = BottomListSheetBuilder(this) sheetBuilder.setTitle("告警内容") it.data?.list?.forEach { dataBean -> - sheetBuilder.addItem(dataBean.name) + if (dataBean.name.contains("液位") || + dataBean.name.contains("水") || + dataBean.name.contains("噪声") + ) { + sheetBuilder.addItem(dataBean.name) + } } sheetBuilder.setGravityCenter(true) .setOnSheetItemClickListener { dialog, _, position, tag -> @@ -87,6 +94,17 @@ } }) + alarmViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } + }) + //地区三级联动 areaView.setOnClickListener { areaViewModel.obtainArea() diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 643a7e1..bd5bc57 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -203,6 +203,7 @@ } searchButton.setOnClickListener { + keywords = wellCodeView.text.toString() pageIndex = 1 obtainSearchResult() rightDrawerLayout.closeDrawer(GravityCompat.END) diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt index e6e6045..aa5a6be 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchOrderActivity.kt @@ -68,7 +68,12 @@ contentModels.add(bean) it.data!!.list?.forEach { contentTypeBean -> - contentModels.add(contentTypeBean) + if (contentTypeBean.name.contains("液位") || + contentTypeBean.name.contains("水") || + contentTypeBean.name.contains("噪声") + ) { + contentModels.add(contentTypeBean) + } } contentTypeAdapter = object : TagAdapter(contentModels) { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt index 69b8b35..bdae44e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt @@ -1,8 +1,9 @@ package com.casic.qd.smartwell.view -import android.view.View +import android.content.Context import androidx.lifecycle.ViewModelProvider import com.casic.qd.smartwell.R +import com.casic.qd.smartwell.extensions.toTypeName import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.WellViewModel @@ -11,13 +12,17 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog +import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* import kotlinx.android.synthetic.main.activity_well_detail.* +import kotlinx.android.synthetic.main.activity_well_detail.wellCodeView +import kotlinx.android.synthetic.main.activity_well_detail.wellLocationView +import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class WellDetailActivity : KotlinBaseActivity() { + private val context: Context = this@WellDetailActivity private lateinit var wellDetailViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_detail @@ -44,12 +49,12 @@ wellNameView.text = wellDetail.wellName wellCodeView.text = wellDetail.wellCode - val typeName = if (wellDetail.wellTypeName.toString().isBlank()) { - resources.getString(R.string.unknown) + val wellType = if (wellDetail.wellType.toString().isBlank()) { + "10" } else { - wellDetail.wellTypeName.toString() + wellDetail.wellType } - wellTypeView.text = typeName + wellTypeView.text = wellType.toTypeName() ownershipView.text = wellDetail.deptName val depth = if (wellDetail.deep.toString().isBlank()) { resources.getString(R.string.unknown) @@ -59,27 +64,12 @@ wellDepthView.text = depth //绑定窨井位置 val wellPosition = wellDetail.position.toString() - wellLocationView.text = wellPosition if (wellPosition.length > 12) { - tipsImageView.visibility = View.VISIBLE - tipsImageView.setOnClickListener { - AlertMessageDialog.Builder() - .setContext(this) - .setTitle("闸井完整位置") - .setMessage(wellPosition) - .setPositiveButton("知道了") - .setOnDialogButtonClickListener(object : - AlertMessageDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - - } - }) - .build() - .show() - } + wellLocationView.textSize = 12f } else { - tipsImageView.visibility = View.GONE + wellLocationView.textSize = 16f } + wellLocationView.text = wellPosition } }) wellDetailViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index a512774..cfbcfc9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -25,30 +25,38 @@ val areaDataModel = MutableLiveData() fun obtainAlarmType() = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmType() val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success typeModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainAlarmContent(type) val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success contentModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, { + loadState.value = LoadState.Fail it.printStackTrace() }) 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 58775d2..9adbf82 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,152 +20,7 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - + + + android:layout_toEndOf="@id/tempView" + android:scrollbars="vertical"> - - - - - + android:layout_gravity="center_vertical" + android:gravity="end" + android:paddingHorizontal="@dimen/dp_10" + android:text="@string/unknown" + android:textColor="@color/subTextColor" + android:textSize="@dimen/textFontSize" /> + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 68300e6..22cbfd2 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -10,6 +10,7 @@ 5dp 7dp 10dp + 15dp 20dp 30dp 40dp