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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, 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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 573abd9..073a049 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -3,23 +3,57 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.model.VerifyRegulationListModel import com.casic.xz.meterage.vm.VerifyViewModel +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.convertColor import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* -//TODO 缺少UI设计 class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { private lateinit var verifyViewModel: VerifyViewModel - private lateinit var regulationAdapter: VerifyRegulationAdapter override fun initData() { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { if (it.code == 200) { - regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + val regulationAdapter = object : + NormalRecyclerAdapter( + R.layout.item_verify_regulation_rv_l, it.data.rows + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: VerifyRegulationListModel.DataModel.RowsModel + ) { + if (item.effectiveTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText( + R.id.nameTagView, item.fileName.last().toString() + ).setText(R.id.fileNameView, item.fileName) + .setText(R.id.effectiveStatusView, item.effectiveStatusName) + .setText(R.id.fileCodeView, "文件编号：${item.fileCode}") + .setText( + R.id.effectiveTimeView, + "有效期至：${item.effectiveTime.formatToYearMonthDay()}" + ) + } + } regulationRecyclerView.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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 573abd9..073a049 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -3,23 +3,57 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.model.VerifyRegulationListModel import com.casic.xz.meterage.vm.VerifyViewModel +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.convertColor import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* -//TODO 缺少UI设计 class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { private lateinit var verifyViewModel: VerifyViewModel - private lateinit var regulationAdapter: VerifyRegulationAdapter override fun initData() { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { if (it.code == 200) { - regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + val regulationAdapter = object : + NormalRecyclerAdapter( + R.layout.item_verify_regulation_rv_l, it.data.rows + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: VerifyRegulationListModel.DataModel.RowsModel + ) { + if (item.effectiveTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText( + R.id.nameTagView, item.fileName.last().toString() + ).setText(R.id.fileNameView, item.fileName) + .setText(R.id.effectiveStatusView, item.effectiveStatusName) + .setText(R.id.fileCodeView, "文件编号：${item.fileCode}") + .setText( + R.id.effectiveTimeView, + "有效期至：${item.effectiveTime.formatToYearMonthDay()}" + ) + } + } regulationRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 6775a25..54d624e 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -33,21 +33,25 @@ public static class DataModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -68,6 +72,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -84,6 +96,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -132,11 +152,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } @@ -188,6 +216,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } 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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 573abd9..073a049 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -3,23 +3,57 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.model.VerifyRegulationListModel import com.casic.xz.meterage.vm.VerifyViewModel +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.convertColor import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* -//TODO 缺少UI设计 class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { private lateinit var verifyViewModel: VerifyViewModel - private lateinit var regulationAdapter: VerifyRegulationAdapter override fun initData() { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { if (it.code == 200) { - regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + val regulationAdapter = object : + NormalRecyclerAdapter( + R.layout.item_verify_regulation_rv_l, it.data.rows + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: VerifyRegulationListModel.DataModel.RowsModel + ) { + if (item.effectiveTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText( + R.id.nameTagView, item.fileName.last().toString() + ).setText(R.id.fileNameView, item.fileName) + .setText(R.id.effectiveStatusView, item.effectiveStatusName) + .setText(R.id.fileCodeView, "文件编号：${item.fileCode}") + .setText( + R.id.effectiveTimeView, + "有效期至：${item.effectiveTime.formatToYearMonthDay()}" + ) + } + } regulationRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 6775a25..54d624e 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -33,21 +33,25 @@ public static class DataModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -68,6 +72,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -84,6 +96,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -132,11 +152,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } @@ -188,6 +216,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index f4faf99..d570024 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -36,11 +36,11 @@ private String countId; private String current; private String maxLimit; - private String optimizeCountSql; + private boolean optimizeCountSql; private List orders; private String pages; private List records; - private String searchCount; + private boolean searchCount; private String size; private String total; @@ -68,11 +68,11 @@ this.maxLimit = maxLimit; } - public String isOptimizeCountSql() { + public boolean isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(String optimizeCountSql) { + public void setOptimizeCountSql(boolean optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -100,11 +100,11 @@ this.records = records; } - public String isSearchCount() { + public boolean isSearchCount() { return searchCount; } - public void setSearchCount(String searchCount) { + public void setSearchCount(boolean searchCount) { this.searchCount = searchCount; } @@ -127,15 +127,18 @@ public static class RecordsModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; @@ -163,6 +166,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -179,6 +190,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -227,11 +246,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } 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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 573abd9..073a049 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -3,23 +3,57 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.model.VerifyRegulationListModel import com.casic.xz.meterage.vm.VerifyViewModel +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.convertColor import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* -//TODO 缺少UI设计 class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { private lateinit var verifyViewModel: VerifyViewModel - private lateinit var regulationAdapter: VerifyRegulationAdapter override fun initData() { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { if (it.code == 200) { - regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + val regulationAdapter = object : + NormalRecyclerAdapter( + R.layout.item_verify_regulation_rv_l, it.data.rows + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: VerifyRegulationListModel.DataModel.RowsModel + ) { + if (item.effectiveTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText( + R.id.nameTagView, item.fileName.last().toString() + ).setText(R.id.fileNameView, item.fileName) + .setText(R.id.effectiveStatusView, item.effectiveStatusName) + .setText(R.id.fileCodeView, "文件编号：${item.fileCode}") + .setText( + R.id.effectiveTimeView, + "有效期至：${item.effectiveTime.formatToYearMonthDay()}" + ) + } + } regulationRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 6775a25..54d624e 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -33,21 +33,25 @@ public static class DataModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -68,6 +72,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -84,6 +96,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -132,11 +152,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } @@ -188,6 +216,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index f4faf99..d570024 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -36,11 +36,11 @@ private String countId; private String current; private String maxLimit; - private String optimizeCountSql; + private boolean optimizeCountSql; private List orders; private String pages; private List records; - private String searchCount; + private boolean searchCount; private String size; private String total; @@ -68,11 +68,11 @@ this.maxLimit = maxLimit; } - public String isOptimizeCountSql() { + public boolean isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(String optimizeCountSql) { + public void setOptimizeCountSql(boolean optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -100,11 +100,11 @@ this.records = records; } - public String isSearchCount() { + public boolean isSearchCount() { return searchCount; } - public void setSearchCount(String searchCount) { + public void setSearchCount(boolean searchCount) { this.searchCount = searchCount; } @@ -127,15 +127,18 @@ public static class RecordsModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; @@ -163,6 +166,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -179,6 +190,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -227,11 +246,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 2e11464..850f3a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,7 +132,7 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.checkTypeView, item.checkType) + viewHolder.setText(R.id.checkTypeView, item.checkTypeName) .setText(R.id.categoryView, item.categoryName) .setText(R.id.priceStandardNameView, item.priceStandardName) .setText(R.id.priceView, "¥ ${item.price}") 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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 573abd9..073a049 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -3,23 +3,57 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.model.VerifyRegulationListModel import com.casic.xz.meterage.vm.VerifyViewModel +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.convertColor import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* -//TODO 缺少UI设计 class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { private lateinit var verifyViewModel: VerifyViewModel - private lateinit var regulationAdapter: VerifyRegulationAdapter override fun initData() { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { if (it.code == 200) { - regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + val regulationAdapter = object : + NormalRecyclerAdapter( + R.layout.item_verify_regulation_rv_l, it.data.rows + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: VerifyRegulationListModel.DataModel.RowsModel + ) { + if (item.effectiveTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText( + R.id.nameTagView, item.fileName.last().toString() + ).setText(R.id.fileNameView, item.fileName) + .setText(R.id.effectiveStatusView, item.effectiveStatusName) + .setText(R.id.fileCodeView, "文件编号：${item.fileCode}") + .setText( + R.id.effectiveTimeView, + "有效期至：${item.effectiveTime.formatToYearMonthDay()}" + ) + } + } regulationRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 6775a25..54d624e 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -33,21 +33,25 @@ public static class DataModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -68,6 +72,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -84,6 +96,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -132,11 +152,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } @@ -188,6 +216,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index f4faf99..d570024 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -36,11 +36,11 @@ private String countId; private String current; private String maxLimit; - private String optimizeCountSql; + private boolean optimizeCountSql; private List orders; private String pages; private List records; - private String searchCount; + private boolean searchCount; private String size; private String total; @@ -68,11 +68,11 @@ this.maxLimit = maxLimit; } - public String isOptimizeCountSql() { + public boolean isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(String optimizeCountSql) { + public void setOptimizeCountSql(boolean optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -100,11 +100,11 @@ this.records = records; } - public String isSearchCount() { + public boolean isSearchCount() { return searchCount; } - public void setSearchCount(String searchCount) { + public void setSearchCount(boolean searchCount) { this.searchCount = searchCount; } @@ -127,15 +127,18 @@ public static class RecordsModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; @@ -163,6 +166,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -179,6 +190,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -227,11 +246,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 2e11464..850f3a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,7 +132,7 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.checkTypeView, item.checkType) + viewHolder.setText(R.id.checkTypeView, item.checkTypeName) .setText(R.id.categoryView, item.categoryName) .setText(R.id.priceStandardNameView, item.priceStandardName) .setText(R.id.priceView, "¥ ${item.price}") diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index e1ed34d..48b62e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -29,8 +29,8 @@ checkTypeView.text = data.checkType createView.text = data.createTime categoryView.text = data.categoryName - projectView.text = data.priceItem - basisStandardView.text = data.priceStandard + projectView.text = data.itemName + basisStandardView.text = data.priceStandardName limitRangeView.text = data.priceLimit explainView.text = data.priceDescription remarkView.text = data.remark 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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 573abd9..073a049 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -3,23 +3,57 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.model.VerifyRegulationListModel import com.casic.xz.meterage.vm.VerifyViewModel +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.convertColor import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* -//TODO 缺少UI设计 class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { private lateinit var verifyViewModel: VerifyViewModel - private lateinit var regulationAdapter: VerifyRegulationAdapter override fun initData() { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { if (it.code == 200) { - regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + val regulationAdapter = object : + NormalRecyclerAdapter( + R.layout.item_verify_regulation_rv_l, it.data.rows + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: VerifyRegulationListModel.DataModel.RowsModel + ) { + if (item.effectiveTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText( + R.id.nameTagView, item.fileName.last().toString() + ).setText(R.id.fileNameView, item.fileName) + .setText(R.id.effectiveStatusView, item.effectiveStatusName) + .setText(R.id.fileCodeView, "文件编号：${item.fileCode}") + .setText( + R.id.effectiveTimeView, + "有效期至：${item.effectiveTime.formatToYearMonthDay()}" + ) + } + } regulationRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 6775a25..54d624e 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -33,21 +33,25 @@ public static class DataModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -68,6 +72,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -84,6 +96,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -132,11 +152,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } @@ -188,6 +216,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index f4faf99..d570024 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -36,11 +36,11 @@ private String countId; private String current; private String maxLimit; - private String optimizeCountSql; + private boolean optimizeCountSql; private List orders; private String pages; private List records; - private String searchCount; + private boolean searchCount; private String size; private String total; @@ -68,11 +68,11 @@ this.maxLimit = maxLimit; } - public String isOptimizeCountSql() { + public boolean isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(String optimizeCountSql) { + public void setOptimizeCountSql(boolean optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -100,11 +100,11 @@ this.records = records; } - public String isSearchCount() { + public boolean isSearchCount() { return searchCount; } - public void setSearchCount(String searchCount) { + public void setSearchCount(boolean searchCount) { this.searchCount = searchCount; } @@ -127,15 +127,18 @@ public static class RecordsModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; @@ -163,6 +166,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -179,6 +190,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -227,11 +246,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 2e11464..850f3a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,7 +132,7 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.checkTypeView, item.checkType) + viewHolder.setText(R.id.checkTypeView, item.checkTypeName) .setText(R.id.categoryView, item.categoryName) .setText(R.id.priceStandardNameView, item.priceStandardName) .setText(R.id.priceView, "¥ ${item.price}") diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index e1ed34d..48b62e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -29,8 +29,8 @@ checkTypeView.text = data.checkType createView.text = data.createTime categoryView.text = data.categoryName - projectView.text = data.priceItem - basisStandardView.text = data.priceStandard + projectView.text = data.itemName + basisStandardView.text = data.priceStandardName limitRangeView.text = data.priceLimit explainView.text = data.priceDescription remarkView.text = data.remark diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index d43bc93..f220a91 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -159,7 +159,7 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.checkTypeView, item.checkType) + viewHolder.setText(R.id.checkTypeView, item.checkTypeName) .setText(R.id.categoryView, item.categoryName) .setText(R.id.priceStandardNameView, item.priceStandardName) .setText(R.id.priceView, "¥ ${item.price}") 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 a7c42b5..4cc03d6 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 @@ -31,7 +31,6 @@ position: Int, item: SupportEquipmentListModel.DataModel.RowsModel ) { - if (item.validDate.isEarlierThenCurrent()) { viewHolder.setTextColor( R.id.expirationDateView, diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt index 573abd9..073a049 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -3,23 +3,57 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.isEarlierThenCurrent +import com.casic.xz.meterage.model.VerifyRegulationListModel import com.casic.xz.meterage.vm.VerifyViewModel +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.convertColor import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* -//TODO 缺少UI设计 class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { private lateinit var verifyViewModel: VerifyViewModel - private lateinit var regulationAdapter: VerifyRegulationAdapter override fun initData() { verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] verifyViewModel.getVerifyProcedureList(id) verifyViewModel.verifyProcedureList.observe(this) { if (it.code == 200) { - regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + val regulationAdapter = object : + NormalRecyclerAdapter( + R.layout.item_verify_regulation_rv_l, it.data.rows + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: VerifyRegulationListModel.DataModel.RowsModel + ) { + if (item.effectiveTime.isEarlierThenCurrent()) { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.red.convertColor(requireContext()) + ) + } else { + viewHolder.setTextColor( + R.id.effectiveTimeView, + R.color.gray.convertColor(requireContext()) + ) + } + + viewHolder.setText( + R.id.nameTagView, item.fileName.last().toString() + ).setText(R.id.fileNameView, item.fileName) + .setText(R.id.effectiveStatusView, item.effectiveStatusName) + .setText(R.id.fileCodeView, "文件编号：${item.fileCode}") + .setText( + R.id.effectiveTimeView, + "有效期至：${item.effectiveTime.formatToYearMonthDay()}" + ) + } + } regulationRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 6775a25..54d624e 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -33,21 +33,25 @@ public static class DataModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -68,6 +72,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -84,6 +96,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -132,11 +152,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } @@ -188,6 +216,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index f4faf99..d570024 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -36,11 +36,11 @@ private String countId; private String current; private String maxLimit; - private String optimizeCountSql; + private boolean optimizeCountSql; private List orders; private String pages; private List records; - private String searchCount; + private boolean searchCount; private String size; private String total; @@ -68,11 +68,11 @@ this.maxLimit = maxLimit; } - public String isOptimizeCountSql() { + public boolean isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(String optimizeCountSql) { + public void setOptimizeCountSql(boolean optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -100,11 +100,11 @@ this.records = records; } - public String isSearchCount() { + public boolean isSearchCount() { return searchCount; } - public void setSearchCount(String searchCount) { + public void setSearchCount(boolean searchCount) { this.searchCount = searchCount; } @@ -127,15 +127,18 @@ public static class RecordsModel { private String categoryName; private String checkType; + private String checkTypeName; private String createTime; private String directorDiscountPermission; + private String directorDiscountPermissionName; private String historicalPriceList; private String id; private String isDel; private String itemName; private String model; private String operatorDiscountPermission; - private String price; + private String operatorDiscountPermissionName; + private int price; private String priceDescription; private String priceItem; private String priceLimit; @@ -163,6 +166,14 @@ this.checkType = checkType; } + public String getCheckTypeName() { + return checkTypeName; + } + + public void setCheckTypeName(String checkTypeName) { + this.checkTypeName = checkTypeName; + } + public String getCreateTime() { return createTime; } @@ -179,6 +190,14 @@ this.directorDiscountPermission = directorDiscountPermission; } + public String getDirectorDiscountPermissionName() { + return directorDiscountPermissionName; + } + + public void setDirectorDiscountPermissionName(String directorDiscountPermissionName) { + this.directorDiscountPermissionName = directorDiscountPermissionName; + } + public String getHistoricalPriceList() { return historicalPriceList; } @@ -227,11 +246,19 @@ this.operatorDiscountPermission = operatorDiscountPermission; } - public String getPrice() { + public String getOperatorDiscountPermissionName() { + return operatorDiscountPermissionName; + } + + public void setOperatorDiscountPermissionName(String operatorDiscountPermissionName) { + this.operatorDiscountPermissionName = operatorDiscountPermissionName; + } + + public int getPrice() { return price; } - public void setPrice(String price) { + public void setPrice(int price) { this.price = price; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 2e11464..850f3a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,7 +132,7 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.checkTypeView, item.checkType) + viewHolder.setText(R.id.checkTypeView, item.checkTypeName) .setText(R.id.categoryView, item.categoryName) .setText(R.id.priceStandardNameView, item.priceStandardName) .setText(R.id.priceView, "¥ ${item.price}") diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index e1ed34d..48b62e0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -29,8 +29,8 @@ checkTypeView.text = data.checkType createView.text = data.createTime categoryView.text = data.categoryName - projectView.text = data.priceItem - basisStandardView.text = data.priceStandard + projectView.text = data.itemName + basisStandardView.text = data.priceStandardName limitRangeView.text = data.priceLimit explainView.text = data.priceDescription remarkView.text = data.remark diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index d43bc93..f220a91 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -159,7 +159,7 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.checkTypeView, item.checkType) + viewHolder.setText(R.id.checkTypeView, item.checkTypeName) .setText(R.id.categoryView, item.categoryName) .setText(R.id.priceStandardNameView, item.priceStandardName) .setText(R.id.priceView, "¥ ${item.price}") diff --git a/app/src/main/res/layout/item_verify_regulation_rv_l.xml b/app/src/main/res/layout/item_verify_regulation_rv_l.xml new file mode 100644 index 0000000..a3ac666 --- /dev/null +++ b/app/src/main/res/layout/item_verify_regulation_rv_l.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file