From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/res/layout/activity_annual_health_status.xml | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 dc6cb6b..e50d378 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,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
@@ -20,7 +20,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
- app:leftIcon="@drawable/ic_back"
>
<FrameLayout
android:layout_width="24dp"
@@ -49,7 +48,7 @@
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="20sp"
@@ -91,7 +90,7 @@
android:imeOptions="actionSearch"
android:text=""
android:singleLine="true"
- android:hint="鍦ㄢ�滃勾搴﹀仴搴锋儏鍐碘�濆唴鎼滅储"
+ android:hint="鍦ㄢ�滃氨鍖讳俊鎭�濆唴鎼滅储"
android:focusable="false"
android:clickable="false"
android:editable="false"
@@ -192,7 +191,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +209,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -238,7 +237,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -263,7 +262,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -285,7 +284,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -320,7 +319,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -338,7 +337,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -358,7 +357,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="灏辩梾鍖婚櫌"
android:textColor="#FF333333"
android:textSize="14sp"
@@ -366,7 +365,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -384,7 +383,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
--
Gitblit v1.9.1