diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index bbb8b4e..cb474ff 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.home +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -24,6 +26,7 @@ class EquipmentActivity : KotlinBaseActivity() { + private var context: Context = this@EquipmentActivity private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel private lateinit var equipmentAdapter: NormalRecyclerAdapter @@ -148,10 +151,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index bbb8b4e..cb474ff 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.home +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -24,6 +26,7 @@ class EquipmentActivity : KotlinBaseActivity() { + private var context: Context = this@EquipmentActivity private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel private lateinit var equipmentAdapter: NormalRecyclerAdapter @@ -148,10 +151,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 6e93861..def216a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.search +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -25,6 +27,7 @@ class SearchEquipmentResultActivity : KotlinBaseActivity() { + private var context: Context = this@SearchEquipmentResultActivity private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel @@ -150,10 +153,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index bbb8b4e..cb474ff 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.home +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -24,6 +26,7 @@ class EquipmentActivity : KotlinBaseActivity() { + private var context: Context = this@EquipmentActivity private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel private lateinit var equipmentAdapter: NormalRecyclerAdapter @@ -148,10 +151,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 6e93861..def216a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.search +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -25,6 +27,7 @@ class SearchEquipmentResultActivity : KotlinBaseActivity() { + private var context: Context = this@SearchEquipmentResultActivity private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel @@ -150,10 +153,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index 193d459..dea1288 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -9,8 +9,6 @@ - - @@ -148,10 +151,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 6e93861..def216a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.search +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -25,6 +27,7 @@ class SearchEquipmentResultActivity : KotlinBaseActivity() { + private var context: Context = this@SearchEquipmentResultActivity private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel @@ -150,10 +153,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index 193d459..dea1288 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -9,8 +9,6 @@ - - - - @@ -148,10 +151,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 6e93861..def216a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.search +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -25,6 +27,7 @@ class SearchEquipmentResultActivity : KotlinBaseActivity() { + private var context: Context = this@SearchEquipmentResultActivity private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel @@ -150,10 +153,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index 193d459..dea1288 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -9,8 +9,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index bbb8b4e..cb474ff 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.home +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler @@ -24,6 +26,7 @@ class EquipmentActivity : KotlinBaseActivity() { + private var context: Context = this@EquipmentActivity private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel private lateinit var equipmentAdapter: NormalRecyclerAdapter @@ -148,10 +151,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 6e93861..def216a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,5 +1,6 @@ package com.casic.xz.meterage.view.search +import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration @@ -14,6 +15,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -25,6 +27,7 @@ class SearchEquipmentResultActivity : KotlinBaseActivity() { + private var context: Context = this@SearchEquipmentResultActivity private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel @@ -150,10 +153,44 @@ position: Int, item: EquipmentListModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.equipmentNameView, item.equipmentName) - .setText(R.id.equipmentCodeView, item.equipmentNo) - .setText(R.id.equipmentDateView, item.enableDate) - .setText(R.id.equipmentLibView, item.useDeptName) + val modelNo = if (item.modelNo.isNullOrBlank()) { + "未知" + } else { + item.modelNo + } + + val remark = if (item.remark.isNullOrBlank()) { + "无" + } else { + item.remark + } + + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } + + viewHolder.setText(R.id.equipmentName, item.equipmentName) + .setText(R.id.modelView, modelNo) + .setText(R.id.equipmentStateView, item.managerStateName) + .setText(R.id.equipmentCodeView, "装置编号：${item.equipmentNo}") + .setText(R.id.remarkView, "备注：$remark") + .setText(R.id.useDeptView, useDept) + .setText(R.id.deviceDateView, "有效期至：${item.validDate}") + .setText(R.id.usePersonView, "管理员：$usePerson") + + if (!item.managerStateName.contains("在用")) { + viewHolder.setBackgroundColor( + R.id.equipmentStateView, R.color.gray.convertColor(context) + ) + } } } equipmentRecyclerView.addItemDecoration( diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index 193d459..dea1288 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -9,8 +9,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_rv_l.xml b/app/src/main/res/layout/item_equipment_rv_l.xml index 796f4b1..80040c5 100644 --- a/app/src/main/res/layout/item_equipment_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_rv_l.xml @@ -1,47 +1,112 @@ + android:layout_height="@dimen/dp_100" + android:orientation="vertical" + android:padding="@dimen/dp_7"> - + + + + + + + + - + - + + + + + + + + + + + \ No newline at end of file