zhangshi_app_android.git

			@@ -33,7 +33,7 @@
			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingBottom="@dimen/dp_10"
			android:paddingBottom="20dp"
			>
			<TextView
			android:id="@+id/tv_basic_information"
			@@ -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
			@@ -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,70 +387,72 @@
			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
			android:id="@+id/layout_8"
			android:id="@+id/layout_experience"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="50dp"
			android:orientation="vertical"
			app:layout_constraintTop_toBottomOf="@id/layout_7"
			tools:layout_editor_absoluteX="0dp"
			android:layout_marginTop="16dp"
			tools:layout_height="wrap_content"
			>
			<LinearLayout
			android:id="@+id/layout_experience_title"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="50dp"
			android:gravity="center_vertical"
			>
			<TextView
			android:id="@+id/tv_primary_experience"
			android:layout_width="0dp"
			android:layout_height="wrap_content"
			android:layout_weight="1"
			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_1"
			android:layout_width="20dp"
			android:layout_height="20dp"
			<ImageView
			android:id="@+id/iv_experience_fold"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_gravity="center_vertical"
			android:contentDescription="@string/iv_fold_1_description"
			android:background="@drawable/ic_unfold"
			android:background="@{viewModel.isExperienceExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
			/>
			</LinearLayout>

			<androidx.recyclerview.widget.RecyclerView
			android:id="@+id/rv_primary"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@color/color_normal_background"
			android:layout_marginTop="16dp"
			android:layout_height="wrap_content"
			tools:itemCount="3"
			tools:listitem="@layout/item_growth_experience_primary" />

			tools:listitem="@layout/item_growth_experience_primary"
			/>
			</LinearLayout>

			<LinearLayout
			android:id="@+id/layout_9"
			android:id="@+id/layout_relation"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="horizontal"
			app:layout_constraintTop_toBottomOf="@id/layout_8"
			android:layout_marginTop="30dp"
			android:layout_height="50dp"
			android:orientation="vertical"
			app:layout_constraintTop_toBottomOf="@id/layout_experience"
			android:layout_marginTop="10dp"
			>
			<LinearLayout
			android:id="@+id/layout_relation_title"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="50dp"
			android:gravity="center_vertical"
			>
			<TextView
			android:id="@+id/tv_relationship_condition"
			@@ -449,21 +463,19 @@
			android:textColor="#ff000000"
			android:textSize="@dimen/sp_20"
			android:textStyle="bold" />
			<ImageButton
			android:id="@+id/iv_fold_2"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:layout_gravity="center"
			android:contentDescription="@string/iv_fold_1_description"
			android:background="@drawable/ic_unfold" />
			<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}"
			/>
			</LinearLayout>

			<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_relationship" />
			</LinearLayout>
			@@ -475,8 +487,8 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			app:layout_constraintTop_toBottomOf="@id/layout_9"
			android:layout_marginTop="30dp"
			app:layout_constraintTop_toBottomOf="@id/layout_relation"
			android:layout_marginTop="10dp"
			>

			<TextView
			@@ -535,16 +547,18 @@
			</LinearLayout>

			<LinearLayout
			android:id="@+id/layout_11"
			android:id="@+id/layout_holder"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="50dp"
			android:orientation="vertical"
			android:layout_marginTop="30dp"
			android:layout_marginTop="10dp"
			app:layout_constraintTop_toBottomOf="@id/layout_10"
			>
			<LinearLayout
			android:id="@+id/layout_holder_title"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="50dp"
			android:gravity="center_vertical"
			>
			<TextView
			android:id="@+id/tv_certificate_condition"
			@@ -557,19 +571,18 @@
			android:textStyle="bold" />

			<ImageButton
			android:id="@+id/iv_fold_3"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:id="@+id/iv_holder_fold"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_gravity="center_vertical"
			android:background="@drawable/ic_unfold" />
			android:background="@{viewModel.isHolderExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
			/>
			</LinearLayout>

			<androidx.recyclerview.widget.RecyclerView
			android:id="@+id/rv_certificates"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@color/color_normal_background"
			android:layout_marginTop="16dp"
			android:layout_height="wrap_content"
			tools:itemCount="3"
			tools:listitem="@layout/item_growth_experience_holder_condition" />
			</LinearLayout>
			@@ -577,16 +590,18 @@


			<LinearLayout
			android:id="@+id/layout_12"
			android:id="@+id/layout_abroad"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="50dp"
			android:orientation="vertical"
			app:layout_constraintTop_toBottomOf="@id/layout_11"
			android:layout_marginTop="30dp"
			app:layout_constraintTop_toBottomOf="@id/layout_holder"
			android:layout_marginTop="10dp"
			>
			<LinearLayout
			android:id="@+id/layout_abroad_title"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="50dp"
			android:gravity="center_vertical"
			>
			<TextView
			android:id="@+id/tv_abroad_condition"
			@@ -599,20 +614,18 @@
			android:textStyle="bold" />

			<ImageButton
			android:id="@+id/iv_fold_4"
			android:id="@+id/iv_abroad_fold"
			android:layout_width="20dp"
			android:layout_height="20dp"
			android:layout_gravity="center_vertical"
			android:background="@drawable/ic_unfold"
			android:background="@{viewModel.isAbroadExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}}"
			/>
			</LinearLayout>

			<androidx.recyclerview.widget.RecyclerView
			android:id="@+id/rv_abroad"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@color/color_normal_background"
			android:layout_marginTop="16dp"
			android:layout_height="wrap_content"
			app:layout_constraintTop_toBottomOf="@+id/layout_11"
			tools:itemCount="3"
			tools:listitem="@layout/item_growth_experience_abroad_condition" />
			@@ -622,13 +635,36 @@
			android:id="@+id/tv_autobiography"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="30dp"
			android:layout_marginTop="20dp"
			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" />
			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="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:background="@drawable/shape_fffad1e0_stroke_0_10_10_10"
			android:paddingHorizontal="16dp"
			android:paddingVertical="10dp"
			app:layout_constraintTop_toBottomOf="@id/tab_layout"
			/>