diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index 78d6a53..8e1c397 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -30,7 +29,6 @@ override fun getItemCount(): Int = dataRows.size - @SuppressLint("SetTextI18n") override fun onBindViewHolder( holder: SearchResultAdapter.ItemViewHolder, position: Int @@ -41,7 +39,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue @@ -61,7 +59,7 @@ holder.operationLayout.visibility = View.GONE holder.transferLayout.visibility = View.VISIBLE //transferLayout下属UI - holder.currentStateView.text = "${rowsBean.jobBelongTo}正在确认工单..." + holder.currentStateView.text = String.format("${rowsBean.jobBelongTo}正在确认工单...") if (listener != null) { holder.transferView.setChangeAlphaWhenPress(true) holder.transferView.setOnClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index 78d6a53..8e1c397 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -30,7 +29,6 @@ override fun getItemCount(): Int = dataRows.size - @SuppressLint("SetTextI18n") override fun onBindViewHolder( holder: SearchResultAdapter.ItemViewHolder, position: Int @@ -41,7 +39,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue @@ -61,7 +59,7 @@ holder.operationLayout.visibility = View.GONE holder.transferLayout.visibility = View.VISIBLE //transferLayout下属UI - holder.currentStateView.text = "${rowsBean.jobBelongTo}正在确认工单..." + holder.currentStateView.text = String.format("${rowsBean.jobBelongTo}正在确认工单...") if (listener != null) { holder.transferView.setChangeAlphaWhenPress(true) holder.transferView.setOnClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 4054d09..042cc69 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -23,7 +22,6 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] @@ -35,17 +33,17 @@ } holder.wellStateView.text = rowsBean.onlineStateName val value = rowsBean.data.toString() - if (value == "") { - holder.watchDataView.text = "${rowsBean.watchType}：未知" + if (value.isBlank()) { + holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") } else { - holder.watchDataView.text = "${rowsBean.watchType}：$value" + holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") } - holder.installDateView.text = "安装时间：${rowsBean.installDate}" + holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() - if (time == "") { + if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" } else { - holder.logTimeView.text = "最新数据上报时间：$time" + holder.logTimeView.text = String.format("最新数据上报时间：$time") } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index 78d6a53..8e1c397 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -30,7 +29,6 @@ override fun getItemCount(): Int = dataRows.size - @SuppressLint("SetTextI18n") override fun onBindViewHolder( holder: SearchResultAdapter.ItemViewHolder, position: Int @@ -41,7 +39,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue @@ -61,7 +59,7 @@ holder.operationLayout.visibility = View.GONE holder.transferLayout.visibility = View.VISIBLE //transferLayout下属UI - holder.currentStateView.text = "${rowsBean.jobBelongTo}正在确认工单..." + holder.currentStateView.text = String.format("${rowsBean.jobBelongTo}正在确认工单...") if (listener != null) { holder.transferView.setChangeAlphaWhenPress(true) holder.transferView.setOnClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 4054d09..042cc69 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -23,7 +22,6 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] @@ -35,17 +33,17 @@ } holder.wellStateView.text = rowsBean.onlineStateName val value = rowsBean.data.toString() - if (value == "") { - holder.watchDataView.text = "${rowsBean.watchType}：未知" + if (value.isBlank()) { + holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") } else { - holder.watchDataView.text = "${rowsBean.watchType}：$value" + holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") } - holder.installDateView.text = "安装时间：${rowsBean.installDate}" + holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() - if (time == "") { + if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" } else { - holder.logTimeView.text = "最新数据上报时间：$time" + holder.logTimeView.text = String.format("最新数据上报时间：$time") } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index fc58896..ddb818b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index 78d6a53..8e1c397 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -30,7 +29,6 @@ override fun getItemCount(): Int = dataRows.size - @SuppressLint("SetTextI18n") override fun onBindViewHolder( holder: SearchResultAdapter.ItemViewHolder, position: Int @@ -41,7 +39,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue @@ -61,7 +59,7 @@ holder.operationLayout.visibility = View.GONE holder.transferLayout.visibility = View.VISIBLE //transferLayout下属UI - holder.currentStateView.text = "${rowsBean.jobBelongTo}正在确认工单..." + holder.currentStateView.text = String.format("${rowsBean.jobBelongTo}正在确认工单...") if (listener != null) { holder.transferView.setChangeAlphaWhenPress(true) holder.transferView.setOnClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 4054d09..042cc69 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -23,7 +22,6 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] @@ -35,17 +33,17 @@ } holder.wellStateView.text = rowsBean.onlineStateName val value = rowsBean.data.toString() - if (value == "") { - holder.watchDataView.text = "${rowsBean.watchType}：未知" + if (value.isBlank()) { + holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") } else { - holder.watchDataView.text = "${rowsBean.watchType}：$value" + holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") } - holder.installDateView.text = "安装时间：${rowsBean.installDate}" + holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() - if (time == "") { + if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" } else { - holder.logTimeView.text = "最新数据上报时间：$time" + holder.logTimeView.text = String.format("最新数据上报时间：$time") } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index fc58896..ddb818b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 298ae49..2989fa8 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index 78d6a53..8e1c397 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -30,7 +29,6 @@ override fun getItemCount(): Int = dataRows.size - @SuppressLint("SetTextI18n") override fun onBindViewHolder( holder: SearchResultAdapter.ItemViewHolder, position: Int @@ -41,7 +39,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue @@ -61,7 +59,7 @@ holder.operationLayout.visibility = View.GONE holder.transferLayout.visibility = View.VISIBLE //transferLayout下属UI - holder.currentStateView.text = "${rowsBean.jobBelongTo}正在确认工单..." + holder.currentStateView.text = String.format("${rowsBean.jobBelongTo}正在确认工单...") if (listener != null) { holder.transferView.setChangeAlphaWhenPress(true) holder.transferView.setOnClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 4054d09..042cc69 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -23,7 +22,6 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] @@ -35,17 +33,17 @@ } holder.wellStateView.text = rowsBean.onlineStateName val value = rowsBean.data.toString() - if (value == "") { - holder.watchDataView.text = "${rowsBean.watchType}：未知" + if (value.isBlank()) { + holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") } else { - holder.watchDataView.text = "${rowsBean.watchType}：$value" + holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") } - holder.installDateView.text = "安装时间：${rowsBean.installDate}" + holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() - if (time == "") { + if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" } else { - holder.logTimeView.text = "最新数据上报时间：$time" + holder.logTimeView.text = String.format("最新数据上报时间：$time") } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index fc58896..ddb818b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 298ae49..2989fa8 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9b25651..f19d80e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.os.Looper import android.os.Message -import android.view.animation.LinearInterpolator import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng @@ -12,10 +11,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter import com.casic.app.smartwell.base.BaseActivity -import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.extensions.show -import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.extensions.showRouteOnMap +import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel @@ -105,16 +101,12 @@ }) wellTypeLayout.setOnClickListener { - //旋转arrowImageView - val rotateAnimation = arrowImageView.animate() - rotateAnimation.duration = 200 - rotateAnimation.interpolator = LinearInterpolator() - rotateAnimation.rotation(180f) + arrowImageView.arrowAnimation(180f) easyPopupWindow.showAsDropDown(wellTypeLayout) easyPopupWindow.setOnPopupWindowClickListener(object : EasyPopupWindow.OnPopupWindowClickListener { override fun onPopupClick(position: Int) { - rotateAnimation.rotation(0f) + arrowImageView.arrowAnimation(0f) wellTypeModel = items[position] wellTypeView.text = wellTypeModel.name } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index 78d6a53..8e1c397 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -30,7 +29,6 @@ override fun getItemCount(): Int = dataRows.size - @SuppressLint("SetTextI18n") override fun onBindViewHolder( holder: SearchResultAdapter.ItemViewHolder, position: Int @@ -41,7 +39,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue @@ -61,7 +59,7 @@ holder.operationLayout.visibility = View.GONE holder.transferLayout.visibility = View.VISIBLE //transferLayout下属UI - holder.currentStateView.text = "${rowsBean.jobBelongTo}正在确认工单..." + holder.currentStateView.text = String.format("${rowsBean.jobBelongTo}正在确认工单...") if (listener != null) { holder.transferView.setChangeAlphaWhenPress(true) holder.transferView.setOnClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 4054d09..042cc69 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -23,7 +22,6 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] @@ -35,17 +33,17 @@ } holder.wellStateView.text = rowsBean.onlineStateName val value = rowsBean.data.toString() - if (value == "") { - holder.watchDataView.text = "${rowsBean.watchType}：未知" + if (value.isBlank()) { + holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") } else { - holder.watchDataView.text = "${rowsBean.watchType}：$value" + holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") } - holder.installDateView.text = "安装时间：${rowsBean.installDate}" + holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() - if (time == "") { + if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" } else { - holder.logTimeView.text = "最新数据上报时间：$time" + holder.logTimeView.text = String.format("最新数据上报时间：$time") } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index fc58896..ddb818b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 298ae49..2989fa8 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9b25651..f19d80e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.os.Looper import android.os.Message -import android.view.animation.LinearInterpolator import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng @@ -12,10 +11,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter import com.casic.app.smartwell.base.BaseActivity -import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.extensions.show -import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.extensions.showRouteOnMap +import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel @@ -105,16 +101,12 @@ }) wellTypeLayout.setOnClickListener { - //旋转arrowImageView - val rotateAnimation = arrowImageView.animate() - rotateAnimation.duration = 200 - rotateAnimation.interpolator = LinearInterpolator() - rotateAnimation.rotation(180f) + arrowImageView.arrowAnimation(180f) easyPopupWindow.showAsDropDown(wellTypeLayout) easyPopupWindow.setOnPopupWindowClickListener(object : EasyPopupWindow.OnPopupWindowClickListener { override fun onPopupClick(position: Int) { - rotateAnimation.rotation(0f) + arrowImageView.arrowAnimation(0f) wellTypeModel = items[position] wellTypeView.text = wellTypeModel.name } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 561d5d4..99182a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.os.Looper import android.os.Message -import android.view.animation.LinearInterpolator import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng @@ -12,10 +11,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter import com.casic.app.smartwell.base.BaseActivity -import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.extensions.show -import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.extensions.showRouteOnMap +import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.utils.DialogHelper @@ -139,16 +135,12 @@ }) wellTypeLayout.setOnClickListener { - //旋转arrowImageView - val rotateAnimation = arrowImageView.animate() - rotateAnimation.duration = 200 - rotateAnimation.interpolator = LinearInterpolator() - rotateAnimation.rotation(180f) + arrowImageView.arrowAnimation(180f) easyPopupWindow.showAsDropDown(wellTypeLayout) easyPopupWindow.setOnPopupWindowClickListener(object : EasyPopupWindow.OnPopupWindowClickListener { override fun onPopupClick(position: Int) { - rotateAnimation.rotation(0f) + arrowImageView.arrowAnimation(0f) wellTypeModel = items[position] wellTypeView.text = wellTypeModel.name } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt index 5261131..e2d1bfb 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/CompletedOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt index d9b2712..58fc845 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/InHandleOrderAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt index 644504f..eff799f 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotConfirmedAdapter.kt @@ -44,7 +44,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt index 92f6832..622c4c1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/NotProcessedListAdapter.kt @@ -34,7 +34,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt index 78d6a53..8e1c397 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -30,7 +29,6 @@ override fun getItemCount(): Int = dataRows.size - @SuppressLint("SetTextI18n") override fun onBindViewHolder( holder: SearchResultAdapter.ItemViewHolder, position: Int @@ -41,7 +39,7 @@ holder.createTimeView.text = rowsBean.createTime holder.wellCodeView.text = rowsBean.wellCode val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue == "") { + if (alarmValue.isBlank()) { holder.alarmValueView.text = "报警值未知" } else { holder.alarmValueView.text = alarmValue @@ -61,7 +59,7 @@ holder.operationLayout.visibility = View.GONE holder.transferLayout.visibility = View.VISIBLE //transferLayout下属UI - holder.currentStateView.text = "${rowsBean.jobBelongTo}正在确认工单..." + holder.currentStateView.text = String.format("${rowsBean.jobBelongTo}正在确认工单...") if (listener != null) { holder.transferView.setChangeAlphaWhenPress(true) holder.transferView.setOnClickListener { diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 4054d09..042cc69 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -23,7 +22,6 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] @@ -35,17 +33,17 @@ } holder.wellStateView.text = rowsBean.onlineStateName val value = rowsBean.data.toString() - if (value == "") { - holder.watchDataView.text = "${rowsBean.watchType}：未知" + if (value.isBlank()) { + holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") } else { - holder.watchDataView.text = "${rowsBean.watchType}：$value" + holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") } - holder.installDateView.text = "安装时间：${rowsBean.installDate}" + holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() - if (time == "") { + if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" } else { - holder.logTimeView.text = "最新数据上报时间：$time" + holder.logTimeView.text = String.format("最新数据上报时间：$time") } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index fc58896..ddb818b 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 298ae49..2989fa8 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.adapter -import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -24,19 +23,18 @@ return ItemViewHolder(view) } - @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] holder.wellTypeView.text = rowsBean.wellTypeName holder.wellNameView.text = rowsBean.wellName - holder.wellStateView.text = "已${rowsBean.bfztName}" + holder.wellStateView.text = String.format("已${rowsBean.bfztName}") holder.wellCodeView.text = rowsBean.wellCode val deep = rowsBean.deep.toString() - if (deep == "") { + if (deep.isBlank()) { holder.wellDepthView.text = "井深未知" } else { - holder.wellDepthView.text = "${deep}m" + holder.wellDepthView.text = String.format("${deep}m") } holder.wellLocationView.text = rowsBean.position diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 9b25651..f19d80e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.os.Looper import android.os.Message -import android.view.animation.LinearInterpolator import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng @@ -12,10 +11,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellListAdapter import com.casic.app.smartwell.base.BaseActivity -import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.extensions.show -import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.extensions.showRouteOnMap +import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel @@ -105,16 +101,12 @@ }) wellTypeLayout.setOnClickListener { - //旋转arrowImageView - val rotateAnimation = arrowImageView.animate() - rotateAnimation.duration = 200 - rotateAnimation.interpolator = LinearInterpolator() - rotateAnimation.rotation(180f) + arrowImageView.arrowAnimation(180f) easyPopupWindow.showAsDropDown(wellTypeLayout) easyPopupWindow.setOnPopupWindowClickListener(object : EasyPopupWindow.OnPopupWindowClickListener { override fun onPopupClick(position: Int) { - rotateAnimation.rotation(0f) + arrowImageView.arrowAnimation(0f) wellTypeModel = items[position] wellTypeView.text = wellTypeModel.name } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 561d5d4..99182a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.os.Looper import android.os.Message -import android.view.animation.LinearInterpolator import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.model.LatLng @@ -12,10 +11,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.WellOperationAdapter import com.casic.app.smartwell.base.BaseActivity -import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.extensions.show -import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.extensions.showRouteOnMap +import com.casic.app.smartwell.extensions.* import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.utils.DialogHelper @@ -139,16 +135,12 @@ }) wellTypeLayout.setOnClickListener { - //旋转arrowImageView - val rotateAnimation = arrowImageView.animate() - rotateAnimation.duration = 200 - rotateAnimation.interpolator = LinearInterpolator() - rotateAnimation.rotation(180f) + arrowImageView.arrowAnimation(180f) easyPopupWindow.showAsDropDown(wellTypeLayout) easyPopupWindow.setOnPopupWindowClickListener(object : EasyPopupWindow.OnPopupWindowClickListener { override fun onPopupClick(position: Int) { - rotateAnimation.rotation(0f) + arrowImageView.arrowAnimation(0f) wellTypeModel = items[position] wellTypeView.text = wellTypeModel.name } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index f048749..91f598f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -33,7 +33,7 @@ override fun initData() { titleView.text = "我的" val userDetailJson = SaveKeyValues.getValue(Constant.USER_DETAIL_MODEL, "") as String - if (userDetailJson != "") { + if (userDetailJson.isNotBlank()) { userDataModel = gson.fromJson( userDetailJson, object : TypeToken() {}.type