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/activity_growth_experience.xml | 1151 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 676 insertions(+), 475 deletions(-)
diff --git a/app/src/main/res/layout/activity_growth_experience.xml b/app/src/main/res/layout/activity_growth_experience.xml
index a0e4f54..20ad55c 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/app/src/main/res/layout/activity_growth_experience.xml
@@ -3,541 +3,742 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <LinearLayout
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel" />
+ </data>
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical"
>
- <com.hjq.bar.TitleBar
- android:id="@+id/titleBar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:layout_constraintTop_toTopOf="parent"
- android:paddingHorizontal="0dp"
- android:background="@color/color_title_bar_background"
- app:leftIcon="@null"
- app:rightIcon="@null">
-
+ <com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/title_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:title="鎴愰暱缁忓巻锛堜粎渚涙煡鐪嬶級"
+ app:titleGravity="left"
+ app:leftIcon="@drawable/ic_back"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ android:visibility="gone"
+ >
<ImageView
- android:id="@+id/iv_menu"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_marginHorizontal="16dp"
- android:background="@drawable/ic_menu"
- android:layout_gravity="center_vertical" />
-
- <FrameLayout
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_marginHorizontal="16dp"
- android:layout_gravity="center_vertical|end">
-
- </FrameLayout>
-
- <LinearLayout
- android:id="@+id/layout_default"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginHorizontal="56dp"
- android:gravity="center_vertical">
-
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="鎴愰暱缁忓巻"
- android:layout_weight="1"
- android:textColor="@color/white"
- android:textSize="@dimen/sp_20" />
- </LinearLayout>
- </com.hjq.bar.TitleBar>
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
+ </com.android.app_base.widget.ExtendTitleBar>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="603dp"
+ android:layout_height="0dp"
android:orientation="vertical"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintBottom_toBottomOf="parent">
-
+ 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"
>
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="@dimen/dp_10"
- >
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/gl_v_0.5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_percent="0.5"
- />
- <TextView
- android:id="@+id/tv_basic_information"
- android:layout_width="wrap_content"
- android:layout_marginTop="@dimen/dp_10"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_height="wrap_content"
- android:text="鍩烘湰淇℃伅"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingHorizontal="20dp"
- android:id="@+id/layout_1"
- app:layout_constraintTop_toBottomOf="@id/tv_basic_information">
- <TextView
- android:id="@+id/tv_name"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="濮撳悕"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_name"
- android:layout_width="140dp"
- android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ュ鍚�"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
-
- />
-
- </LinearLayout>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:id="@+id/layout_2"
- android:paddingHorizontal="20dp"
- app:layout_constraintTop_toBottomOf="@id/layout_1">
+ android:paddingBottom="20dp"
+ >
<TextView
- android:id="@+id/tv_usedName"
+ android:id="@+id/tv_basic_information"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="鏇剧敤鍚�"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_usedName"
- android:layout_width="140dp"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ユ浘鐢ㄥ悕"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
- />
-
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:id="@+id/layout_3"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toBottomOf="@id/layout_2">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:id="@+id/layout_3_1"
- android:layout_marginLeft="@dimen/dp_20"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintTop_toBottomOf="@id/layout_2">
- <TextView
- android:id="@+id/tv_gender"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="鎬у埆"
+ android:text="鍩烘湰淇℃伅"
android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_gender"
- android:layout_width="140dp"
- android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ユ�у埆"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- />
- </LinearLayout>
<LinearLayout
- android:layout_width="wrap_content"
+ android:id="@+id/layout_1"
+ android:layout_width="140dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:orientation="vertical"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_basic_information"
+ >
+
+ <TextView
+ android:id="@+id/tv_name"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="濮撳悕"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/editText_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ android:text="@{viewModel.infoLiveData.nickName}"
+ tools:text="寮犱笁" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:id="@+id/layout_2"
+ android:layout_width="140dp"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:id="@+id/layout_3_2"
- android:layout_marginEnd="@dimen/dp_20"
- >
+ android:layout_marginTop="20dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/layout_1">
+
<TextView
- android:id="@+id/tv_ethnicGroup"
+ android:id="@+id/tv_usedName"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="鏇剧敤鍚�"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/editText_usedName"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ tools:text="寮犲洓"
+ android:text="@{viewModel.infoLiveData.oldName}"
+ />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="100dp"
+ android:layout_height="127dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/layout_1"
+ android:layout_marginEnd="20dp"
+ app:imageUrl="@{viewModel.infoLiveData.img}"
+ />
+
+ <LinearLayout
+ android:id="@+id/layout_3_1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="@+id/layout_2"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/layout_2"
+ app:layout_constraintTop_toBottomOf="@id/layout_2">
+
+ <TextView
+ android:id="@+id/tv_gender"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="鎬у埆"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ tools:text="鐢�"
+ android:text="@{viewModel.infoLiveData.sexStr}"
+ />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="140dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/layout_3_1"
+ >
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="姘戞棌"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_ethnicGroup"
- android:layout_width="140dp"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ユ皯鏃�"
- android:inputType="text"
android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
-
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ tools:text="姹夋棌"
+ android:text="@{viewModel.infoLiveData.nation}"
/>
- </LinearLayout>
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:id="@+id/layout_4"
- android:paddingHorizontal="20dp"
- app:layout_constraintTop_toBottomOf="@id/layout_3">
- <TextView
- android:id="@+id/tv_nationality"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="鍥界睄"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_nationality"
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/linearLayout"
android:layout_width="140dp"
android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ュ浗绫�"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
-
- />
-
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingHorizontal="20dp"
- android:id="@+id/layout_5"
- app:layout_constraintTop_toBottomOf="@id/layout_4">
- <TextView
- android:id="@+id/tv_politicalStatus"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="鏀挎不闈㈣矊"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_politicalStatus"
- android:layout_width="140dp"
- android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ユ斂娌婚潰璨�"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
-
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_marginTop="20dp"
android:orientation="vertical"
- android:paddingHorizontal="20dp"
+ app:layout_constraintStart_toStartOf="@+id/layout_2"
+ app:layout_constraintTop_toBottomOf="@+id/layout_3_1">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="鍥界睄"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ tools:text="涓浗"
+ android:text="@{viewModel.infoLiveData.nationality}"
+ android:ellipsize="end"
+ android:maxLines="1"
+ />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/linearLayout3"
+ android:layout_width="140dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/linearLayout">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="濠氬Щ鐘跺喌"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ tools:text="鏈"
+ android:text="@{viewModel.infoLiveData.maritalStatus}"/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="140dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/linearLayout2">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="鑱旂郴鏂瑰紡"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ tools:text="1234567890"
+ android:text="@{viewModel.infoLiveData.phoneNumber}"/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="140dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="20dp"
+ app:layout_constraintStart_toStartOf="@+id/layout_2"
+ app:layout_constraintTop_toBottomOf="@+id/linearLayout">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="鏀挎不闈㈣矊"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ tools:text="缇や紬"
+ android:text="@{viewModel.infoLiveData.politicalOutlook}"/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000"
+ />
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/layout_6"
- app:layout_constraintTop_toBottomOf="@id/layout_5">
- <TextView
- android:id="@+id/tv_idNumber"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="韬唤璇佸彿"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_idNumber"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ヨ韩浠借瘉鍙�"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingHorizontal="20dp"
- android:id="@+id/layout_7"
- app:layout_constraintTop_toBottomOf="@id/layout_6">
- <TextView
- android:id="@+id/tv_address"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="鎴风睄鍦板潃"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
- <EditText
- android:id="@+id/editText_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="璇疯緭鍏ユ埛绫嶅湴鍧�"
- android:inputType="text"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16"
+ android:orientation="vertical"
+ android:layout_marginTop="20dp"
+ app:layout_constraintStart_toStartOf="@+id/layout_2"
+ app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
- />
- </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="韬唤璇佸彿"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
- <LinearLayout
- android:id="@+id/layout_8"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintTop_toBottomOf="@id/layout_7"
- tools:layout_editor_absoluteX="0dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ tools:text="440000199801010001"
+ android:text="@{viewModel.infoLiveData.idNum}"/>
- <TextView
- android:id="@+id/tv_primary_experience"
- android:layout_width="0dp"
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="5dp"
+ android:background="#6B000000" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_7"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_5"
- android:text="涓昏瀛︿範鍙婂伐浣滅粡鍘�"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
+ android:orientation="vertical"
+ android:layout_marginTop="20dp"
+ app:layout_constraintStart_toStartOf="@+id/layout_2"
+ app:layout_constraintTop_toBottomOf="@+id/layout_6">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="鎴风睄鍦板潃"
+ android:textColor="#88000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textColorHint="#6b000000"
+ android:textSize="16sp"
+ 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
+ android:id="@+id/layout_experience"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/layout_7"
+ android:layout_marginTop="16dp"
+ tools:layout_height="wrap_content"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_experience_title"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_primary_experience"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="涓昏瀛︿範鍙婂伐浣滅粡鍘�"
+ android:textColor="#ff000000"
+ 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"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_primary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:itemCount="3"
+ tools:listitem="@layout/item_growth_experience_primary"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_relation"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/layout_experience"
+ android:layout_marginTop="10dp"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_relation_title"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_relationship_condition"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�"
+ android:textColor="#ff000000"
+ 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"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_relationship"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?attr/pageBackgroundColor"
+ tools:itemCount="3"
+ tools:listitem="@layout/item_growth_experience_relationship" />
+ </LinearLayout>
- <ImageButton
- android:id="@+id/iv_fold_1"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginEnd="24dp"
- android:layout_gravity="center_vertical"
- android:contentDescription="@string/iv_fold_1_description"
- android:background="@drawable/ic_unfold" />
- </LinearLayout>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerView"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/color_normal_background"
- app:layout_constraintTop_toBottomOf="@+id/layout_8"
- app:layout_constraintVertical_bias="1.0"
- tools:itemCount="4"
- tools:layout_editor_absoluteX="-81dp"
- tools:listitem="@layout/item_growth_experience_primary" />
- <LinearLayout
- android:id="@+id/layout_9"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintTop_toBottomOf="@id/layout_8"
- tools:layout_editor_absoluteX="0dp">
-
- <TextView
- android:id="@+id/tv_relationship_condition"
- android:layout_width="0dp"
- android:layout_weight="1"
+ <LinearLayout
+ android:id="@+id/layout_10"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_5"
- android:text="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/layout_relation"
+ android:layout_marginTop="10dp"
+ >
- <ImageButton
- android:id="@+id/iv_fold_2"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_gravity="center"
- android:layout_marginEnd="24dp"
- android:contentDescription="@string/iv_fold_1_description"
- android:background="@drawable/ic_unfold" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/tv_migration_condition"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_5"
+ android:text="绉诲眳鍥斤紙澧冿級鎯呭喌"
+ android:textColor="#ff000000"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ />
- <LinearLayout
- android:id="@+id/layout_10"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/layout_9"
- tools:layout_editor_absoluteX="0dp">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�"
+ android:textColor="#6b000000"
+ android:textSize="12sp" />
+
+ <RadioButton
+ android:id="@+id/radioButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:checked="@{viewModel.infoLiveData.outStatus==1?true:false}"
+ android:clickable="false"
+ android:text="鏄�"
+ />
+ <View
+ android:layout_width="140dp"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:text="璇佷欢鍙风爜"
+ android:textColor="#6b000000"
+ android:textSize="12sp" />
+ <TextView
+ android:id="@+id/editText_Residence_Number"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ tools:text="1234567890"
+ android:text="@{viewModel.infoLiveData.idNo}"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_holder"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:orientation="vertical"
+ android:layout_marginTop="10dp"
+ app:layout_constraintTop_toBottomOf="@id/layout_10"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_holder_title"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_certificate_condition"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鎸佹湁璇佷欢鎯呭喌"
+ android:textColor="#ff000000"
+ 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_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"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_certificates"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:itemCount="3"
+ tools:listitem="@layout/item_growth_experience_holder_condition" />
+ </LinearLayout>
+
+
+
+ <LinearLayout
+ android:id="@+id/layout_abroad"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/layout_holder"
+ android:layout_marginTop="10dp"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_abroad_title"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_abroad_condition"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鍑哄浗锛堝锛夋儏鍐�"
+ android:textColor="#ff000000"
+ 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_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}"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_abroad"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@+id/layout_11"
+ tools:itemCount="3"
+ tools:listitem="@layout/item_growth_experience_abroad_condition" />
+ </LinearLayout>
<TextView
- android:id="@+id/tv_migration_condition"
+ android:id="@+id/tv_autobiography"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_5"
- android:text="绉诲眳鍥斤紙澧冿級鎯呭喌"
+ 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_9" />
-
- <TextView
+ app:layout_constraintTop_toBottomOf="@+id/layout_abroad"
+ />
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tab_layout"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingHorizontal="@dimen/dp_20"
- android:paddingTop="@dimen/dp_5"
- android:text="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�"
- android:textColor="#6b000000"
- android:textSize="12sp" />
-
- <RadioButton
- android:id="@+id/radioButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_20"
- android:paddingHorizontal="@dimen/dp_9"
- android:checked="true"
- android:text="鏄�"
+ android:layout_height="30dp"
+ android:layout_marginTop="16dp"
+ app:tabTextAppearance="@style/MyTabLayout"
+ app:tabTextColor="#88000000"
+ app:tabSelectedTextColor="#FF000000"
+ app:layout_constraintTop_toBottomOf="@+id/tv_autobiography"
+ app:tabMode="scrollable"
+ app:tabIndicatorHeight="0dp"
+ app:tabGravity="fill"
/>
<TextView
+ android:id="@+id/tv_fill"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingHorizontal="@dimen/dp_20"
- android:paddingTop="@dimen/dp_5"
- android:text="璇佷欢鍙风爜"
- android:textColor="#6b000000"
- android:textSize="12sp" />
- <EditText
- android:id="@+id/editText_Residence_Number"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingHorizontal="20dp"
- android:hint="璇疯緭鍏ヨ瘉浠跺彿鐮�"
- android:inputType="number"
- android:autofillHints="creditCardNumber"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_16" />
- </LinearLayout>
- <LinearLayout
- android:id="@+id/layout_11"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintTop_toBottomOf="@id/layout_10"
- tools:layout_editor_absoluteX="0dp">
-
- <TextView
- android:id="@+id/tv_certificate_condition"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_5"
- android:text="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
+ 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"
+ />
- <ImageButton
- android:id="@+id/iv_fold_3"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginEnd="24dp"
- android:layout_gravity="center_vertical"
- android:background="@drawable/ic_unfold" />
- </LinearLayout>
- <LinearLayout
- android:id="@+id/layout_12"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintTop_toBottomOf="@id/layout_11"
- tools:layout_editor_absoluteX="0dp">
-
- <TextView
- android:id="@+id/tv_abroad_condition"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_5"
- android:text="鍑哄浗锛堝锛夋儏鍐�"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold" />
-
-
- <ImageButton
- android:id="@+id/iv_fold_4"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginEnd="24dp"
- android:layout_gravity="center_vertical"
- android:background="@drawable/ic_unfold" />
- </LinearLayout>
- <LinearLayout
-
- android:id="@+id/layout_13"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/layout_12"
- tools:layout_editor_absoluteX="0dp">
- <TextView
- android:id="@+id/tv_autobiography"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_5"
- android:text="鑷紶"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_20"
- android:textStyle="bold"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/layout_12" />
-
- </LinearLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
- </LinearLayout>
- </layout>
+ <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