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_tourism.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/app/src/main/res/layout/activity_tourism.xml b/app/src/main/res/layout/activity_tourism.xml
index fd34d19..b91df1f 100644
--- a/app/src/main/res/layout/activity_tourism.xml
+++ b/app/src/main/res/layout/activity_tourism.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.function.FamilyMemorabiliaActivity"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
@@ -49,7 +49,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 +91,7 @@
android:imeOptions="actionSearch"
android:text=""
android:singleLine="true"
- android:hint="鍦ㄢ�滆垂鐢ㄧ粺璁¤〃鈥濆唴鎼滅储"
+ android:hint="鍦ㄢ�滃畬缇庢梾閫斺�濆唴鎼滅储"
android:focusable="false"
android:clickable="false"
/>
@@ -151,7 +151,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleBar"
tools:itemCount="20"
- tools:listitem="@layout/item_family_memorabilia" />
+ tools:listitem="@layout/item_tourism" />
<com.scwang.smart.refresh.footer.BallPulseFooter
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
@@ -197,7 +197,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -214,7 +214,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.start}"
+ android:text="@={viewModel.requestBeanLiveData.happenStartTime}"
android:hint="寮�濮嬫椂闂�"
android:textColorHint="#61000000"
android:textColor="#FF333333"
@@ -222,7 +222,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -237,14 +237,14 @@
android:layout_weight="1"
android:gravity="center"
android:layout_height="wrap_content"
- android:text="@={viewModel.requestBeanLiveData.end}"
+ android:text="@={viewModel.requestBeanLiveData.happenEndTime}"
android:hint="缁撴潫鏃堕棿"
android:textColorHint="#61000000"
android:textColor="#FF333333"
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -272,15 +272,15 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
- android:text="鎬诲ぉ鏁�"
+ 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="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -291,14 +291,14 @@
android:background="@null"
android:inputType="text"
android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.totalDay}"
- android:hint="璇疯緭鍏ユ�诲ぉ鏁�"
+ android:text="@={viewModel.requestBeanLiveData.name}"
+ android:hint="璇疯緭鍏ユ梾娓稿悕绉�"
android:textColorHint="#61000000"
android:textColor="#FF333333"
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