diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index 44e055a..c3f6cae 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentUsageRecordModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_usage_record.* +import kotlinx.android.synthetic.main.include_empty_view.* class UsageRecordFragment(private val id: String) : KotlinBaseFragment() { @@ -19,39 +23,51 @@ equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { if (it.code == 200) { - val usageRecordAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_usage_record_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentUsageRecordModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无使用记录") + } else { + emptyView.hide() + val usageRecordAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_usage_record_rv_l, it.data ) { - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentUsageRecordModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } - viewHolder.setText( - R.id.nameTagView, usePerson.last().toString() - ).setText(R.id.userNameView, usePerson) - .setText(R.id.equipmentStateView, item.useTypeName) - .setText(R.id.useDeptView, "部门：${useDept}") - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + viewHolder.setText(R.id.nameTagView, usePerson.last().toString()) + .setText(R.id.userNameView, usePerson) + .setText(R.id.equipmentStateView, item.useTypeName) + .setText(R.id.useDeptView, "部门：${useDept}") + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ) + } } - } - usageRecordRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - usageRecordRecyclerView.adapter = usageRecordAdapter + usageRecordRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + usageRecordRecyclerView.adapter = usageRecordAdapter + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index 44e055a..c3f6cae 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentUsageRecordModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_usage_record.* +import kotlinx.android.synthetic.main.include_empty_view.* class UsageRecordFragment(private val id: String) : KotlinBaseFragment() { @@ -19,39 +23,51 @@ equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { if (it.code == 200) { - val usageRecordAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_usage_record_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentUsageRecordModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无使用记录") + } else { + emptyView.hide() + val usageRecordAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_usage_record_rv_l, it.data ) { - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentUsageRecordModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } - viewHolder.setText( - R.id.nameTagView, usePerson.last().toString() - ).setText(R.id.userNameView, usePerson) - .setText(R.id.equipmentStateView, item.useTypeName) - .setText(R.id.useDeptView, "部门：${useDept}") - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + viewHolder.setText(R.id.nameTagView, usePerson.last().toString()) + .setText(R.id.userNameView, usePerson) + .setText(R.id.equipmentStateView, item.useTypeName) + .setText(R.id.useDeptView, "部门：${useDept}") + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ) + } } - } - usageRecordRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - usageRecordRecyclerView.adapter = usageRecordAdapter + usageRecordRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + usageRecordRecyclerView.adapter = usageRecordAdapter + } } } } diff --git a/app/src/main/res/layout/fragment_equipment_usage_record.xml b/app/src/main/res/layout/fragment_equipment_usage_record.xml index 5e133c7..8603eb4 100644 --- a/app/src/main/res/layout/fragment_equipment_usage_record.xml +++ b/app/src/main/res/layout/fragment_equipment_usage_record.xml @@ -5,9 +5,17 @@ android:layout_height="match_parent" android:background="@color/white"> - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt index 44e055a..c3f6cae 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/UsageRecordFragment.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.fragment.equipment import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentUsageRecordModel +import com.casic.xz.meterage.utils.DividerItemDecoration import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px import kotlinx.android.synthetic.main.fragment_equipment_usage_record.* +import kotlinx.android.synthetic.main.include_empty_view.* class UsageRecordFragment(private val id: String) : KotlinBaseFragment() { @@ -19,39 +23,51 @@ equipmentViewModel.getEquipmentUsageRecord(id) equipmentViewModel.usageRecordResult.observe(this) { if (it.code == 200) { - val usageRecordAdapter = - object : NormalRecyclerAdapter( - R.layout.item_equipment_usage_record_rv_l, it.data - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: EquipmentUsageRecordModel.DataModel + if (it.data.size == 0) { + emptyView.showEmptyPage("该设备无使用记录") + } else { + emptyView.hide() + val usageRecordAdapter = + object : NormalRecyclerAdapter( + R.layout.item_equipment_usage_record_rv_l, it.data ) { - val usePerson = if (item.usePersonName.isNullOrBlank()) { - "无" - } else { - item.usePersonName - } + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: EquipmentUsageRecordModel.DataModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) - val useDept = if (item.useDeptName.isNullOrBlank()) { - "未知" - } else { - item.useDeptName - } + val usePerson = if (item.usePersonName.isNullOrBlank()) { + "无" + } else { + item.usePersonName + } - viewHolder.setText( - R.id.nameTagView, usePerson.last().toString() - ).setText(R.id.userNameView, usePerson) - .setText(R.id.equipmentStateView, item.useTypeName) - .setText(R.id.useDeptView, "部门：${useDept}") - .setText(R.id.dateView, "时间：${item.startDate} ~ ${item.endDate}") + val useDept = if (item.useDeptName.isNullOrBlank()) { + "未知" + } else { + item.useDeptName + } + + viewHolder.setText(R.id.nameTagView, usePerson.last().toString()) + .setText(R.id.userNameView, usePerson) + .setText(R.id.equipmentStateView, item.useTypeName) + .setText(R.id.useDeptView, "部门：${useDept}") + .setText( + R.id.dateView, + "时间：${item.startDate} ~ ${item.endDate}" + ) + } } - } - usageRecordRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) - usageRecordRecyclerView.adapter = usageRecordAdapter + usageRecordRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + usageRecordRecyclerView.adapter = usageRecordAdapter + } } } } diff --git a/app/src/main/res/layout/fragment_equipment_usage_record.xml b/app/src/main/res/layout/fragment_equipment_usage_record.xml index 5e133c7..8603eb4 100644 --- a/app/src/main/res/layout/fragment_equipment_usage_record.xml +++ b/app/src/main/res/layout/fragment_equipment_usage_record.xml @@ -5,9 +5,17 @@ android:layout_height="match_parent" android:background="@color/white"> - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml index 280ce66..80eb29d 100644 --- a/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml +++ b/app/src/main/res/layout/item_equipment_usage_record_rv_l.xml @@ -6,21 +6,16 @@ android:orientation="horizontal" android:padding="@dimen/dp_15"> - - - - +