diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index b1b842f..62beef0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,14 +1,47 @@ package com.casic.xz.meterage.fragment.contract import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel +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_contract_collection.* +import kotlinx.android.synthetic.main.include_empty_view.* class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { override fun initData() { - + if (paymentModels.isEmpty()) { + emptyView!!.showEmptyPage("无相关收款信息") + } else { + emptyView!!.hide() + val collectionAdapter = object : + NormalRecyclerAdapter( + R.layout.item_contract_collection_rv_l, paymentModels + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ContractDetailModel.DataModel.PaymentListModel + ) { + viewHolder.setText(R.id.paymentNumView, item.paymentNum) + .setText(R.id.estimatePaymentAmountView, item.estimatePaymentAmount) + .setText( + R.id.estimatePaymentDateView, + item.estimatePaymentDate.formatToYearMonthDay() + ) + .setText(R.id.actualPaymentAmountView, item.actualPaymentAmount) + .setText( + R.id.actualPaymentDateView, + item.actualPaymentDate.formatToYearMonthDay() + ) + } + } + collectionRecyclerView.adapter = collectionAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index b1b842f..62beef0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,14 +1,47 @@ package com.casic.xz.meterage.fragment.contract import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel +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_contract_collection.* +import kotlinx.android.synthetic.main.include_empty_view.* class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { override fun initData() { - + if (paymentModels.isEmpty()) { + emptyView!!.showEmptyPage("无相关收款信息") + } else { + emptyView!!.hide() + val collectionAdapter = object : + NormalRecyclerAdapter( + R.layout.item_contract_collection_rv_l, paymentModels + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ContractDetailModel.DataModel.PaymentListModel + ) { + viewHolder.setText(R.id.paymentNumView, item.paymentNum) + .setText(R.id.estimatePaymentAmountView, item.estimatePaymentAmount) + .setText( + R.id.estimatePaymentDateView, + item.estimatePaymentDate.formatToYearMonthDay() + ) + .setText(R.id.actualPaymentAmountView, item.actualPaymentAmount) + .setText( + R.id.actualPaymentDateView, + item.actualPaymentDate.formatToYearMonthDay() + ) + } + } + collectionRecyclerView.adapter = collectionAdapter + } } override fun initEvent() { diff --git a/app/src/main/res/layout/fragment_contract_collection.xml b/app/src/main/res/layout/fragment_contract_collection.xml index 77d9ef6..d83830c 100644 --- a/app/src/main/res/layout/fragment_contract_collection.xml +++ b/app/src/main/res/layout/fragment_contract_collection.xml @@ -1,6 +1,16 @@ - + android:layout_height="match_parent" + android:background="@color/white" + android:orientation="vertical"> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt index b1b842f..62beef0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/contract/CollectionFragment.kt @@ -1,14 +1,47 @@ package com.casic.xz.meterage.fragment.contract import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.formatToYearMonthDay +import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.ContractDetailModel +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_contract_collection.* +import kotlinx.android.synthetic.main.include_empty_view.* class CollectionFragment(private val paymentModels: List) : KotlinBaseFragment() { override fun initData() { - + if (paymentModels.isEmpty()) { + emptyView!!.showEmptyPage("无相关收款信息") + } else { + emptyView!!.hide() + val collectionAdapter = object : + NormalRecyclerAdapter( + R.layout.item_contract_collection_rv_l, paymentModels + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: ContractDetailModel.DataModel.PaymentListModel + ) { + viewHolder.setText(R.id.paymentNumView, item.paymentNum) + .setText(R.id.estimatePaymentAmountView, item.estimatePaymentAmount) + .setText( + R.id.estimatePaymentDateView, + item.estimatePaymentDate.formatToYearMonthDay() + ) + .setText(R.id.actualPaymentAmountView, item.actualPaymentAmount) + .setText( + R.id.actualPaymentDateView, + item.actualPaymentDate.formatToYearMonthDay() + ) + } + } + collectionRecyclerView.adapter = collectionAdapter + } } override fun initEvent() { diff --git a/app/src/main/res/layout/fragment_contract_collection.xml b/app/src/main/res/layout/fragment_contract_collection.xml index 77d9ef6..d83830c 100644 --- a/app/src/main/res/layout/fragment_contract_collection.xml +++ b/app/src/main/res/layout/fragment_contract_collection.xml @@ -1,6 +1,16 @@ - + android:layout_height="match_parent" + android:background="@color/white" + android:orientation="vertical"> - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_contract_collection_rv_l.xml b/app/src/main/res/layout/item_contract_collection_rv_l.xml new file mode 100644 index 0000000..3ece950 --- /dev/null +++ b/app/src/main/res/layout/item_contract_collection_rv_l.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file