From 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期一, 02 九月 2024 13:52:17 +0800
Subject: [PATCH] 对新接口进行了适配
---
app/src/main/res/layout/activity_annual_health_status.xml | 473 +++++++++++++++++++++++++++++------------------------------
1 files changed, 233 insertions(+), 240 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 e50d378..fb86e9f 100644
--- a/app/src/main/res/layout/activity_annual_health_status.xml
+++ b/app/src/main/res/layout/activity_annual_health_status.xml
@@ -138,10 +138,241 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleBar"
>
+
<com.scwang.smart.refresh.header.MaterialHeader
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- />
+ 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"
@@ -152,245 +383,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
- <RelativeLayout
- android:id="@+id/container_search_parameter"
- android:layout_width="0dp"
- android:layout_height="0dp"
- app:layout_constraintTop_toBottomOf="@id/titleBar"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- android:layout_marginTop="-4dp"
- tools:layout_height="wrap_content"
- >
- <LinearLayout
- android:id="@+id/layout_search_parameter"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/white"
- android:layout_marginHorizontal="56dp"
- android:paddingEnd="12dp"
- android:paddingStart="5dp"
- >
- <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_weight="1"
- android:layout_height="wrap_content"
- android:text="棰樺悕"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:gravity="center"
- android:maxLines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- />
-
- <com.android.app_base.widget.ClearEditText
- android:layout_width="0dp"
- android:layout_weight="4"
- android:layout_height="wrap_content"
- android:background="@null"
- android:inputType="text"
- android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.title}"
- android:hint="璇疯緭鍏ラ鍚�"
- android:textColorHint="#61000000"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:maxLines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- 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_weight="1"
- android:layout_height="wrap_content"
- android:text="鏃堕棿"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:gravity="center"
- android:maxLines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- />
-
- <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_weight="1"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.happenStartTime}"
- android:hint="寮�濮嬫椂闂�"
- android:textColorHint="#61000000"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:maxLines="1"
- android:lines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- 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_weight="1"
- android:gravity="center"
- android:layout_height="wrap_content"
- android:text="@={viewModel.requestBeanLiveData.happenEndTime}"
- android:hint="缁撴潫鏃堕棿"
- android:textColorHint="#61000000"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:maxLines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- 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_weight="1"
- android:layout_height="wrap_content"
- android:text="绫诲埆"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:gravity="center"
- android:maxLines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- />
-
- <com.android.app_base.widget.ClearEditText
- android:layout_width="0dp"
- android:layout_weight="4"
- android:layout_height="wrap_content"
- android:background="@null"
- android:inputType="text"
- android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.type}"
- android:hint="璇疯緭鍏ョ被鍒�"
- android:textColorHint="#61000000"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:maxLines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- 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_weight="1"
- android:layout_height="match_parent"
- android:text="灏辩梾鍖婚櫌"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:gravity="center"
- android:maxLines="1"
- android:lines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- />
-
- <com.android.app_base.widget.ClearEditText
- android:layout_width="0dp"
- android:layout_weight="4"
- android:layout_height="wrap_content"
- android:background="@null"
- android:inputType="text"
- android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.hospital}"
- android:hint="璇疯緭鍏ュ氨鐥呭尰闄�"
- android:textColorHint="#61000000"
- android:textColor="#FF333333"
- android:textSize="14sp"
- android:maxLines="1"
- app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="8sp"
- app:autoSizeMaxTextSize="14sp"
- app:background="@drawable/ic_clear"
- />
- </LinearLayout>
- </LinearLayout>
-
- </RelativeLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_add"
android:layout_width="56dp"
--
Gitblit v1.9.1