diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt index 52c1f06..cece989 100644 --- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt @@ -50,6 +50,7 @@ //初始化控件 val batteryView: ImageView = holder.itemView.findViewById(R.id.batteryView) val deviceCodeView: TextView = holder.itemView.findViewById(R.id.deviceCodeView) + val isUseView: TextView = holder.itemView.findViewById(R.id.isUseView) val locationView: TextView = holder.itemView.findViewById(R.id.locationView) val batteryDataView: TextView = holder.itemView.findViewById(R.id.batteryDataView) val snrDataView: TextView = holder.itemView.findViewById(R.id.snrDataView) @@ -64,6 +65,14 @@ val rowsBean = dataRows[position] batteryView.setBackgroundResource(rowsBean.cell.toBatteryImage()) deviceCodeView.text = rowsBean.devcode + if (rowsBean.isUse == "1") { + isUseView.text = "已激活" + isUseView.setTextColor(Color.GREEN) + } else { + isUseView.text = "未激活" + isUseView.setTextColor(Color.LTGRAY) + } + if (rowsBean.latGaode.isBlank() || rowsBean.lngGaode.isBlank()) { locationView.text = "经纬度异常,无法查看具体位置" } else { diff --git a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt index 52c1f06..cece989 100644 --- a/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/smarttube/adapter/DeviceListAdapter.kt @@ -50,6 +50,7 @@ //初始化控件 val batteryView: ImageView = holder.itemView.findViewById(R.id.batteryView) val deviceCodeView: TextView = holder.itemView.findViewById(R.id.deviceCodeView) + val isUseView: TextView = holder.itemView.findViewById(R.id.isUseView) val locationView: TextView = holder.itemView.findViewById(R.id.locationView) val batteryDataView: TextView = holder.itemView.findViewById(R.id.batteryDataView) val snrDataView: TextView = holder.itemView.findViewById(R.id.snrDataView) @@ -64,6 +65,14 @@ val rowsBean = dataRows[position] batteryView.setBackgroundResource(rowsBean.cell.toBatteryImage()) deviceCodeView.text = rowsBean.devcode + if (rowsBean.isUse == "1") { + isUseView.text = "已激活" + isUseView.setTextColor(Color.GREEN) + } else { + isUseView.text = "未激活" + isUseView.setTextColor(Color.LTGRAY) + } + if (rowsBean.latGaode.isBlank() || rowsBean.lngGaode.isBlank()) { locationView.text = "经纬度异常,无法查看具体位置" } else { diff --git a/app/src/main/res/layout/item_device_rv.xml b/app/src/main/res/layout/item_device_rv.xml index 43e4096..ac1f980 100644 --- a/app/src/main/res/layout/item_device_rv.xml +++ b/app/src/main/res/layout/item_device_rv.xml @@ -33,6 +33,13 @@ android:text="342021000001" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> + +