改bug、

Linjiajia

2023-04-04 2b6fd0451bfa358052ac9eb061ec1ed595587e9e

改bug、

 .idea/deploymentTargetDropDown.xml

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="deploymentTargetDropDown">
    <runningDeviceTargetSelectedWithDropDown>
      <Target>
        <type value="RUNNING_DEVICE_TARGET" />
        <deviceKey>
          <Key>
            <type value="VIRTUAL_DEVICE_PATH" />
            <value value="D:\software\Android\.android\avd\Pixel_API_30.avd" />
          </Key>
        </deviceKey>
      </Target>
    </runningDeviceTargetSelectedWithDropDown>
    <timeTargetWasSelectedWithDropDown value="2023-04-03T09:11:44.626235900Z" />
  </component>
    <component name="deploymentTargetDropDown">
        <runningDeviceTargetSelectedWithDropDown>
            <Target>
                <type value="RUNNING_DEVICE_TARGET" />
                <deviceKey>
                    <Key>
                        <type value="VIRTUAL_DEVICE_PATH" />
                        <value value="D:\software\Android\.android\avd\Pixel_API_30.avd" />
                    </Key>
                </deviceKey>
            </Target>
        </runningDeviceTargetSelectedWithDropDown>
        <timeTargetWasSelectedWithDropDown value="2023-04-03T09:11:44.626235900Z" />
    </component>
</project>

 app/src/main/AndroidManifest.xml

@@ -118,6 +118,9 @@
        <activity
            android:name=".ui.function.HomeDevicesDetailActivity"
            android:exported="false" />
        <activity
            android:name=".ui.function.GrowthExperienceActivity"
            android:exported="false" />
    </application>

</manifest>

 app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java

New file
@@ -0,0 +1,77 @@
package com.application.zhangshi_app_android.bean;

import java.io.Serializable;
import java.util.List;

/**
 * @author Gss
 * @date 2023.03.31. 17:47
 * @desc 成长经历 bean 类
 */
public class GrowthExperienceBean implements Serializable {
    private String idName;
    private  String usedName;
    private  String gender;
    private  String nationality;
    private  String ethnicGroup;
    private  String marriageCondition;
    private  String politicalStatus;
    private  String contactNumber;
    private  String idNumber;
    private String address;
    private  String duringTime;
    private  String relationship;
    private  String School;
    private  String passCheck;
    private  String abroadZone;
    private List<String> url;

    public String getAddress() { return address; }
    public void setAddress(String value) { this.address = value; }

    public String getIdName() { return idName; }
    public void setIdName(String value) { this.idName = value; }
    public String getUsedName() { return usedName; }
    public void setUsedName(String value) { this.usedName = value; }


    public String getGender() { return gender; }
    public void setGender(String value) { this.gender = value; }

    public String getNationality() { return nationality; }
    public void setNationality(String value) { this.nationality = value; }

    public String getEthnicGroup() { return ethnicGroup; }
    public void setEthnicGroup(String value) { this.ethnicGroup = value; }

    public String getMarriageCondition() { return marriageCondition; }
    public void setMarriageCondition(String value) { this.marriageCondition = value; }

    public String getPoliticalStatus() { return politicalStatus; }
    public void setPoliticalStatus(String value) { this.politicalStatus = value; }

    public String getContactNumber() { return contactNumber; }
    public void setContactNumber(String value) { this.contactNumber = value; }

    public String getIdNumber() { return idNumber; }
    public void setIdNumber(String value) { this.idNumber = value; }

    public String getDuringTime() { return duringTime; }
    public void setDuringTime(String value) { this.duringTime = value; }

    public String getSchool() { return School; }
    public void setSchool(String value) { this.School = value; }

    public String getRelationship() { return relationship; }
    public void setRelationship(String value) { this.relationship = value; }

    public String getPassCheck() { return passCheck; }
    public void setPassCheck(String value) { this.passCheck = value; }
    public String getAbroadZone() { return abroadZone; }
    public void setAbroadZone(String value) { this.abroadZone = value; }
    public List<String> getUrl() { return url; }
    public void setUrl(List<String> value) { this.url = value; }


}


 app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRequestBean.java

New file
@@ -0,0 +1,88 @@
package com.application.zhangshi_app_android.bean;

import java.util.List;

/**
 * @author Gss
 * @date 2023.04.02. 19:29
 * @desc
 */
public class GrowthExperienceRequestBean {

    private String idName;
    private  String usedName;
    private  String gender;
    private  String nationality;
    private  String ethnicGroup;
    private  String marriageCondition;
    private  String politicalStatus;
    private  String contactNumber;
    private  String idNumber;
    private String address;
    private String duringTime;
    private String School;
    private  String passCheck;
    private  String abroadZone;
    private int pageNum;
    private int pageSize;
    private String relationship;
    private List<String> url;

    public String getAddress() { return address; }
    public void setAddress(String value) { this.address = value; }

    public String getUsedName() { return usedName; }
    public void setUsedName(String value) { this.usedName = value; }

    public String getIdName() { return idName; }
    public void setIdName(String value) {
        this.idName = value;
    }

    public String getGender() { return gender; }
    public void setGender(String value) { this.gender = value; }

    public String getNationality() { return nationality; }
    public void setNationality(String value) { this.nationality = value; }

    public String getEthnicGroup() { return ethnicGroup; }
    public void setEthnicGroup(String value) { this.ethnicGroup = value; }

    public String getMarriageCondition() { return marriageCondition; }
    public void setMarriageCondition(String value) { this.marriageCondition = value; }

    public String getPoliticalStatus() { return politicalStatus; }
    public void setPoliticalStatus(String value) { this.politicalStatus = value; }

    public String getContactNumber() { return contactNumber; }
    public void setContactNumber(String value) { this.contactNumber = value; }

    public String getIdNumber() { return idNumber; }
    public void setIdNumber(String value) { this.idNumber = value; }

    public int getPageNum() {
        return pageNum;
    }

    public void setPageNum(int pageNum) {
        this.pageNum = pageNum;
    }

    public int getPageSize() {
        return pageSize;
    }
    public String getRelationship() { return relationship; }
    public void setRelationship(String value) { this.relationship = value; }
    public void setPageSize(int pageSize) {
        this.pageSize = pageSize;
    }
    public String getDuringTime() { return duringTime; }
    public void setDuringTime(String value) { this.duringTime = value; }
    public String getSchool() { return School; }
    public void setSchool(String value) { this.School = value; }
    public String getPassCheck() { return passCheck; }
    public void setPassCheck(String value) { this.passCheck = value; }
    public String getAbroadZone() { return abroadZone; }
    public void setAbroadZone(String value) { this.abroadZone = value; }

}

 app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java

New file
@@ -0,0 +1,11 @@
package com.application.zhangshi_app_android.bean;
import java.util.List;

/**
 * @author Gss
 * @date 2023.03.28. 13:52
 * @desc 获取成长经历的返回类
 */
public class GrowthExperienceResponseBean {

}

 app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java

@@ -17,6 +17,7 @@
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.ui.function.FamilyAssetsActivity;
import com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivity;
import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
import com.application.zhangshi_app_android.ui.function.HomeDevicesActivity;
import com.hjq.bar.TitleBar;

@@ -81,7 +82,7 @@
            classMap.put(null,(LinearLayout) findViewById(R.id.dl_contacts));
            classMap.put(null,(LinearLayout) findViewById(R.id.dl_pet));
            classMap.put(null,(LinearLayout) findViewById(R.id.dl_income_and_expenses));
            classMap.put(null,(LinearLayout) findViewById(R.id.dl_growing_up));
            classMap.put(GrowthExperienceActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
            classMap.put(null,(LinearLayout) findViewById(R.id.dl_marriage));
            classMap.put(null,(LinearLayout) findViewById(R.id.dl_property));
            classMap.put(null,(LinearLayout) findViewById(R.id.dl_hundred_wish));

 app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java

@@ -65,6 +65,12 @@
                AppManager.getAppManager().startActivity(HomeDevicesActivity.class);
            }
        });
        binding.layoutGrowingUp.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
                AppManager.getAppManager().startActivity(GrowthExperienceActivity.class);
            }
        });
    }

    @Override

 app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java

New file
@@ -0,0 +1,47 @@
package com.application.zhangshi_app_android.ui.function;

import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.databinding.ActivityGrowthExperienceBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;

/**
 * @author Gss
 * @date 2023.03.31. 16:00
 * @desc 成长经历 GrowthExperienceActivity
 */
public class GrowthExperienceActivity extends DLBaseActivity<ActivityGrowthExperienceBinding,GrowthExperienceActivityViewModel> {

    @Override
    public int getLayoutId() {
        return R.layout.activity_growth_experience;
    }

    @Override
    public int getVariableId() {
        return BR.viewModel;
    }

    @Override
    public void initParam() {

    }

    @Override
    public void initView() {

    }

    @Override
    public void initData() {

    }


    @Override
    public void initLiveDataObserve() {

    }


}

 app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java

New file
@@ -0,0 +1,40 @@
package com.application.zhangshi_app_android.ui.function;
import static com.android.app_base.base.BaseConfig.CODE_SUCCESS;
import android.app.Application;

import androidx.annotation.NonNull;
import androidx.databinding.DataBindingUtil;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModelProvider;

import com.android.app_base.http.ResultData;
import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.RxUtils;
import com.android.app_base.utils.ToastUtils;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
import com.application.zhangshi_app_android.data.DataRepository;

import java.util.List;

import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
/**
 * @author Gss
 * @date 2023.03.31. 21:33
 * @desc 成长经历 viewModel
 */
public class GrowthExperienceActivityViewModel extends BaseViewModel<DataRepository>  {

    public GrowthExperienceActivityViewModel(@NonNull Application application) {
        super(application);
    }
    @Override
    protected DataRepository initModel() {
        return DataRepository.getInstance();
    }

}

 app/src/main/res/drawable-xhdpi/ic_fold.png

 app/src/main/res/drawable-xhdpi/ic_import_add.png

 app/src/main/res/drawable-xhdpi/ic_unchecked.png

 app/src/main/res/drawable-xhdpi/ic_unfold.png

 app/src/main/res/drawable-xxhdpi/ic_fold.png

 app/src/main/res/drawable-xxhdpi/ic_import_add.png

 app/src/main/res/drawable-xxhdpi/ic_unchecked.png

 app/src/main/res/drawable-xxhdpi/ic_unfold.png

 app/src/main/res/drawable/selector_checkbox.xml

@@ -3,9 +3,9 @@
    <item
        android:state_checked="true"
        android:drawable="@drawable/ic_checked" />
<!--    <item-->
<!--        android:state_checked="false"-->
<!--        android:drawable="@null" />-->
<!--    <item-->
<!--        android:drawable="@null" />&lt;!&ndash; The default one &ndash;&gt;-->
    <item
        android:state_checked="false"
        android:drawable="@drawable/ic_unchecked" />
    <item
        android:drawable="@drawable/ic_unchecked" /><!-- The default one -->
</selector>

 app/src/main/res/layout/activity_growth_experience.xml

New file
@@ -0,0 +1,639 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <data>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel" />
    </data>
    <LinearLayout
        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:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:title="成长经历"
            app:titleGravity="left"
            />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:orientation="vertical"
            android:paddingHorizontal="20dp"
            >
            <androidx.core.widget.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"
                    >
                    <TextView
                        android:id="@+id/tv_basic_information"
                        android:layout_width="wrap_content"
                        android:layout_marginTop="@dimen/dp_10"
                        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: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="@dimen/sp_12" />

                        <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="@dimen/sp_16"
                            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:layout_marginTop="20dp"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toBottomOf="@id/layout_1">

                        <TextView
                            android:id="@+id/tv_usedName"
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_20"
                            android:text="曾用名"
                            android:textColor="#88000000"
                            android:textSize="@dimen/sp_12" />

                        <TextView
                            android:id="@+id/editText_usedName"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textSize="@dimen/sp_16"
                            tools:text="张四"
                            />

                        <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"
                        />

                    <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="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            tools:text="男"
                            />

                        <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="#88000000"
                            android:textSize="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            tools:text="汉族"
                            />

                        <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:layout_marginTop="20dp"
                        android:orientation="vertical"
                        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="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            tools:text="中国" />

                        <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="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            tools:text="未婚" />

                        <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="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            tools:text="1234567890" />

                        <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="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            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_6"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="vertical"
                        android:layout_marginTop="20dp"
                        app:layout_constraintStart_toStartOf="@+id/layout_2"
                        app:layout_constraintTop_toBottomOf="@+id/linearLayout2">

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_20"
                            android:text="身份证号"
                            android:textColor="#88000000"
                            android:textSize="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            tools:text="440000199801010001" />

                        <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: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="@dimen/sp_12" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textColorHint="#6b000000"
                            android:textSize="@dimen/sp_16"
                            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_8"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="vertical"
                        app:layout_constraintTop_toBottomOf="@id/layout_7"
                        tools:layout_editor_absoluteX="0dp"
                        android:layout_marginTop="16dp"
                        >
                        <LinearLayout
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            >
                            <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"
                                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"
                            android:layout_marginTop="16dp"
                            tools:itemCount="3"
                            tools:listitem="@layout/item_growth_experience_primary" />

                    </LinearLayout>

                    <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"
                        android:layout_marginTop="30dp"
                        >
                        <LinearLayout
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            >
                            <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="@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" />
                        </LinearLayout>

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



                    <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"
                        android:layout_marginTop="30dp"
                        >

                        <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="@dimen/sp_20"
                            android:textStyle="bold"
                            />

                        <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="true"
                            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:paddingHorizontal="20dp"
                            android:autofillHints="creditCardNumber"
                            android:textColor="#DE000000"
                            android:textSize="@dimen/sp_16"
                            />
                        <View
                            android:layout_width="140dp"
                            android:layout_height="1dp"
                            android:background="#6B000000"
                            android:layout_marginTop="8dp"
                            />
                    </LinearLayout>

                    <LinearLayout
                        android:id="@+id/layout_11"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="vertical"
                        android:layout_marginTop="30dp"
                        app:layout_constraintTop_toBottomOf="@id/layout_10"
                        >
                        <LinearLayout
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            >
                            <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="@dimen/sp_20"
                                android:textStyle="bold" />

                            <ImageButton
                                android:id="@+id/iv_fold_3"
                                android:layout_width="20dp"
                                android:layout_height="20dp"
                                android:layout_gravity="center_vertical"
                                android:background="@drawable/ic_unfold" />
                        </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"
                            tools:itemCount="3"
                            tools:listitem="@layout/item_growth_experience_primary" />
                    </LinearLayout>



                    <LinearLayout
                        android:id="@+id/layout_12"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="vertical"
                        app:layout_constraintTop_toBottomOf="@id/layout_11"
                        android:layout_marginTop="30dp"
                        >
                        <LinearLayout
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            >
                            <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="@dimen/sp_20"
                                android:textStyle="bold" />

                            <ImageButton
                                android:id="@+id/iv_fold_4"
                                android:layout_width="20dp"
                                android:layout_height="20dp"
                                android:layout_gravity="center_vertical"
                                android:background="@drawable/ic_unfold"
                                />
                        </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"
                            app:layout_constraintTop_toBottomOf="@+id/layout_11"
                            tools:itemCount="3"
                            tools:listitem="@layout/item_growth_experience_primary" />
                    </LinearLayout>

                    <TextView
                        android:id="@+id/tv_autobiography"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="30dp"
                        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" />



                </androidx.constraintlayout.widget.ConstraintLayout>
           </androidx.core.widget.NestedScrollView>
        </LinearLayout>
    </LinearLayout>
</layout>

 app/src/main/res/layout/item_family_memorabilia.xml

@@ -16,14 +16,14 @@
        <androidx.cardview.widget.CardView
            android:id="@+id/cardView"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_height="wrap_content"
            android:layout_margin="@dimen/dp_2"
            app:cardCornerRadius="@dimen/dp_10"
            app:cardBackgroundColor="@color/color_card_pink"
            >
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_height="40dp"
                android:orientation="vertical"
                >
                <RelativeLayout
@@ -222,4 +222,5 @@
        </androidx.cardview.widget.CardView>

    </LinearLayout>

</layout>

 app/src/main/res/layout/item_growth_experiece_abroad_condition.xml

New file
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <data>
        <variable
            name="bean"
            type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
    </data>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        >
        <androidx.cardview.widget.CardView
            android:id="@+id/cardView"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_margin="@dimen/dp_2"
            app:cardCornerRadius="@dimen/dp_10"
            app:cardBackgroundColor="@color/color_card_pink"
            >
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                >
                <RelativeLayout
                    android:id="@+id/layout_title"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_40"
                    android:gravity="center_vertical"
                    >

                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_centerVertical="true"
                        android:layout_marginStart="24dp"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:layout_weight="1"
                        android:textStyle="bold"
                        />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:textStyle="bold"
                        android:layout_marginEnd="24dp"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"
                        />
                </RelativeLayout>
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical"
                    android:paddingHorizontal="@dimen/dp_24"
                    >
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="@dimen/dp_6"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="事由："
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="探亲"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                    </LinearLayout>

                </LinearLayout>
            </LinearLayout>
        </androidx.cardview.widget.CardView>
    </LinearLayout>
</layout>

 app/src/main/res/layout/item_growth_experience_holder_condition.xml

New file
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <data>
        <variable
            name="bean"
            type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
    </data>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        >
        <androidx.cardview.widget.CardView
            android:id="@+id/cardView"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_margin="@dimen/dp_2"
            app:cardCornerRadius="@dimen/dp_10"
            app:cardBackgroundColor="@color/color_card_pink"
            >
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                >
                <RelativeLayout
                    android:id="@+id/layout_title"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_40"
                    android:gravity="center_vertical"
                    >
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_centerVertical="true"
                        android:layout_marginStart="24dp"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:layout_weight="1"
                        android:textStyle="bold"
                        />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:textStyle="bold"
                        android:layout_marginEnd="24dp"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"
                        />
                </RelativeLayout>
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical"
                    android:paddingHorizontal="@dimen/dp_24"
                    >
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="@dimen/dp_6"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="持有情况："
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="持有"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                    </LinearLayout>
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="@dimen/dp_6"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="证件号码："
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                    </LinearLayout>

                </LinearLayout>
            </LinearLayout>
        </androidx.cardview.widget.CardView>
    </LinearLayout>
</layout>

 app/src/main/res/layout/item_growth_experience_primary.xml

New file
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <data>
        <variable
            name="bean"
            type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
    </data>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        >
        <androidx.cardview.widget.CardView
            android:id="@+id/cardView"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_margin="@dimen/dp_2"
            app:cardCornerRadius="@dimen/dp_10"
            app:cardBackgroundColor="@color/color_card_pink"
            >
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                >
                <RelativeLayout
                    android:id="@+id/layout_title"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_40"
                    android:gravity="center_vertical"
                    >
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_centerVertical="true"
                        android:layout_marginStart="24dp"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:layout_weight="1"
                        android:textStyle="bold"
                        />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:textStyle="bold"
                        android:layout_marginEnd="24dp"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"
                        />
                </RelativeLayout>
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                android:paddingHorizontal="@dimen/dp_24"
                >
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:layout_marginBottom="@dimen/dp_6"
                >
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="证明人："
                    android:textColor="@color/black"
                    android:textSize="@dimen/sp_12"
                    android:textStyle="bold"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:textColor="@color/black"
                    android:textSize="@dimen/sp_12"
                    android:textStyle="bold"
                    />
            </LinearLayout>
            </LinearLayout>
            </LinearLayout>
        </androidx.cardview.widget.CardView>
    </LinearLayout>
</layout>

 app/src/main/res/layout/item_growth_experience_relationship.xml

New file
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <data>
        <variable
            name="bean"
            type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
    </data>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        >
        <androidx.cardview.widget.CardView
            android:id="@+id/cardView"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_margin="@dimen/dp_2"
            app:cardCornerRadius="@dimen/dp_10"
            app:cardBackgroundColor="@color/color_card_pink"
            >
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                >
                <RelativeLayout
                    android:id="@+id/layout_title"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_40"
                    android:gravity="center_vertical"
                    >
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_centerVertical="true"
                        android:layout_marginStart="24dp"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:layout_weight="1"
                        android:textStyle="bold"
                        />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:textSize="@dimen/sp_16"
                        android:textColor="@color/black"
                        android:textStyle="bold"
                        android:layout_marginEnd="24dp"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"
                        />
                </RelativeLayout>
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical"
                    android:paddingHorizontal="@dimen/dp_24"
                    >
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="@dimen/dp_6"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="所在单位/学校："
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="张氏公司"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                    </LinearLayout>
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="@dimen/dp_6"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="职务/身份："
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="经理"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                    </LinearLayout>
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="@dimen/dp_6"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="政治面貌:"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_12"
                            android:textStyle="bold"
                            />
                    </LinearLayout>
                </LinearLayout>
            </LinearLayout>
        </androidx.cardview.widget.CardView>
    </LinearLayout>
</layout>

 app/src/main/res/layout/item_image_footer.xml

@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_width="@dimen/dp_85"
    android:layout_height="@dimen/dp_85"
    android:orientation="vertical"
    android:layout_gravity="center"
    android:gravity="center"
    android:background="@drawable/shape_73fab4cd_solid"
    android:layout_marginTop="8dp"
    android:layout_marginStart="2dp"
    >
    <TextView
        android:id="@+id/button_add"
        android:layout_width="@dimen/dp_85"
        android:layout_height="@dimen/dp_85"
        android:text="+"
        android:textColor="@color/black"
        android:textSize="60sp"
        android:gravity="center"
        android:background="@drawable/shape_73fab4cd_solid"
        android:layout_marginTop="8dp"
        android:layout_marginStart="2dp"
    <ImageView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="@drawable/ic_import_add"
        />



 app/src/main/res/values/strings.xml

@@ -6,6 +6,7 @@
    <string name="title_family_memorabilia">家大事记</string>
    <string name="title_personal_center">个人中心</string>
    <string name="title_family_create_project">张氏app立项</string>
    <string name="iv_fold_1_description">这是一个展开控件</string>
    <!-- TODO: Remove or change this placeholder text -->
    <string name="hello_blank_fragment">Hello blank fragment</string>
</resources>