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.xml | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 268 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/activity_annual_health_status.xml b/app/src/main/res/layout/activity_annual_health_status.xml
index f9363d1..fb86e9f 100644
--- a/app/src/main/res/layout/activity_annual_health_status.xml
+++ b/app/src/main/res/layout/activity_annual_health_status.xml
@@ -12,7 +12,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:background="?attr/pageBackgroundColor"
+ >
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
@@ -47,10 +48,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="骞村害鍋ュ悍鎯呭喌"
+ android:text="灏卞尰淇℃伅"
android:layout_weight="1"
android:textColor="@color/white"
- android:textSize="@dimen/sp_20"
+ android:textSize="20sp"
/>
<ImageView
android:id="@+id/iv_search_default"
@@ -89,7 +90,10 @@
android:imeOptions="actionSearch"
android:text=""
android:singleLine="true"
- android:hint="鍦ㄢ�滃澶т簨璁板唴鎼滅储鈥�"
+ android:hint="鍦ㄢ�滃氨鍖讳俊鎭�濆唴鎼滅储"
+ android:focusable="false"
+ android:clickable="false"
+ android:editable="false"
/>
<ImageView
android:id="@+id/iv_search_type"
@@ -107,6 +111,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -126,19 +131,270 @@
android:textColor="#73000000"
/>
</LinearLayout>
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerView"
+ <com.scwang.smart.refresh.layout.SmartRefreshLayout
+ android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:background="@color/color_normal_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleBar"
- app:layout_constraintVertical_bias="1.0"
- tools:itemCount="20"
- tools:layout_editor_absoluteX="-81dp"
- tools:listitem="@layout/item_family_assets" />
+ >
+ <com.scwang.smart.refresh.header.MaterialHeader
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <RelativeLayout
+ android:id="@+id/container_search_parameter"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginTop="-4dp"
+ tools:layout_height="wrap_content">
+
+ <LinearLayout
+ android:id="@+id/layout_search_parameter"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="56dp"
+ android:background="@color/white"
+ android:orientation="vertical"
+ android:paddingStart="5dp"
+ android:paddingEnd="12dp">
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="#FF939393" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:maxLines="1"
+ android:text="棰樺悕"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform" />
+
+ <com.android.app_base.widget.ClearEditText
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dp"
+ android:layout_weight="4"
+ android:background="@null"
+ android:hint="璇疯緭鍏ラ鍚�"
+ android:inputType="text"
+ android:maxLines="1"
+ android:text="@={viewModel.requestBeanLiveData.title}"
+ android:textColor="#FF333333"
+ android:textColorHint="#61000000"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform"
+ app:background="@drawable/ic_clear" />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:maxLines="1"
+ android:text="鏃堕棿"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="4"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/et_start_time"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dp"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:hint="寮�濮嬫椂闂�"
+ android:lines="1"
+ android:maxLines="1"
+ android:text="@={viewModel.requestBeanLiveData.happenStartTime}"
+ android:textColor="#FF333333"
+ android:textColorHint="#61000000"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform"
+ tools:text="2022-01-01" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鈥�" />
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/et_end_time"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:hint="缁撴潫鏃堕棿"
+ android:maxLines="1"
+ android:text="@={viewModel.requestBeanLiveData.happenEndTime}"
+ android:textColor="#FF333333"
+ android:textColorHint="#61000000"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform"
+ tools:text="2022-01-01" />
+
+ <ImageView
+ android:id="@+id/iv_time_clear"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_clear"
+ android:visibility="invisible" />
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:maxLines="1"
+ android:text="绫诲埆"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform" />
+
+ <com.android.app_base.widget.ClearEditText
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dp"
+ android:layout_weight="4"
+ android:background="@null"
+ android:hint="璇疯緭鍏ョ被鍒�"
+ android:inputType="text"
+ android:maxLines="1"
+ android:text="@={viewModel.requestBeanLiveData.type}"
+ android:textColor="#FF333333"
+ android:textColorHint="#61000000"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform"
+ app:background="@drawable/ic_clear" />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:gravity="center">
+
+ <androidx.appcompat.widget.AppCompatTextView
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:lines="1"
+ android:maxLines="1"
+ android:text="灏辩梾鍖婚櫌"
+ android:textColor="#FF333333"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform" />
+
+ <com.android.app_base.widget.ClearEditText
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dp"
+ android:layout_weight="4"
+ android:background="@null"
+ android:hint="璇疯緭鍏ュ氨鐥呭尰闄�"
+ android:inputType="text"
+ android:maxLines="1"
+ android:text="@={viewModel.requestBeanLiveData.hospital}"
+ android:textColor="#FF333333"
+ android:textColorHint="#61000000"
+ android:textSize="14sp"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeTextType="uniform"
+ app:background="@drawable/ic_clear" />
+ </LinearLayout>
+ </LinearLayout>
+
+ </RelativeLayout>
+ </com.scwang.smart.refresh.header.MaterialHeader>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:itemCount="20"
+ tools:listitem="@layout/item_annual_health_status" />
+ <com.scwang.smart.refresh.footer.BallPulseFooter
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+ </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ android:id="@+id/fab_add"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginEnd="25dp"
+ android:layout_marginBottom="@dimen/dp_44"
+ android:src="@drawable/ic_add"
+ app:fabCustomSize="56dp"
+ />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.1