diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index dfdea73..60f8761 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -292,10 +292,15 @@ R.layout.item_remind_rv_l, dataBeans ) { override fun convertView( - viewHolder: ViewHolder, - position: Int, + viewHolder: ViewHolder, position: Int, item: RemindListModel.DataModel.RowsModel ) { + val type = if (item.messageType.contains("1")) { + "到期" + } else { + "超时" + } + if (position < 3) { val deltaT = item.createTime.diffCurrentTime() val diffTime = if (deltaT < 24) { @@ -303,17 +308,14 @@ } else { item.createTime.formatToDate() } - viewHolder.setText( - R.id.remindStateView, item.messageTypeName - ).setText(R.id.remindTitleView, item.messageContent) + viewHolder.setText(R.id.remindStateView, type) + .setText(R.id.remindTitleView, item.messageTitle) .setText(R.id.remindTimeView, diffTime) } else { - viewHolder.setText( - R.id.remindStateView, item.messageTypeName - ).setText(R.id.remindTitleView, item.messageContent) + viewHolder.setText(R.id.remindStateView, type) + .setText(R.id.remindTitleView, item.messageTitle) .setText( - R.id.remindTimeView, - item.createTime.formatToDate() + R.id.remindTimeView, item.createTime.formatToDate() ) } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index dfdea73..60f8761 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -292,10 +292,15 @@ R.layout.item_remind_rv_l, dataBeans ) { override fun convertView( - viewHolder: ViewHolder, - position: Int, + viewHolder: ViewHolder, position: Int, item: RemindListModel.DataModel.RowsModel ) { + val type = if (item.messageType.contains("1")) { + "到期" + } else { + "超时" + } + if (position < 3) { val deltaT = item.createTime.diffCurrentTime() val diffTime = if (deltaT < 24) { @@ -303,17 +308,14 @@ } else { item.createTime.formatToDate() } - viewHolder.setText( - R.id.remindStateView, item.messageTypeName - ).setText(R.id.remindTitleView, item.messageContent) + viewHolder.setText(R.id.remindStateView, type) + .setText(R.id.remindTitleView, item.messageTitle) .setText(R.id.remindTimeView, diffTime) } else { - viewHolder.setText( - R.id.remindStateView, item.messageTypeName - ).setText(R.id.remindTitleView, item.messageContent) + viewHolder.setText(R.id.remindStateView, type) + .setText(R.id.remindTitleView, item.messageTitle) .setText( - R.id.remindTimeView, - item.createTime.formatToDate() + R.id.remindTimeView, item.createTime.formatToDate() ) } } diff --git a/app/src/main/res/layout/item_remind_rv_l.xml b/app/src/main/res/layout/item_remind_rv_l.xml index 1e4a9e5..cb5de7c 100644 --- a/app/src/main/res/layout/item_remind_rv_l.xml +++ b/app/src/main/res/layout/item_remind_rv_l.xml @@ -9,7 +9,7 @@ android:id="@+id/remindStateView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="审批" + android:text="催办" android:textColor="@color/themeColor" android:textSize="@dimen/sp_14" />