From f21e1ae4b858b6a329b717eaf420d4a1e79d9509 Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期一, 24 四月 2023 15:53:47 +0800
Subject: [PATCH] 自传和通讯录界面（未完成未修改）
---
app/src/main/res/layout/activity_growth_experience.xml | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/activity_growth_experience.xml b/app/src/main/res/layout/activity_growth_experience.xml
index df8eb8f..19a7b67 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/app/src/main/res/layout/activity_growth_experience.xml
@@ -73,6 +73,7 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
+ android:text="@{viewModel.infoLiveData.nickName}"
tools:text="寮犱笁" />
<View
@@ -81,6 +82,7 @@
android:layout_marginTop="5dp"
android:background="#6B000000" />
</LinearLayout>
+
<LinearLayout
android:id="@+id/layout_2"
@@ -107,6 +109,7 @@
android:textColor="#DE000000"
android:textSize="@dimen/sp_16"
tools:text="寮犲洓"
+ android:text="@{viewModel.infoLiveData.oldName}"
/>
<View
@@ -152,6 +155,7 @@
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
tools:text="鐢�"
+ android:text="@{String.valueOf(viewModel.infoLiveData.sex)}"
/>
<View
@@ -172,7 +176,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
- android:text="鍚嶆棌"
+ android:text="姘戞棌"
android:textColor="#88000000"
android:textSize="@dimen/sp_12" />
@@ -184,6 +188,7 @@
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
tools:text="姹夋棌"
+ android:text="@{viewModel.infoLiveData.nationality}"
/>
<View
@@ -216,7 +221,9 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="涓浗" />
+ tools:text="涓浗"
+ android:text="@{viewModel.infoLiveData.nation}"
+ />
<View
android:layout_width="match_parent"
@@ -247,7 +254,8 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="鏈" />
+ tools:text="鏈"
+ android:text="@{String.valueOf(viewModel.infoLiveData.maritalStatus)}"/>
<View
android:layout_width="match_parent"
@@ -278,7 +286,8 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="1234567890" />
+ tools:text="1234567890"
+ android:text="@{viewModel.infoLiveData.phoneNumber}"/>
<View
android:layout_width="match_parent"
@@ -311,13 +320,15 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="缇や紬" />
+ tools:text="缇や紬"
+ android:text="@{viewModel.infoLiveData.politicalOutlook}"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
- android:background="#6B000000" />
+ android:background="#6B000000"
+ />
</LinearLayout>
<LinearLayout
@@ -343,7 +354,8 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="440000199801010001" />
+ tools:text="440000199801010001"
+ android:text="@{viewModel.infoLiveData.idNum}"/>
<View
android:layout_width="match_parent"
@@ -375,13 +387,15 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾" />
+ tools:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾"
+ android:text="@{viewModel.infoLiveData.locationAddress}" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="#6B000000" />
+
</LinearLayout>
<LinearLayout
@@ -418,7 +432,7 @@
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerView"
+ android:id="@+id/rv_primary"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_normal_background"
@@ -432,7 +446,7 @@
android:id="@+id/layout_9"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
+ android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/layout_8"
android:layout_marginTop="30dp"
>
@@ -461,11 +475,11 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_relationship"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:background="@color/color_normal_background"
android:layout_marginTop="16dp"
tools:itemCount="3"
- tools:listitem="@layout/item_growth_experience_primary" />
+ tools:listitem="@layout/item_growth_experience_relationship" />
</LinearLayout>
@@ -571,7 +585,7 @@
android:background="@color/color_normal_background"
android:layout_marginTop="16dp"
tools:itemCount="3"
- tools:listitem="@layout/item_growth_experience_primary" />
+ tools:listitem="@layout/item_growth_experience_holder_condition" />
</LinearLayout>
@@ -615,7 +629,7 @@
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@+id/layout_11"
tools:itemCount="3"
- tools:listitem="@layout/item_growth_experience_primary" />
+ tools:listitem="@layout/item_growth_experience_abroad_condition" />
</LinearLayout>
<TextView
@@ -629,6 +643,33 @@
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_12" />
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tab_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:tabPaddingTop="@dimen/dp_22"
+ app:layout_constraintTop_toBottomOf="@+id/tv_autobiography"
+ app:tabMode="scrollable"
+ app:tabGravity="fill" />
+ <androidx.viewpager.widget.ViewPager
+ android:id="@+id/view_pager"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_0"
+ android:layout_weight="1"
+ app:layout_constraintTop_toBottomOf="@id/tab_layout"/>
+ <TextView
+ android:id="@+id/tv_fill"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_fffad1e0_stroke"
+ android:layout_marginBottom="20dp"
+ android:layout_marginTop="@dimen/dp_2"
+ android:paddingStart="10dp"
+ android:paddingEnd="5dp"
+ android:paddingVertical="10dp"
+ app:layout_constraintTop_toBottomOf="@id/view_pager"
+ />
--
Gitblit v1.9.1