From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成

---
 app/src/main/res/layout/activity_certificate_of_honor_detail.xml |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 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..412ff48 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
@@ -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