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_annual_health_status_detail.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/activity_annual_health_status_detail.xml b/app/src/main/res/layout/activity_annual_health_status_detail.xml
index 8413cc2..b89fb34 100644
--- a/app/src/main/res/layout/activity_annual_health_status_detail.xml
+++ b/app/src/main/res/layout/activity_annual_health_status_detail.xml
@@ -12,13 +12,13 @@
<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
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{viewModel.beanLiveData.id==0?`鏂板缓骞村害鍋ュ悍鐘跺喌`:viewModel.beanLiveData.title}"
+ app:title="@{viewModel.beanLiveData.id==-1?`鏂板缓灏卞尰淇℃伅`:viewModel.beanLiveData.title}"
app:titleGravity="left"
app:leftIcon="@drawable/ic_back"
>
@@ -43,7 +43,7 @@
>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="20dp"
android:paddingBottom="20dp"
@@ -55,11 +55,13 @@
android:text="搴忓彿"
android:textColor="#767375"
android:textSize="12sp"
+ android:visibility="@{viewModel.beanLiveData.id!=-1?true:false}"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:visibility="@{viewModel.beanLiveData.id!=-1?true:false}"
>
<EditText
android:id="@+id/et_id"
@@ -109,7 +111,7 @@
android:text="@={viewModel.beanLiveData.checkTime}"
android:textSize="16sp"
app:isEditable="@{false}"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
--
Gitblit v1.9.1