From f278edbd3f0f809e4a3b59bf16d24c624a43f98d Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:38:08 +0800
Subject: [PATCH] 修改了国籍和民族字段反转的问题
---
app/src/main/res/layout/activity_certificate_of_honor_detail.xml | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/app/src/main/res/layout/activity_certificate_of_honor_detail.xml b/app/src/main/res/layout/activity_certificate_of_honor_detail.xml
index 322d4d3..05955ab 100644
--- a/app/src/main/res/layout/activity_certificate_of_honor_detail.xml
+++ b/app/src/main/res/layout/activity_certificate_of_honor_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
@@ -52,24 +52,6 @@
android:textSize="16sp"
android:text="@={viewModel.beanLiveData.name}"
/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_height="wrap_content"
- android:text="鏃堕棿"
- android:textColor="#767375"
- android:textSize="12sp"
- />
-
- <EditText
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.time}"
- android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -102,7 +84,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.certificateNumber}"
+ android:text="@={viewModel.beanLiveData.idNo}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -119,7 +101,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.level}"
+ android:text="@={viewModel.beanLiveData.grade}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -136,7 +118,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.effectiveTime}"
+ android:text="@={viewModel.beanLiveData.validityDate}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -153,7 +135,7 @@
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@{viewModel.beanLiveData.getTime}"
+ android:text="@{viewModel.beanLiveData.getDate}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
--
Gitblit v1.9.1