From a0dc6be52293a64ebfe38b8c2391dc7d2ffe63ae Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 15 五月 2023 20:05:27 +0800
Subject: [PATCH] 提交代码
---
app/src/main/res/layout/item_growth_experience_holder_condition.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/item_growth_experience_holder_condition.xml b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
index 8689a4f..1e58bbd 100644
--- a/app/src/main/res/layout/item_growth_experience_holder_condition.xml
+++ b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
@@ -6,7 +6,7 @@
<data>
<variable
name="bean"
- type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
+ type="com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean" />
</data>
<LinearLayout
@@ -16,10 +16,11 @@
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
>
<LinearLayout
android:layout_width="match_parent"
@@ -39,7 +40,7 @@
android:layout_marginStart="24dp"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
- android:text="@{bean.passCheck}"
+ android:text="@{bean.cerName}"
android:layout_weight="1"
tools:text="鎶ょ収"
android:textStyle="bold"
@@ -49,7 +50,7 @@
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
- android:text="@{bean.duringTime}"
+ android:text="@{bean.validityDate}"
android:textStyle="bold"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
@@ -81,17 +82,17 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎸佹湁"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
+ android:text="@{bean.ownStatus}"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="10dp"
>
<TextView
android:layout_width="wrap_content"
@@ -105,7 +106,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
- android:text="@{bean.residenceNumber}"
+ android:text="@{bean.idNo}"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="123456789012345"
--
Gitblit v1.9.1