From 454a84caa83c4ebc1b4c422f10166bddfb0e03ec Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 21 九月 2023 21:53:30 +0800
Subject: [PATCH] 1、修复添加按钮消失问题\n2、修改家族导图\n3、新增便捷添加功能\n4、新增修改头像功能\n5、个人财产增加搜索条件
---
app/src/main/res/layout/fragment_personal_center.xml | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/fragment_personal_center.xml b/app/src/main/res/layout/fragment_personal_center.xml
index de937e9..feef559 100644
--- a/app/src/main/res/layout/fragment_personal_center.xml
+++ b/app/src/main/res/layout/fragment_personal_center.xml
@@ -51,7 +51,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="涓汉涓績"
+ android:text="涓汉淇℃伅"
android:textSize="20sp"
android:textColor="@color/black"
android:layout_marginStart="20dp"
@@ -69,6 +69,7 @@
>
<androidx.constraintlayout.utils.widget.ImageFilterView
+ android:id="@+id/iv_head"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginVertical="25dp"
@@ -78,7 +79,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.3"
- app:roundPercent="1" />
+ app:roundPercent="1"
+ app:imageUrl="@{viewModel.infoLiveData.img}"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_camera"
+ app:layout_constraintStart_toStartOf="@id/iv_head"
+ app:layout_constraintEnd_toEndOf="@id/iv_head"
+ app:layout_constraintBottom_toBottomOf="@id/iv_head"
+ android:layout_marginBottom="-15dp"
+ />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
@@ -112,7 +124,7 @@
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#FF212121"
- android:text="@{}"
+ android:text="@{viewModel.infoLiveData.nickName}"
android:gravity="end"
tools:text="寮犱笁"
/>
@@ -141,7 +153,7 @@
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#FF212121"
- android:text="@{}"
+ android:text="@{viewModel.infoLiveData.phoneNumber}"
android:gravity="end"
tools:text="13234567890"
/>
@@ -170,7 +182,7 @@
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#FF212121"
- android:text="@{}"
+ android:text="@{viewModel.infoLiveData.email}"
android:gravity="end"
tools:text="zhang@126.com"
/>
@@ -199,7 +211,7 @@
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#FF212121"
- android:text="@{}"
+ android:text="@{viewModel.infoLiveData.familyName}"
android:gravity="end"
tools:text="寮犱笁瀹跺涵"
/>
@@ -228,7 +240,7 @@
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#FF212121"
- android:text="@{}"
+ android:text="@{viewModel.infoLiveData.roleName}"
android:gravity="end"
tools:text="瀹跺涵绠＄悊鍛�"
/>
@@ -257,7 +269,7 @@
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#FF212121"
- android:text="@{}"
+ android:text="@{viewModel.infoLiveData.createTime}"
android:gravity="end"
tools:text="2023-04-01"
/>
@@ -268,6 +280,19 @@
android:background="#33000000"
/>
</LinearLayout>
+ <TextView
+ android:id="@+id/tv_login_out"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="20dp"
+ android:background="@drawable/shape_ff093878_10_solid"
+ android:gravity="center"
+ android:paddingHorizontal="70dp"
+ android:paddingVertical="5dp"
+ android:text="閫�鍑虹櫥褰�"
+ android:textColor="@color/white"
+ android:textSize="18dp" />
</LinearLayout>
</ScrollView>
--
Gitblit v1.9.1