diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index f1a4172..70f9da3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -19,22 +19,28 @@ staffViewModel.getStaffList(id) staffViewModel.staffList.observe(this) { if (it.code == 200) { - val staffAdapter = object : NormalRecyclerAdapter( - R.layout.item_staff_rv_l, it.data.rows - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: StaffListModel.DataModel.RowsModel + val staffAdapter = + object : NormalRecyclerAdapter( + R.layout.item_staff_rv_l, it.data.rows ) { - viewHolder.setText(R.id.nameTagView, item.name.last().toString()) - .setText( - R.id.userNameView, item.name + "【${item.deptName}】" + item.staffNo - ) - .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") - .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: StaffListModel.DataModel.RowsModel + ) { + val useDept = if (item.deptName.isNullOrBlank()) { + "未知" + } else { + item.deptName + } + + viewHolder.setText(R.id.nameTagView, item.name.last().toString()) + .setText(R.id.userNameView, item.name) + .setText(R.id.useDeptView, useDept) + .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") + .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + } } - } staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index f1a4172..70f9da3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -19,22 +19,28 @@ staffViewModel.getStaffList(id) staffViewModel.staffList.observe(this) { if (it.code == 200) { - val staffAdapter = object : NormalRecyclerAdapter( - R.layout.item_staff_rv_l, it.data.rows - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: StaffListModel.DataModel.RowsModel + val staffAdapter = + object : NormalRecyclerAdapter( + R.layout.item_staff_rv_l, it.data.rows ) { - viewHolder.setText(R.id.nameTagView, item.name.last().toString()) - .setText( - R.id.userNameView, item.name + "【${item.deptName}】" + item.staffNo - ) - .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") - .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: StaffListModel.DataModel.RowsModel + ) { + val useDept = if (item.deptName.isNullOrBlank()) { + "未知" + } else { + item.deptName + } + + viewHolder.setText(R.id.nameTagView, item.name.last().toString()) + .setText(R.id.userNameView, item.name) + .setText(R.id.useDeptView, useDept) + .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") + .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + } } - } staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index e6e7cf2..aa45f3d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -8,7 +8,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -30,17 +30,16 @@ ) { viewHolder.setText( R.id.nameTagView, item.equipmentName.last().toString() - ).setText( - R.id.deviceNameView, - item.equipmentName + "【${item.useDeptName}】" + item.modelNo - ).setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") + ).setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") .setText(R.id.expirationDateView, "有效期至:${item.validDate}") } } - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportAdapter + supportRecyclerView.adapter = supportAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index f1a4172..70f9da3 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -19,22 +19,28 @@ staffViewModel.getStaffList(id) staffViewModel.staffList.observe(this) { if (it.code == 200) { - val staffAdapter = object : NormalRecyclerAdapter( - R.layout.item_staff_rv_l, it.data.rows - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: StaffListModel.DataModel.RowsModel + val staffAdapter = + object : NormalRecyclerAdapter( + R.layout.item_staff_rv_l, it.data.rows ) { - viewHolder.setText(R.id.nameTagView, item.name.last().toString()) - .setText( - R.id.userNameView, item.name + "【${item.deptName}】" + item.staffNo - ) - .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") - .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: StaffListModel.DataModel.RowsModel + ) { + val useDept = if (item.deptName.isNullOrBlank()) { + "未知" + } else { + item.deptName + } + + viewHolder.setText(R.id.nameTagView, item.name.last().toString()) + .setText(R.id.userNameView, item.name) + .setText(R.id.useDeptView, useDept) + .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") + .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + } } - } staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index e6e7cf2..aa45f3d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -8,7 +8,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -30,17 +30,16 @@ ) { viewHolder.setText( R.id.nameTagView, item.equipmentName.last().toString() - ).setText( - R.id.deviceNameView, - item.equipmentName + "【${item.useDeptName}】" + item.modelNo - ).setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") + ).setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") .setText(R.id.expirationDateView, "有效期至:${item.validDate}") } } - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportAdapter + supportRecyclerView.adapter = supportAdapter } } } diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 57327dd..bfc3e2a 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -8,6 +8,11 @@ + + ( - R.layout.item_staff_rv_l, it.data.rows - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: StaffListModel.DataModel.RowsModel + val staffAdapter = + object : NormalRecyclerAdapter( + R.layout.item_staff_rv_l, it.data.rows ) { - viewHolder.setText(R.id.nameTagView, item.name.last().toString()) - .setText( - R.id.userNameView, item.name + "【${item.deptName}】" + item.staffNo - ) - .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") - .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: StaffListModel.DataModel.RowsModel + ) { + val useDept = if (item.deptName.isNullOrBlank()) { + "未知" + } else { + item.deptName + } + + viewHolder.setText(R.id.nameTagView, item.name.last().toString()) + .setText(R.id.userNameView, item.name) + .setText(R.id.useDeptView, useDept) + .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") + .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + } } - } staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index e6e7cf2..aa45f3d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -8,7 +8,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -30,17 +30,16 @@ ) { viewHolder.setText( R.id.nameTagView, item.equipmentName.last().toString() - ).setText( - R.id.deviceNameView, - item.equipmentName + "【${item.useDeptName}】" + item.modelNo - ).setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") + ).setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") .setText(R.id.expirationDateView, "有效期至:${item.validDate}") } } - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportAdapter + supportRecyclerView.adapter = supportAdapter } } } diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 57327dd..bfc3e2a 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -8,6 +8,11 @@ + + @@ -28,14 +29,34 @@ android:gravity="center_vertical" android:orientation="vertical"> - + android:orientation="horizontal"> + + + + + ( - R.layout.item_staff_rv_l, it.data.rows - ) { - override fun convertView( - viewHolder: ViewHolder, - position: Int, - item: StaffListModel.DataModel.RowsModel + val staffAdapter = + object : NormalRecyclerAdapter( + R.layout.item_staff_rv_l, it.data.rows ) { - viewHolder.setText(R.id.nameTagView, item.name.last().toString()) - .setText( - R.id.userNameView, item.name + "【${item.deptName}】" + item.staffNo - ) - .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") - .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: StaffListModel.DataModel.RowsModel + ) { + val useDept = if (item.deptName.isNullOrBlank()) { + "未知" + } else { + item.deptName + } + + viewHolder.setText(R.id.nameTagView, item.name.last().toString()) + .setText(R.id.userNameView, item.name) + .setText(R.id.useDeptView, useDept) + .setText(R.id.certificateView, "证书编号:${item.verifierCertificateNo}") + .setText(R.id.expirationDateView, "有效期至:${item.certificateDate}") + } } - } staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index e6e7cf2..aa45f3d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -8,7 +8,7 @@ import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -30,17 +30,16 @@ ) { viewHolder.setText( R.id.nameTagView, item.equipmentName.last().toString() - ).setText( - R.id.deviceNameView, - item.equipmentName + "【${item.useDeptName}】" + item.modelNo - ).setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") + ).setText(R.id.deviceNameView, item.equipmentName) + .setText(R.id.modelView, item.modelNo) + .setText(R.id.deviceCodeView, "设备编号:${item.equipmentNo}") .setText(R.id.expirationDateView, "有效期至:${item.validDate}") } } - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportAdapter + supportRecyclerView.adapter = supportAdapter } } } diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml index 57327dd..bfc3e2a 100644 --- a/app/src/main/res/layout/activity_standard_device_detail.xml +++ b/app/src/main/res/layout/activity_standard_device_detail.xml @@ -8,6 +8,11 @@ + + @@ -28,14 +29,34 @@ android:gravity="center_vertical" android:orientation="vertical"> - + android:orientation="horizontal"> + + + + + - + android:orientation="horizontal"> + + + + +