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_family_memorabilia.xml |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/activity_family_memorabilia.xml b/app/src/main/res/layout/activity_family_memorabilia.xml
index 263a4c1..180a3a3 100644
--- a/app/src/main/res/layout/activity_family_memorabilia.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia.xml
@@ -10,32 +10,34 @@
             type="com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivityViewModel"/>
     </data>
 
+    <!--绾︽潫甯冨眬锛岃В鍐冲竷灞�宓屽杩囧鐨勯棶棰橈紝浠ョ伒娲荤殑鏂瑰紡瀹氫綅鍜岃皟鏁村皬閮ㄤ欢銆�-->
     <androidx.constraintlayout.widget.ConstraintLayout
         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
             android:id="@+id/titleBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             >
+
             <FrameLayout
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:layout_marginHorizontal="16dp"
                 android:layout_gravity="center_vertical|end"
-                >
+                android:layout_marginHorizontal="16dp">
+
                 <ImageView
                     android:id="@+id/iv_operate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:background="@drawable/ic_operate"
-                    />
+                    android:background="@drawable/ic_operate" />
             </FrameLayout>
 
             <LinearLayout
@@ -196,7 +198,7 @@
                         android:gravity="center"
                         android:maxLines="1"
                         app:autoSizeTextType="uniform"
-                        app:autoSizeMinTextSize="10sp"
+                        app:autoSizeMinTextSize="8sp"
                         app:autoSizeMaxTextSize="14sp"
                         />
 
@@ -214,7 +216,7 @@
                         android:textSize="14sp"
                         android:maxLines="1"
                         app:autoSizeTextType="uniform"
-                        app:autoSizeMinTextSize="10sp"
+                        app:autoSizeMinTextSize="8sp"
                         app:autoSizeMaxTextSize="14sp"
                         app:background="@drawable/ic_clear"
                         />
@@ -241,7 +243,7 @@
                         android:gravity="center"
                         android:maxLines="1"
                         app:autoSizeTextType="uniform"
-                        app:autoSizeMinTextSize="10sp"
+                        app:autoSizeMinTextSize="8sp"
                         app:autoSizeMaxTextSize="14sp"
                         />
 
@@ -259,7 +261,7 @@
                         android:textSize="14sp"
                         android:maxLines="1"
                         app:autoSizeTextType="uniform"
-                        app:autoSizeMinTextSize="10sp"
+                        app:autoSizeMinTextSize="8sp"
                         app:autoSizeMaxTextSize="14sp"
                         app:background="@drawable/ic_clear"
                         />
@@ -288,7 +290,7 @@
                         android:gravity="center"
                         android:maxLines="1"
                         app:autoSizeTextType="uniform"
-                        app:autoSizeMinTextSize="10sp"
+                        app:autoSizeMinTextSize="8sp"
                         app:autoSizeMaxTextSize="14sp"
                         />
 
@@ -313,7 +315,7 @@
                             android:maxLines="1"
                             android:lines="1"
                             app:autoSizeTextType="uniform"
-                            app:autoSizeMinTextSize="10sp"
+                            app:autoSizeMinTextSize="8sp"
                             app:autoSizeMaxTextSize="14sp"
                             tools:text="2022-01-01"
                             />
@@ -335,7 +337,7 @@
                             android:textSize="14sp"
                             android:maxLines="1"
                             app:autoSizeTextType="uniform"
-                            app:autoSizeMinTextSize="10sp"
+                            app:autoSizeMinTextSize="8sp"
                             app:autoSizeMaxTextSize="14sp"
                             tools:text="2022-01-01"
                             />
@@ -371,7 +373,7 @@
                         android:maxLines="1"
                         android:lines="1"
                         app:autoSizeTextType="uniform"
-                        app:autoSizeMinTextSize="10sp"
+                        app:autoSizeMinTextSize="8sp"
                         app:autoSizeMaxTextSize="14sp"
                         />
 
@@ -389,7 +391,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