From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成
---
app/src/main/res/layout/activity_growth_experience.xml | 156 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 103 insertions(+), 53 deletions(-)
diff --git a/app/src/main/res/layout/activity_growth_experience.xml b/app/src/main/res/layout/activity_growth_experience.xml
index fca0cbc..8db9405 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/app/src/main/res/layout/activity_growth_experience.xml
@@ -8,16 +8,18 @@
name="viewModel"
type="com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel" />
</data>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_normal_background"
android:orientation="vertical"
>
<com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="鎴愰暱缁忓巻"
+ app:layout_constraintTop_toTopOf="parent"
+ app:title="鎴愰暱缁忓巻锛堜粎渚涙煡鐪嬶級"
app:titleGravity="left"
>
<FrameLayout
@@ -37,11 +39,14 @@
</com.android.app_base.widget.ExtendTitleBar>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0dp"
android:orientation="vertical"
android:paddingHorizontal="20dp"
+ app:layout_constraintTop_toBottomOf="@id/title_bar"
+ app:layout_constraintBottom_toBottomOf="parent"
>
<androidx.core.widget.NestedScrollView
+ android:id="@+id/nestedScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
@@ -57,7 +62,7 @@
android:layout_height="wrap_content"
android:text="鍩烘湰淇℃伅"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
+ android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -78,7 +83,7 @@
android:layout_height="@dimen/dp_20"
android:text="濮撳悕"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:id="@+id/editText_name"
@@ -87,7 +92,7 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
android:text="@{viewModel.infoLiveData.nickName}"
tools:text="寮犱笁" />
@@ -114,7 +119,7 @@
android:layout_height="@dimen/dp_20"
android:text="鏇剧敤鍚�"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:id="@+id/editText_usedName"
@@ -122,7 +127,7 @@
android:layout_height="wrap_content"
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="寮犲洓"
android:text="@{viewModel.infoLiveData.oldName}"
/>
@@ -141,6 +146,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/layout_1"
android:layout_marginEnd="20dp"
+ app:imageUrl="@{viewModel.infoLiveData.img}"
/>
<LinearLayout
@@ -160,7 +166,7 @@
android:layout_height="@dimen/dp_20"
android:text="鎬у埆"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -168,9 +174,9 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="鐢�"
- android:text="@{String.valueOf(viewModel.infoLiveData.sex)}"
+ android:text="@{viewModel.infoLiveData.sexStr}"
/>
<View
@@ -193,7 +199,7 @@
android:layout_height="@dimen/dp_20"
android:text="姘戞棌"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -201,7 +207,7 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="姹夋棌"
android:text="@{viewModel.infoLiveData.nationality}"
/>
@@ -227,7 +233,7 @@
android:layout_height="@dimen/dp_20"
android:text="鍥界睄"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -235,7 +241,7 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="涓浗"
android:text="@{viewModel.infoLiveData.nation}"
/>
@@ -260,7 +266,7 @@
android:layout_height="@dimen/dp_20"
android:text="濠氬Щ鐘跺喌"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -268,9 +274,9 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="鏈"
- android:text="@{String.valueOf(viewModel.infoLiveData.maritalStatus)}"/>
+ android:text="@{viewModel.infoLiveData.maritalStatus}"/>
<View
android:layout_width="match_parent"
@@ -292,7 +298,7 @@
android:layout_height="@dimen/dp_20"
android:text="鑱旂郴鏂瑰紡"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -300,7 +306,7 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="1234567890"
android:text="@{viewModel.infoLiveData.phoneNumber}"/>
@@ -326,7 +332,7 @@
android:layout_height="@dimen/dp_20"
android:text="鏀挎不闈㈣矊"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -334,7 +340,7 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="缇や紬"
android:text="@{viewModel.infoLiveData.politicalOutlook}"/>
@@ -360,7 +366,7 @@
android:layout_height="@dimen/dp_20"
android:text="韬唤璇佸彿"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -368,7 +374,7 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="440000199801010001"
android:text="@{viewModel.infoLiveData.idNum}"/>
@@ -393,7 +399,7 @@
android:layout_height="@dimen/dp_20"
android:text="鎴风睄鍦板潃"
android:textColor="#88000000"
- android:textSize="@dimen/sp_12" />
+ android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
@@ -401,7 +407,7 @@
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
tools:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾"
android:text="@{viewModel.infoLiveData.locationAddress}" />
@@ -422,7 +428,7 @@
android:layout_marginTop="16dp"
tools:layout_height="wrap_content"
>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_experience_title"
android:layout_width="match_parent"
android:layout_height="50dp"
@@ -430,21 +436,29 @@
>
<TextView
android:id="@+id/tv_primary_experience"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="涓昏瀛︿範鍙婂伐浣滅粡鍘�"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
+ android:textSize="20sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+
+ />
<ImageView
android:id="@+id/iv_experience_fold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@{viewModel.isExperienceExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
/>
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_primary"
@@ -463,7 +477,7 @@
app:layout_constraintTop_toBottomOf="@id/layout_experience"
android:layout_marginTop="10dp"
>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_relation_title"
android:layout_width="match_parent"
android:layout_height="50dp"
@@ -476,15 +490,22 @@
android:layout_height="wrap_content"
android:text="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
+ android:textSize="20sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
<ImageView
android:id="@+id/iv_relation_fold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@{viewModel.isRelationExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
/>
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_relationship"
@@ -513,7 +534,7 @@
android:layout_marginTop="@dimen/dp_5"
android:text="绉诲眳鍥斤紙澧冿級鎯呭喌"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
+ android:textSize="20sp"
android:textStyle="bold"
/>
@@ -529,7 +550,8 @@
android:id="@+id/radioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:checked="true"
+ android:checked="@{viewModel.infoLiveData.outStatus==1?true:false}"
+ android:clickable="false"
android:text="鏄�"
/>
<View
@@ -548,13 +570,14 @@
android:id="@+id/editText_Residence_Number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingHorizontal="20dp"
android:autofillHints="creditCardNumber"
android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="16sp"
+ tools:text="1234567890"
+ android:text="@{viewModel.infoLiveData.idNo}"
/>
<View
- android:layout_width="140dp"
+ android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#6B000000"
android:layout_marginTop="8dp"
@@ -569,7 +592,7 @@
android:layout_marginTop="10dp"
app:layout_constraintTop_toBottomOf="@id/layout_10"
>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_holder_title"
android:layout_width="match_parent"
android:layout_height="50dp"
@@ -582,17 +605,24 @@
android:layout_weight="1"
android:text="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
+ android:textSize="20sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
- <ImageButton
+ <ImageView
android:id="@+id/iv_holder_fold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@{viewModel.isHolderExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
/>
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_certificates"
@@ -612,7 +642,7 @@
app:layout_constraintTop_toBottomOf="@id/layout_holder"
android:layout_marginTop="10dp"
>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_abroad_title"
android:layout_width="match_parent"
android:layout_height="50dp"
@@ -625,17 +655,24 @@
android:layout_weight="1"
android:text="鍑哄浗锛堝锛夋儏鍐�"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
+ android:textSize="20sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
- <ImageButton
+ <ImageView
android:id="@+id/iv_abroad_fold"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
- android:background="@{viewModel.isAbroadExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}}"
+ android:background="@{viewModel.isAbroadExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
/>
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_abroad"
@@ -653,7 +690,7 @@
android:layout_marginTop="20dp"
android:text="鑷紶"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
+ android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_abroad"
@@ -678,6 +715,8 @@
android:background="@drawable/shape_fffad1e0_stroke_0_10_10_10"
android:paddingHorizontal="16dp"
android:paddingVertical="10dp"
+ android:visibility="gone"
+ tools:visibility="visible"
app:layout_constraintTop_toBottomOf="@id/tab_layout"
/>
@@ -686,5 +725,16 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
- </LinearLayout>
+ <androidx.constraintlayout.utils.widget.ImageFilterView
+ android:id="@+id/fab_move_to_top"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginEnd="25dp"
+ android:layout_marginBottom="44dp"
+ app:fabCustomSize="100dp"
+ android:background="@drawable/ic_move_to_top"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</layout>
--
Gitblit v1.9.1