From e7a6728aea008cab5befa5980382370c32974ce5 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期三, 11 九月 2024 14:51:07 +0800
Subject: [PATCH] 修改了百年心愿模块的排版和显示不正确的问题
---
app/src/main/res/layout/activity_basic_info.xml | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/src/main/res/layout/activity_basic_info.xml b/app/src/main/res/layout/activity_basic_info.xml
index 6fcc5b9..d36db91 100644
--- a/app/src/main/res/layout/activity_basic_info.xml
+++ b/app/src/main/res/layout/activity_basic_info.xml
@@ -11,7 +11,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
android:id="@+id/title_bar"
@@ -80,11 +80,12 @@
android:textSize="12sp"
android:alpha="0.54"
/>
- <TextView
+ <EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="寮犱笁"
+ android:text="@={viewModel.infoLiveData.nickName}"
android:textColor="#DE000000"
+ android:background="@null"
android:textSize="16sp"
android:layout_marginTop="5dp"
/>
@@ -110,12 +111,13 @@
android:textSize="12sp"
android:alpha="0.54"
/>
- <TextView
+ <EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="12345678901"
+ android:text="@={viewModel.infoLiveData.phoneNumber}"
android:textColor="#DE000000"
android:textSize="16sp"
+ android:background="@null"
android:layout_marginTop="5dp"
/>
<View
@@ -146,12 +148,13 @@
android:textSize="12sp"
android:alpha="0.54"
/>
- <TextView
+ <EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="zhang@126.com"
+ android:text="@={viewModel.infoLiveData.email}"
android:textColor="#DE000000"
android:textSize="16sp"
+ android:background="@null"
android:layout_marginTop="5dp"
/>
<View
@@ -182,12 +185,13 @@
android:layout_marginTop="5dp"
>
<TextView
+ android:id="@+id/tv_male"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鐢�"
android:textColor="#DE000000"
android:textSize="16sp"
- android:drawableStart="@drawable/ic_radio_button_selected"
+ android:drawableStart="@{viewModel.infoLiveData.sex==1?@drawable/ic_radio_button_selected:@drawable/ic_radio_button_unselected}"
android:drawablePadding="5dp"
/>
<View
@@ -196,12 +200,13 @@
android:layout_weight="2"
/>
<TextView
+ android:id="@+id/tv_female"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="濂�"
android:textColor="#DE000000"
android:textSize="16sp"
- android:drawableStart="@drawable/ic_radio_button_unselected"
+ android:drawableStart="@{viewModel.infoLiveData.sex==0?@drawable/ic_radio_button_selected:@drawable/ic_radio_button_unselected}"
android:drawablePadding="5dp"
/>
<View
@@ -227,6 +232,7 @@
android:layout_marginTop="60dp"
>
<androidx.cardview.widget.CardView
+ android:id="@+id/layout_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="10dp"
@@ -244,6 +250,7 @@
/>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
+ android:id="@+id/layout_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="10dp"
@@ -251,15 +258,15 @@
app:cardElevation="0dp"
android:layout_marginStart="30dp"
>
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="16sp"
+ android:layout_marginHorizontal="36dp"
+ android:layout_marginVertical="12dp"
android:text="鍏抽棴"
android:textColor="#FF282828"
- android:layout_marginVertical="12dp"
- android:layout_marginHorizontal="36dp"
- />
+ android:textSize="16sp" />
</androidx.cardview.widget.CardView>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.9.1