diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index 115c722..f65b307 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -39,7 +39,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 if (listener != null) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index 115c722..f65b307 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -39,7 +39,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 if (listener != null) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index b48bdb0..6cbc51d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -50,7 +50,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index 115c722..f65b307 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -39,7 +39,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 if (listener != null) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index b48bdb0..6cbc51d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -50,7 +50,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index c72ab2f..cf20076 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ * 告警列表 */ @GET("/alarm/list") - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @Query("alarmType") alarmType: String, @@ -112,7 +112,7 @@ @GET("/alarm/cancelAlarmById") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("alarmId") alarmId: Long ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index 115c722..f65b307 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -39,7 +39,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 if (listener != null) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index b48bdb0..6cbc51d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -50,7 +50,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index c72ab2f..cf20076 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ * 告警列表 */ @GET("/alarm/list") - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @Query("alarmType") alarmType: String, @@ -112,7 +112,7 @@ @GET("/alarm/cancelAlarmById") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("alarmId") alarmId: Long ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 703356a..9b0e1c9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -58,7 +58,7 @@ /** * 告警列表 */ - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( keywords: String, alarmType: String, areaId: String, @@ -68,7 +68,7 @@ status: String, page: Int ): String { - return api.obtainAlarmList( + return api.obtainAlarmListByPage( AuthenticationHelper.token!!, keywords, alarmType, @@ -99,7 +99,7 @@ /** * 消警 */ - suspend fun obtainOperationResult(alarmId: String): String { + suspend fun obtainOperationResult(alarmId: Long): String { return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index 115c722..f65b307 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -39,7 +39,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 if (listener != null) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index b48bdb0..6cbc51d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -50,7 +50,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index c72ab2f..cf20076 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ * 告警列表 */ @GET("/alarm/list") - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @Query("alarmType") alarmType: String, @@ -112,7 +112,7 @@ @GET("/alarm/cancelAlarmById") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("alarmId") alarmId: Long ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 703356a..9b0e1c9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -58,7 +58,7 @@ /** * 告警列表 */ - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( keywords: String, alarmType: String, areaId: String, @@ -68,7 +68,7 @@ status: String, page: Int ): String { - return api.obtainAlarmList( + return api.obtainAlarmListByPage( AuthenticationHelper.token!!, keywords, alarmType, @@ -99,7 +99,7 @@ /** * 消警 */ - suspend fun obtainOperationResult(alarmId: String): String { + suspend fun obtainOperationResult(alarmId: Long): String { return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index b492537..f77636c 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -41,22 +41,36 @@ } override fun initData() { - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) + + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + obtainAlarmListByPage() //注册广播接收者 - BroadcastReceiverManager.instance.addAction(Constant.CANCEL_ALARM_ACTION, + BroadcastReceiverManager.instance.addAction( + Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 isRefresh = true pageIndex = 1 - obtainAlarmList(pageIndex) + obtainAlarmListByPage() } }) } override fun initEvent() { - obtainAlarmList(pageIndex) + alarmListLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainAlarmListByPage() + } + alarmListLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainAlarmListByPage() + } + alarmViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -83,18 +97,6 @@ } }) - alarmListLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainAlarmList(pageIndex) - } - alarmListLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainAlarmList(pageIndex) - } - alarmViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { @@ -114,8 +116,8 @@ }) } - private fun obtainAlarmList(pageIndex: Int) { - alarmViewModel.obtainAlarmList("", "", "", "", "", "", "1", pageIndex) + private fun obtainAlarmListByPage() { + alarmViewModel.obtainAlarmListByPage("", "", "", "", "", "", "1", pageIndex) } private val callback = Handler.Callback { @@ -125,7 +127,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainAlarmList(pageIndex) + pageIndex = 1 + obtainAlarmListByPage() } } else { emptyView!!.hide() @@ -158,7 +161,7 @@ "操作失败，告警ID异常".show() return } - alarmViewModel.obtainOperationResult(alarmId!!) + alarmViewModel.obtainOperationResult(alarmId!!.toLong()) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index 115c722..f65b307 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -39,7 +39,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 if (listener != null) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index b48bdb0..6cbc51d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -50,7 +50,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index c72ab2f..cf20076 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ * 告警列表 */ @GET("/alarm/list") - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @Query("alarmType") alarmType: String, @@ -112,7 +112,7 @@ @GET("/alarm/cancelAlarmById") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("alarmId") alarmId: Long ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 703356a..9b0e1c9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -58,7 +58,7 @@ /** * 告警列表 */ - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( keywords: String, alarmType: String, areaId: String, @@ -68,7 +68,7 @@ status: String, page: Int ): String { - return api.obtainAlarmList( + return api.obtainAlarmListByPage( AuthenticationHelper.token!!, keywords, alarmType, @@ -99,7 +99,7 @@ /** * 消警 */ - suspend fun obtainOperationResult(alarmId: String): String { + suspend fun obtainOperationResult(alarmId: Long): String { return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index b492537..f77636c 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -41,22 +41,36 @@ } override fun initData() { - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) + + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + obtainAlarmListByPage() //注册广播接收者 - BroadcastReceiverManager.instance.addAction(Constant.CANCEL_ALARM_ACTION, + BroadcastReceiverManager.instance.addAction( + Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 isRefresh = true pageIndex = 1 - obtainAlarmList(pageIndex) + obtainAlarmListByPage() } }) } override fun initEvent() { - obtainAlarmList(pageIndex) + alarmListLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainAlarmListByPage() + } + alarmListLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainAlarmListByPage() + } + alarmViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -83,18 +97,6 @@ } }) - alarmListLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainAlarmList(pageIndex) - } - alarmListLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainAlarmList(pageIndex) - } - alarmViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { @@ -114,8 +116,8 @@ }) } - private fun obtainAlarmList(pageIndex: Int) { - alarmViewModel.obtainAlarmList("", "", "", "", "", "", "1", pageIndex) + private fun obtainAlarmListByPage() { + alarmViewModel.obtainAlarmListByPage("", "", "", "", "", "", "1", pageIndex) } private val callback = Handler.Callback { @@ -125,7 +127,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainAlarmList(pageIndex) + pageIndex = 1 + obtainAlarmListByPage() } } else { emptyView!!.hide() @@ -158,7 +161,7 @@ "操作失败，告警ID异常".show() return } - alarmViewModel.obtainOperationResult(alarmId!!) + alarmViewModel.obtainOperationResult(alarmId!!.toLong()) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f19f2f7..b534b25 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -45,20 +45,23 @@ weakReferenceHandler = WeakReferenceHandler(callback) searchAlarmViewModel = ViewModelProvider(this).get(SearchResultViewModel::class.java) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + + obtainSearchResult() + //注册广播接收者 - BroadcastReceiverManager.instance.addAction(Constant.CANCEL_ALARM_ACTION, + BroadcastReceiverManager.instance.addAction( + Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 isRefresh = true pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } }) } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchAlarmViewModel.alarmResultModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -100,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //消警状态处理 @@ -128,9 +131,16 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchAlarmViewModel.obtainAlarmResult( - args[0], args[1], args[2], args[3], args[4], args[5], "1", pageIndex + keywords = args[0], + alarmType = args[1], + areaId = args[2], + alarmContentType = args[3], + beginTime = args[4], + endTime = args[5], + status = "1", + page = pageIndex ) } @@ -141,7 +151,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() @@ -174,7 +185,7 @@ "操作失败，告警ID异常".show() return } - alarmViewModel.obtainOperationResult(alarmId!!) + alarmViewModel.obtainOperationResult(alarmId!!.toLong()) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt index 0dfd8e0..2428878 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/AlarmListAdapter.kt @@ -30,16 +30,16 @@ //绑定数据 val rowsBean = dataRows[position] holder.alarmMessageView.text = rowsBean.alarmMessage - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") - holder.devCodeView.text = rowsBean.devcode - holder.wellLocationView.text = String.format("位置：${rowsBean.position}") - holder.createTimeView.text = rowsBean.alarmTime + holder.devCodeView.text = String.format("设备编号：${rowsBean.devcode}") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") + holder.createTimeView.text = String.format("时间：${rowsBean.alarmTime}") //绑定事件 if (listener != null) { holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 6533b92..3c1b7d4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -49,7 +49,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 74646d6..70665b9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -48,7 +48,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index d59f953..69998f8 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -47,7 +47,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index 115c722..f65b307 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -39,7 +39,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 if (listener != null) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index b48bdb0..6cbc51d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -50,7 +50,7 @@ } else { rowsBean.alarmValue } - holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.alarmValueView.text = String.format("报警值：$alarmValue") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index c72ab2f..cf20076 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ * 告警列表 */ @GET("/alarm/list") - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( @Header("token") token: String, @Query("keywords") keywords: String, @Query("alarmType") alarmType: String, @@ -112,7 +112,7 @@ @GET("/alarm/cancelAlarmById") suspend fun obtainOperationResult( @Header("token") token: String, - @Query("alarmId") alarmId: String + @Query("alarmId") alarmId: Long ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 703356a..9b0e1c9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -58,7 +58,7 @@ /** * 告警列表 */ - suspend fun obtainAlarmList( + suspend fun obtainAlarmListByPage( keywords: String, alarmType: String, areaId: String, @@ -68,7 +68,7 @@ status: String, page: Int ): String { - return api.obtainAlarmList( + return api.obtainAlarmListByPage( AuthenticationHelper.token!!, keywords, alarmType, @@ -99,7 +99,7 @@ /** * 消警 */ - suspend fun obtainOperationResult(alarmId: String): String { + suspend fun obtainOperationResult(alarmId: Long): String { return api.obtainOperationResult(AuthenticationHelper.token!!, alarmId) } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index b492537..f77636c 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -41,22 +41,36 @@ } override fun initData() { - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) + + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + obtainAlarmListByPage() //注册广播接收者 - BroadcastReceiverManager.instance.addAction(Constant.CANCEL_ALARM_ACTION, + BroadcastReceiverManager.instance.addAction( + Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 isRefresh = true pageIndex = 1 - obtainAlarmList(pageIndex) + obtainAlarmListByPage() } }) } override fun initEvent() { - obtainAlarmList(pageIndex) + alarmListLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainAlarmListByPage() + } + alarmListLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainAlarmListByPage() + } + alarmViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -83,18 +97,6 @@ } }) - alarmListLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainAlarmList(pageIndex) - } - alarmListLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainAlarmList(pageIndex) - } - alarmViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { @@ -114,8 +116,8 @@ }) } - private fun obtainAlarmList(pageIndex: Int) { - alarmViewModel.obtainAlarmList("", "", "", "", "", "", "1", pageIndex) + private fun obtainAlarmListByPage() { + alarmViewModel.obtainAlarmListByPage("", "", "", "", "", "", "1", pageIndex) } private val callback = Handler.Callback { @@ -125,7 +127,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainAlarmList(pageIndex) + pageIndex = 1 + obtainAlarmListByPage() } } else { emptyView!!.hide() @@ -158,7 +161,7 @@ "操作失败，告警ID异常".show() return } - alarmViewModel.obtainOperationResult(alarmId!!) + alarmViewModel.obtainOperationResult(alarmId!!.toLong()) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f19f2f7..b534b25 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -45,20 +45,23 @@ weakReferenceHandler = WeakReferenceHandler(callback) searchAlarmViewModel = ViewModelProvider(this).get(SearchResultViewModel::class.java) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + + obtainSearchResult() + //注册广播接收者 - BroadcastReceiverManager.instance.addAction(Constant.CANCEL_ALARM_ACTION, + BroadcastReceiverManager.instance.addAction( + Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { //收到广播相当于做了一次列表刷新 isRefresh = true pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } }) } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchAlarmViewModel.alarmResultModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -100,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //消警状态处理 @@ -128,9 +131,16 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchAlarmViewModel.obtainAlarmResult( - args[0], args[1], args[2], args[3], args[4], args[5], "1", pageIndex + keywords = args[0], + alarmType = args[1], + areaId = args[2], + alarmContentType = args[3], + beginTime = args[4], + endTime = args[5], + status = "1", + page = pageIndex ) } @@ -141,7 +151,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() @@ -174,7 +185,7 @@ "操作失败，告警ID异常".show() return } - alarmViewModel.obtainOperationResult(alarmId!!) + alarmViewModel.obtainOperationResult(alarmId!!.toLong()) } override fun onCancelClick() { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index d1b52b7..617691b 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -2,6 +2,7 @@ import android.os.Handler import android.view.View +import android.widget.Button import android.widget.EditText import android.widget.TextView import androidx.core.view.GravityCompat @@ -22,7 +23,6 @@ import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.DeviceViewModel import com.casic.qd.smartwell.widgets.BottomAreaSheet -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton import kotlinx.android.synthetic.main.activity_data_search.* import kotlinx.android.synthetic.main.include_base_title.titleView import kotlinx.android.synthetic.main.include_empty_view.* @@ -161,14 +161,13 @@ override fun onDrawerOpened(drawerView: View) { val deviceCodeView = drawerView.findViewById(R.id.deviceCodeView) areaView = drawerView.findViewById(R.id.areaView) - val searchButton = drawerView.findViewById(R.id.searchButton) - val clearButton = drawerView.findViewById(R.id.clearButton) + val searchButton = drawerView.findViewById