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/fragment_personal_center.xml | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 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..20de192 100644
--- a/app/src/main/res/layout/fragment_personal_center.xml
+++ b/app/src/main/res/layout/fragment_personal_center.xml
@@ -14,12 +14,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="涓汉涓績"
+ app:title="鎴戠殑"
app:titleGravity="left"
android:elevation="5dp"
>
@@ -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,20 @@
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}"
+ android:scaleType="centerCrop"
+ />
+ <ImageView
+ android:id="@+id/iv_take_photo"
+ 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 +126,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 +155,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 +184,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 +213,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 +242,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 +271,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"
/>
@@ -267,7 +281,43 @@
android:layout_height="1dp"
android:background="#33000000"
/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingVertical="12dp"
+ android:paddingHorizontal="10dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:textColor="#FF212121"
+ android:text="鎶ょ溂妯″紡"
+ />
+ <com.android.app_base.widget.SwitchButton
+ android:id="@+id/switchBtn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
+ </LinearLayout>
+
</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