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_property.xml | 122 ++++++++++++++++++++++++++++++++++++----
1 files changed, 108 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/activity_property.xml b/app/src/main/res/layout/activity_property.xml
index 29fc0cd..ad8697f 100644
--- a/app/src/main/res/layout/activity_property.xml
+++ b/app/src/main/res/layout/activity_property.xml
@@ -12,7 +12,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="?attr/pageBackgroundColor"
+ >
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
@@ -191,7 +193,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -216,7 +218,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -238,7 +240,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -266,14 +268,14 @@
<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"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -291,7 +293,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -312,14 +314,14 @@
<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"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -331,13 +333,13 @@
android:inputType="text"
android:layout_marginStart="6dp"
android:text="@={viewModel.requestBeanLiveData.name}"
- android:hint="璇疯緭鍏ユ敹鏀悕绉�"
+ 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"
/>
@@ -363,7 +365,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -381,12 +383,104 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ 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"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeMaxTextSize="14sp"
+ />
+
+ <com.android.app_base.widget.ClearEditText
+ android:id="@+id/et_is_change"
+ 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.isChange}"
+ 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"
+ app:isEditable="@{false}"
+ />
+
+ </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"
+ app:autoSizeTextType="uniform"
+ app:autoSizeMinTextSize="8sp"
+ app:autoSizeMaxTextSize="14sp"
+ />
+
+ <com.android.app_base.widget.ClearEditText
+ android:id="@+id/et_is_logout"
+ 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.statusStr}"
+ 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"
+ app:isEditable="@{false}"
+ />
+
+ </LinearLayout>
</LinearLayout>
</RelativeLayout>
--
Gitblit v1.9.1