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_honor_collection.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/layout/activity_honor_collection.xml b/app/src/main/res/layout/activity_honor_collection.xml
index d8fdf0f..0a8f773 100644
--- a/app/src/main/res/layout/activity_honor_collection.xml
+++ b/app/src/main/res/layout/activity_honor_collection.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
@@ -192,7 +192,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +210,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -237,7 +237,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -255,7 +255,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -284,7 +284,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -309,7 +309,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -331,7 +331,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -359,7 +359,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"
@@ -367,7 +367,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -385,7 +385,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