Merge remote-tracking branch 'origin/master'

cpt_main/src/main/AndroidManifest.xml

@@ -16,6 +16,18 @@
 
         <activity android:name=".ui.SettingsActivity"/>
 
+        <activity android:name=".ui.ProfileInfoActivity"/>
+
+        <activity android:name=".ui.InviteReferralActivity"/>
+
+        <activity android:name=".ui.EditUserInfoActivity"/>
+
+        <activity android:name=".ui.EditUserNameActivity"/>
+
+        <activity android:name=".ui.EditUserPhoneActivity"/>
+
+        <activity android:name=".ui.AccountDeactivationActivity"/>
+
     </application>
 
 </manifest>

cpt_main/src/main/java/com/hongyegroup/cpt_main/mvvm/InviteReferralViewModel.kt

@@ -0,0 +1,14 @@
+package com.hongyegroup.cpt_main.mvvm
+
+import com.chad.library.adapter.base.BaseBinderAdapter
+import com.guadou.cs_cptservices.binding.BaseDataBindingAdapter
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.hongyegroup.cpt_main.BR
+import com.hongyegroup.cpt_main.R
+
+class InviteReferralViewModel : BaseViewModel() {
+
+    val mDatas = ArrayList<String>()
+    val mAdapter by lazy { BaseDataBindingAdapter(R.layout.item_invite_referral, BR.item, mDatas) }
+
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/AccountDeactivationActivity.kt

@@ -0,0 +1,36 @@
+package com.hongyegroup.cpt_main.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.ViewDataBinding
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_main.R
+
+class AccountDeactivationActivity:BaseVDBActivity<BaseViewModel,ViewDataBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, AccountDeactivationActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_account_deactivation)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/EditUserInfoActivity.kt

@@ -0,0 +1,62 @@
+package com.hongyegroup.cpt_main.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.ViewDataBinding
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_main.BR
+import com.hongyegroup.cpt_main.R
+
+class EditUserInfoActivity : BaseVDBActivity<BaseViewModel, ViewDataBinding>() {
+
+    val mClickProxy by lazy { ClickProxy() }
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, EditUserInfoActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_edit_user_info)
+            .addBindingParams(BR.click, mClickProxy)
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+        //编辑User Name
+        fun editUserName() {
+
+            EditUserNameActivity.startInstance()
+
+        }
+
+        //编辑User Phone
+        fun editUserPhone(){
+
+            EditUserPhoneActivity.startInstance()
+
+        }
+
+    }
+
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/EditUserNameActivity.kt

@@ -0,0 +1,36 @@
+package com.hongyegroup.cpt_main.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.ViewDataBinding
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_main.R
+
+class EditUserNameActivity:BaseVDBActivity<BaseViewModel,ViewDataBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, EditUserNameActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_edit_user_name)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/EditUserPhoneActivity.kt

@@ -0,0 +1,36 @@
+package com.hongyegroup.cpt_main.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.ViewDataBinding
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_main.R
+
+class EditUserPhoneActivity : BaseVDBActivity<BaseViewModel, ViewDataBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, EditUserPhoneActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_edit_user_phone)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/InviteFriendsActivity.kt

@@ -7,10 +7,13 @@ import com.guadou.lib_baselib.base.activity.BaseVDBActivity
 import com.guadou.lib_baselib.base.vm.BaseViewModel
 import com.guadou.lib_baselib.bean.DataBindingConfig
 import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_main.BR
 import com.hongyegroup.cpt_main.R
 
 class InviteFriendsActivity:BaseVDBActivity<BaseViewModel,ViewDataBinding>() {
 
+    val mClickProxy by lazy { ClickProxy() }
+
     companion object {
         fun startInstance() {
             val context = CommUtils.getContext()
@@ -27,10 +30,26 @@ class InviteFriendsActivity:BaseVDBActivity<BaseViewModel,ViewDataBinding>() {
     override fun getDataBindingConfig(): DataBindingConfig {
 
         return DataBindingConfig(R.layout.activity_invite_friends)
+            .addBindingParams(BR.click,mClickProxy)
 
     }
 
     override fun startObserve() {
 
     }
+
+    /**
+     * DataBinding事件处理
+     */
+    inner class ClickProxy {
+
+        //跳转邀请列表
+        fun gotoInviteReferralActivity(){
+
+            InviteReferralActivity.startInstance()
+
+        }
+
+    }
+
 }

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/InviteReferralActivity.kt

@@ -0,0 +1,54 @@
+package com.hongyegroup.cpt_main.ui
+
+import android.content.Intent
+import android.os.Bundle
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.ext.vertical
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_main.R
+import com.hongyegroup.cpt_main.databinding.ActivityInviteReferralBinding
+import com.hongyegroup.cpt_main.mvvm.InviteReferralViewModel
+
+class InviteReferralActivity:BaseVDBActivity<InviteReferralViewModel,ActivityInviteReferralBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, InviteReferralActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+        initView()
+
+    }
+
+    private fun initView() {
+
+        for (index in 0..9){
+
+            mViewModel.mDatas.add("")
+
+        }
+
+        mBinding.recyclerViewInviteReferral.vertical().adapter=mViewModel.mAdapter
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_invite_referral)
+
+    }
+
+    override fun startObserve() {
+
+    }
+
+
+
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/ProfileFragment.kt

@@ -3,12 +3,16 @@ package com.hongyegroup.cpt_main.ui
 import android.os.Bundle
 import com.guadou.cs_cptservices.base.fragment.YYBaseVDBFragment
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
+import com.guadou.cs_router.YYRouterService
 import com.guadou.lib_baselib.bean.DataBindingConfig
 import com.guadou.lib_baselib.utils.CommUtils
 import com.hongyegroup.cpt_main.BR
 import com.hongyegroup.cpt_main.R
 import com.hongyegroup.cpt_main.databinding.FragmentProfileBinding
 import com.hongyegroup.cpt_main.mvvm.ProfileViewModel
+import com.hongyegroup.cpt_main.widget.AccountDeactivationDialog
+import com.hongyegroup.cpt_main.widget.UserUrgentAlertPopup
+import com.lxj.xpopup.XPopup
 import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener
 
@@ -63,19 +67,70 @@ class ProfileFragment : YYBaseVDBFragment<ProfileViewModel, FragmentProfileBindi
     inner class ClickProxy {
 
         //跳转到邀请朋友界面
-        fun gotoInviteFriendsActivity(){
+        fun gotoInviteFriendsActivity() {
 
             InviteFriendsActivity.startInstance()
 
         }
 
         //跳转到Settings界面
-        fun  gotoSettingsActivity(){
+        fun gotoSettingsActivity() {
 
             SettingsActivity.startInstance()
 
         }
 
+        //编辑个人信息
+        fun editProfileInfo() {
+
+            YYRouterService.parttimeComponentServer?.startPartTimeJobEditProfileInfoActivity()
+
+        }
+
+        //审核状态加急
+        fun userUrgent() {
+
+            //弹窗展示以及申请成功
+            XPopup.Builder(mActivity)
+                .hasShadowBg(true)
+                .asCustom(UserUrgentAlertPopup(mActivity))
+                .show()
+
+        }
+
+        //跳转到个人信息界面
+        fun gotoProfileInfoActivity() {
+
+            ProfileInfoActivity.startInstance()
+
+        }
+
+        //编辑用户信息
+        fun editUserInfo() {
+
+            EditUserInfoActivity.startInstance()
+
+        }
+
+        //注销账号
+        fun userDeactivationAccount() {
+
+            val accountDeactivationDialog = AccountDeactivationDialog()
+
+            accountDeactivationDialog.setOnAccountDeactivationDialogListener(object : AccountDeactivationDialog.OnAccountDeactivationDialogClickListener {
+                override fun onClickYes() {
+
+                    //                    mPresenter.accountDeactivation();
+
+                    AccountDeactivationActivity.startInstance()
+
+                }
+
+            })
+            accountDeactivationDialog.show(childFragmentManager, "account_deactivation")
+
+        }
+
     }
 
 

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/ProfileInfoActivity.kt

@@ -0,0 +1,37 @@
+package com.hongyegroup.cpt_main.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.ViewDataBinding
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.BaseViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_main.R
+import com.hongyegroup.cpt_main.databinding.ActivityProfileInfoBinding
+
+class ProfileInfoActivity:BaseVDBActivity<BaseViewModel,ActivityProfileInfoBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, ProfileInfoActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun init(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+
+        return DataBindingConfig(R.layout.activity_profile_info)
+
+    }
+
+    override fun startObserve() {
+
+    }
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/ui/SettingsActivity.kt

@@ -12,6 +12,8 @@ import com.hongyegroup.cpt_main.databinding.ActivitySettingsBinding
 
 class SettingsActivity : YYBaseVDBActivity<BaseViewModel, ActivitySettingsBinding>() {
 
+    val mClickProxy by lazy { ClickProxy() }
+
     companion object {
         fun startInstance() {
             val context = CommUtils.getContext()
@@ -29,7 +31,7 @@ class SettingsActivity : YYBaseVDBActivity<BaseViewModel, ActivitySettingsBindin
     override fun getDataBindingConfig(): DataBindingConfig {
 
         return DataBindingConfig(R.layout.activity_settings, BR.viewModel, mViewModel)
-            .addBindingParams(BR.click, ClickProxy())
+            .addBindingParams(BR.click, mClickProxy)
 
     }
 

cpt_main/src/main/java/com/hongyegroup/cpt_main/widget/AccountDeactivationDialog.java

@@ -0,0 +1,103 @@
+package com.hongyegroup.cpt_main.widget;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.guadou.lib_baselib.utils.CommUtils;
+import com.hongyegroup.cpt_main.R;
+
+import java.util.concurrent.TimeUnit;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+public class AccountDeactivationDialog extends DialogFragment {
+
+    private ImageView mCancelIv;
+    private TextView mYesTv;
+    private TextView mNolTv;
+
+    private OnAccountDeactivationDialogClickListener mListener;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        View inflate = LayoutInflater.from(CommUtils.getContext()).inflate(R.layout.dialog_account_deactivation, null);
+
+        return inflate;
+    }
+
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mCancelIv = view.findViewById(R.id.iv_dialog_account_deactivation_cancel);
+        mYesTv = view.findViewById(R.id.tv_dialog_account_deactivation_yes);
+        mNolTv = view.findViewById(R.id.tv_dialog_account_deactivation_no);
+
+        initListener();
+
+    }
+
+    @SuppressLint("CheckResult")
+    private void initListener() {
+
+        //点击Cancel
+        mCancelIv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                dismiss();
+
+            }
+        });
+
+        //点击Yes
+        mYesTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (mListener != null) {
+
+                    mListener.onClickYes();
+
+                }
+
+                dismiss();
+
+            }
+        });
+
+        //点击No
+        mNolTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                dismiss();
+
+            }
+        });
+
+    }
+
+    public void setOnAccountDeactivationDialogListener(OnAccountDeactivationDialogClickListener listener) {
+
+        mListener = listener;
+
+    }
+
+    public interface OnAccountDeactivationDialogClickListener {
+
+        void onClickYes();
+
+    }
+
+}

cpt_main/src/main/java/com/hongyegroup/cpt_main/widget/UserUrgentAlertPopup.java

@@ -0,0 +1,45 @@
+package com.hongyegroup.cpt_main.widget;
+
+import android.content.Context;
+
+import com.guadou.lib_baselib.utils.CommUtils;
+import com.hongyegroup.cpt_main.R;
+import com.lxj.xpopup.core.CenterPopupView;
+import com.lxj.xpopup.util.XPopupUtils;
+
+import androidx.annotation.NonNull;
+
+/**
+ * 加急申请成功的弹窗
+ */
+public class UserUrgentAlertPopup extends CenterPopupView {
+
+    public UserUrgentAlertPopup(@NonNull Context context) {
+        super(context);
+    }
+
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.view_popup_user_urgent;
+    }
+
+    @Override
+    protected int getMaxWidth() {
+        return XPopupUtils.getWindowWidth(CommUtils.getContext());
+    }
+
+    @Override
+    protected void initPopupContent() {
+        super.initPopupContent();
+
+        findViewById(R.id.iv_dialog_delete).setOnClickListener(v -> {
+            dismiss();
+        });
+
+        findViewById(R.id.tv_dialog_ok).setOnClickListener(v -> {
+            dismiss();
+        });
+
+    }
+
+}

cpt_main/src/main/res/drawable/shape_edit_name_border_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <stroke android:color="#DEE3F2" android:width="0.7dp"/>
+
+    <solid android:color="#F4F6FA"/>
+
+    <corners android:radius="@dimen/d_2dp"/>
+
+</shape>

cpt_main/src/main/res/layout/activity_account_deactivation.xml

@@ -0,0 +1,58 @@
+<?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">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="关闭账户"/>
+
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_20dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:text="请输入您想要注销账户的原因"
+            android:textColor="@color/home_item_title_color"
+            android:textSize="@dimen/d_15sp"/>
+
+        <EditText
+            android:id="@+id/et_account_deactivation_reason"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_250dp"
+            android:textSize="@dimen/d_15sp"
+            android:textColor="@color/black"
+            android:layout_marginLeft="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_20dp"
+            android:layout_marginTop="@dimen/d_15dp"
+            android:paddingLeft="@dimen/d_10dp"
+            android:paddingTop="@dimen/d_15dp"
+            android:paddingRight="@dimen/d_10dp"
+            android:paddingBottom="@dimen/d_15dp"
+            android:gravity="top|left"
+            android:maxLines="9999"
+            android:background="@drawable/shape_gray_bg_border_line"
+            />
+
+        <com.guadou.lib_baselib.font_text_view.TextViewLight
+            android:id="@+id/et_account_deactivation_submit"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
+            android:textColor="@color/white"
+            android:textSize="@dimen/d_16sp"
+            android:text="提交"
+            android:layout_marginLeft="@dimen/d_20dp"
+            android:layout_marginRight="@dimen/d_20dp"
+            android:layout_marginTop="@dimen/d_30dp"
+            android:gravity="center"
+            android:background="@color/app_blue"/>
+
+    </LinearLayout>
+
+</layout>

cpt_main/src/main/res/layout/activity_edit_user_info.xml

@@ -0,0 +1,554 @@
+<?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"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_main.ui.EditUserInfoActivity.ClickProxy" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/ll_title_box"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_gradient_proifle_title_top"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:Easy_lineState="gone"
+                app:Easy_title="编辑信息"
+                app:Easy_backRes="@mipmap/back_white_icon"
+                app:Easy_titleBarBackground="@color/transparent"
+                app:Easy_titleColor="@color/white" />
+
+        </FrameLayout>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:overScrollMode="never"
+            android:scrollbars="none">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white">
+
+                <ScrollView
+                    android:id="@+id/root_scrollview"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:overScrollMode="never">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="#FAFDFF"
+                        android:orientation="vertical">
+
+                        <!--    头部     -->
+                        <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <!--     弧形的渐变    -->
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/d_90dp"
+                                android:background="@drawable/shape_gradient_proifle_title_bottom" />
+
+                            <!--   顶部的信息框展示   -->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="140dp"
+                                android:layout_marginLeft="@dimen/d_5dp"
+                                android:layout_marginRight="@dimen/d_5dp"
+                                android:background="@drawable/profile_white_shadow_comm_bg"
+                                android:orientation="horizontal">
+
+                                <com.guadou.lib_baselib.view.CircleImageView
+                                    android:id="@+id/image_view_profile_photo"
+                                    android:layout_width="@dimen/d_70dp"
+                                    android:layout_height="@dimen/d_70dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginLeft="@dimen/d_20dp"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/im_default_head"
+                                    app:civ_border_color="@color/white"
+                                    app:civ_border_overlay="true"
+                                    app:civ_border_width="@dimen/d_1dp" />
+
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginLeft="@dimen/d_20dp"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:layout_weight="1"
+                                    android:gravity="center_vertical"
+                                    android:orientation="vertical">
+
+                                    <LinearLayout
+                                        android:id="@+id/ll_name_box"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="center_vertical"
+                                        binding:clicks="@{click.editUserName}"
+                                        android:orientation="horizontal">
+
+                                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                            android:id="@+id/text_view_full_name"
+                                            android:layout_width="0dp"
+                                            android:layout_height="wrap_content"
+                                            android:layout_weight="1"
+                                            android:textColor="@color/profile_black_28394a"
+                                            android:textSize="21sp"
+                                            tools:text="Lisa Yang" />
+
+                                        <ImageView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginLeft="@dimen/d_15dp"
+                                            android:paddingTop="@dimen/d_6dp"
+                                            android:src="@drawable/iv_profile_edit" />
+
+                                    </LinearLayout>
+
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                        android:id="@+id/text_view_phone_num"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center_horizontal"
+                                        android:layout_marginTop="@dimen/d_10dp"
+                                        android:drawableRight="@drawable/back_more_black"
+                                        android:textColor="#8098B2"
+                                        android:textSize="14.8dp"
+                                        binding:clicks="@{click.editUserPhone}"
+                                        tools:text="+86 13477451876" />
+
+                                </LinearLayout>
+
+                            </LinearLayout>
+
+                        </FrameLayout>
+
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_5dp"
+                            android:background="@drawable/profile_white_shadow_comm_bg"
+                            android:orientation="vertical"
+                            android:paddingTop="@dimen/d_25dp"
+                            android:paddingBottom="@dimen/d_38dp">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_centerVertical="true"
+                                    android:layout_marginLeft="@dimen/d_25dp"
+                                    android:src="@drawable/profile_edit_psd_old" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_14dp"
+                                    android:text="密码重置"
+                                    android:textColor="@color/profile_black_28394a"
+                                    android:textSize="17dp" />
+
+                            </LinearLayout>
+
+                            <!--Old Password-->
+                            <RelativeLayout
+                                android:id="@+id/rl_edit_profile_old_password"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:layout_marginRight="@dimen/d_24dp"
+                                android:background="@drawable/shape_profile_gray_5conner_with_border">
+
+                                <ImageView
+                                    android:id="@+id/iv_edit_profile_old_password"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/profile_edit_psd_old"
+                                    android:visibility="gone" />
+
+                                <EditText
+                                    android:id="@+id/edit_text_old_password"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:layout_toLeftOf="@id/cb_old_psd"
+                                    android:layout_toRightOf="@id/iv_edit_profile_old_password"
+                                    android:background="@null"
+                                    android:hint="旧密码"
+                                    android:inputType="textPassword"
+                                    android:paddingTop="@dimen/d_15dp"
+                                    android:paddingBottom="@dimen/d_15dp"
+                                    android:textColor="@color/black"
+                                    android:textColorHint="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <CheckBox
+                                    android:id="@+id/cb_old_psd"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_centerInParent="true"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:button="@drawable/selector_check_password_hide"
+                                    android:visibility="visible" />
+
+                            </RelativeLayout>
+
+                            <!--New Password-->
+                            <RelativeLayout
+                                android:id="@+id/rl_edit_profile_new_password"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:layout_marginRight="@dimen/d_24dp"
+                                android:background="@drawable/shape_profile_gray_5conner_with_border">
+
+
+                                <EditText
+                                    android:id="@+id/edit_text_new_password"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:layout_toLeftOf="@id/cb_new_psd"
+                                    android:background="@null"
+                                    android:hint="新的密码（最少8位数，包含大小写和数字）"
+                                    android:inputType="textPassword"
+                                    android:paddingTop="@dimen/d_15dp"
+                                    android:paddingBottom="@dimen/d_15dp"
+                                    android:textColor="@color/black"
+                                    android:textColorHint="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <CheckBox
+                                    android:id="@+id/cb_new_psd"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_centerInParent="true"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:button="@drawable/selector_check_password_hide"
+                                    android:visibility="visible" />
+
+                            </RelativeLayout>
+
+                            <!--Confirm Password-->
+                            <RelativeLayout
+                                android:id="@+id/rl_edit_profile_confirm_password"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:layout_marginRight="@dimen/d_24dp"
+                                android:background="@drawable/shape_profile_gray_5conner_with_border">
+
+                                <EditText
+                                    android:id="@+id/edit_text_confirm_password"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:layout_toLeftOf="@id/cb_conform_psd"
+                                    android:background="@null"
+                                    android:hint="确认新密码（最少8位数，包含大小写和数字）"
+                                    android:inputType="textPassword"
+                                    android:paddingTop="@dimen/d_15dp"
+                                    android:paddingBottom="@dimen/d_15dp"
+                                    android:textColor="@color/black"
+                                    android:textColorHint="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <CheckBox
+                                    android:id="@+id/cb_conform_psd"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_centerInParent="true"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:button="@drawable/selector_check_password_hide"
+                                    android:visibility="visible" />
+
+                            </RelativeLayout>
+
+                            <!--Save-->
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_profile_me_edit_save"
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/d_40dp"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:layout_marginTop="@dimen/d_30dp"
+                                android:layout_marginRight="@dimen/d_25dp"
+                                android:layout_marginBottom="@dimen/d_30dp"
+                                android:background="@color/app_blue"
+                                android:gravity="center"
+                                android:text="保存"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/d_16sp" />
+
+                        </LinearLayout>
+
+
+                        <!-- 技能的选择 -->
+                        <LinearLayout
+                            android:id="@+id/rl_edit_profile_work_type"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_5dp"
+                            android:background="@drawable/profile_white_shadow_comm_bg"
+                            android:orientation="vertical"
+                            android:paddingTop="@dimen/d_25dp"
+                            android:paddingBottom="@dimen/d_38dp"
+                            android:visibility="gone">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:layout_marginRight="@dimen/d_23dp"
+                                android:drawableRight="@drawable/back_more_black"
+                                android:text="Skill"
+                                android:textColor="@color/profile_black_28394a"
+                                android:textSize="17dp" />
+
+                            <LinearLayout
+                                android:id="@+id/ll_edit_profile_work_type1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_15dp"
+                                android:orientation="vertical"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:visibility="visible">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/tv_edit_profile_work_type1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:drawableLeft="@drawable/profile_detail_skill_icon1"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:paddingBottom="@dimen/d_10dp"
+                                    android:text="Clean Service"
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp"
+                                    android:visibility="gone" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/tv_edit_profile_work_type2"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_10dp"
+                                    android:layout_weight="1"
+                                    android:drawableLeft="@drawable/profile_detail_skill_icon2"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:paddingBottom="@dimen/d_10dp"
+                                    android:text="Business"
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp"
+                                    android:visibility="gone" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:id="@+id/ll_edit_profile_work_type2"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:orientation="vertical"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:visibility="visible">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/tv_edit_profile_work_type3"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:drawableLeft="@drawable/profile_detail_skill_icon3"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:paddingBottom="@dimen/d_10dp"
+                                    android:text="Finance"
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp"
+                                    android:visibility="gone" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/tv_edit_profile_work_type4"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_10dp"
+                                    android:layout_weight="1"
+                                    android:drawableLeft="@drawable/profile_detail_skill_icon4"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:paddingBottom="@dimen/d_10dp"
+                                    android:text="Food &#38; Banquet"
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp"
+                                    android:visibility="gone" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:id="@+id/ll_edit_profile_work_type3"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:orientation="vertical"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:visibility="visible"
+                                android:weightSum="2">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/tv_edit_profile_work_type5"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:drawableLeft="@drawable/profile_detail_skill_icon5"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:paddingBottom="@dimen/d_15dp"
+                                    android:text="Recruitment"
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp"
+                                    android:visibility="gone" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                                    android:id="@+id/tv_edit_profile_work_type6"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:drawableLeft="@drawable/profile_detail_skill_icon6"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:text="Recruitment"
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp"
+                                    android:visibility="gone" />
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+
+                        <!--   证书      -->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_5dp"
+                            android:layout_marginBottom="@dimen/d_30dp"
+                            android:background="@drawable/profile_white_shadow_comm_bg"
+                            android:orientation="vertical"
+                            android:paddingTop="@dimen/d_25dp"
+                            android:paddingBottom="@dimen/d_38dp"
+                            android:visibility="gone">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:text="食品健康证书"
+                                android:textColor="@color/profile_black_28394a"
+                                android:textSize="17dp" />
+
+
+                            <FrameLayout
+                                android:id="@+id/fl_certificate_box"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:layout_marginTop="@dimen/d_17dp">
+
+                                <ImageView
+                                    android:id="@+id/iv_certificate_img"
+                                    android:layout_width="98dp"
+                                    android:layout_height="98dp"
+                                    android:layout_gravity="center"
+                                    android:background="#F0F2F9" />
+
+                                <ImageView
+                                    android:id="@+id/iv_upload_empty"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:src="@drawable/profile_edit_cert_empty_img"
+                                    android:visibility="visible" />
+
+                                <ImageView
+                                    android:id="@+id/iv_certificate_img_delete"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="right|top"
+                                    android:layout_marginLeft="95dp"
+                                    android:paddingLeft="@dimen/d_5dp"
+                                    android:paddingTop="-10dp"
+                                    android:paddingRight="@dimen/d_5dp"
+                                    android:paddingBottom="@dimen/d_5dp"
+                                    android:src="@drawable/profile_edit_cert_delete"
+                                    android:visibility="visible" />
+
+                            </FrameLayout>
+
+
+                        </LinearLayout>
+
+
+                    </LinearLayout>
+
+                </ScrollView>
+
+                <View
+                    android:id="@+id/view_progress_bg"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/progress_background"
+                    android:clickable="true"
+                    android:visibility="gone" />
+
+                <ProgressBar
+                    android:id="@+id/progress_bar_edit_basic"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:indeterminate="true"
+                    android:indeterminateTint="@color/colorAccent"
+                    android:indeterminateTintMode="src_atop"
+                    android:visibility="gone" />
+
+            </FrameLayout>
+
+        </ScrollView>
+
+
+    </LinearLayout>
+
+</layout>

cpt_main/src/main/res/layout/activity_edit_user_name.xml

@@ -0,0 +1,64 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="编辑" />
+
+        <com.guadou.lib_baselib.view.CircleImageView
+            android:id="@+id/iv_newsfeed_avatar"
+            android:layout_width="@dimen/d_95dp"
+            android:layout_height="@dimen/d_95dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/d_30dp"
+            android:src="@drawable/im_default_head"
+            android:scaleType="centerCrop" />
+
+        <com.guadou.lib_baselib.font_text_view.TextViewLight
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/d_10dp"
+            android:text="编辑头像"
+            android:textColor="#8098B2"
+            android:textSize="17sp" />
+
+        <EditText
+            android:id="@+id/et_newsfeed_name"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_45dp"
+            android:layout_marginLeft="@dimen/d_30dp"
+            android:layout_marginTop="@dimen/d_28dp"
+            android:layout_marginRight="@dimen/d_30dp"
+            android:background="@drawable/shape_edit_name_border_bg"
+            android:gravity="center"
+            android:hint="请输入新名字"
+            android:textColor="@color/black_33"
+            android:textColorHint="@color/gray"
+            android:textSize="@dimen/d_17sp" />
+
+        <Button
+            android:id="@+id/btn_submit"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_42dp"
+            android:layout_marginLeft="@dimen/d_30dp"
+            android:layout_marginTop="@dimen/d_25dp"
+            android:layout_marginRight="@dimen/d_30dp"
+            android:layout_marginBottom="@dimen/d_25dp"
+            android:background="@drawable/selector_app_blue_button_round2_bg"
+            android:text="保存"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="@dimen/d_18sp" />
+
+    </LinearLayout>
+
+</layout>

cpt_main/src/main/res/layout/activity_edit_user_phone.xml

@@ -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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/d_15dp"
+        android:paddingRight="@dimen/d_15dp">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="编辑手机号"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/d_18dp"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="horizontal">
+
+            <Spinner
+                android:id="@+id/phone_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:visibility="gone"
+                android:layout_marginRight="@dimen/d_5dp"
+                android:background="@color/transparent">
+
+            </Spinner>
+
+            <TextView
+                android:layout_width="@dimen/d_60dp"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:textSize="@dimen/d_16sp"
+                android:gravity="center"
+                android:text="+86"/>
+
+            <View
+                android:layout_width="@dimen/d_0.5dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/d_5dp"
+                android:layout_marginBottom="@dimen/d_5dp"
+                android:background="@color/main_divide" />
+
+            <EditText
+                android:id="@+id/edit_text_mobile"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/d_10dp"
+                android:layout_marginLeft="@dimen/d_10dp"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="手机号码"
+                android:inputType="phone"
+                android:paddingTop="@dimen/d_13dp"
+                android:paddingBottom="@dimen/d_13dp"
+                android:textColor="@color/dark_gray_text"
+                android:textSize="@dimen/d_16sp" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_0.5dp"
+            android:src="@color/divider_color"/>
+
+        <TextView
+            android:id="@+id/button_next"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/d_25dp"
+            android:background="@drawable/selector_app_blue_button_round2_bg"
+            android:gravity="center"
+            android:padding="@dimen/d_10dp"
+            android:text="下一步"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/d_16sp" />
+
+    </LinearLayout>
+
+</layout>

cpt_main/src/main/res/layout/activity_invite_friends.xml

@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tool="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.hongyegroup.cpt_main.ui.InviteFriendsActivity.ClickProxy" />
+
+    </data>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -123,6 +132,7 @@
                     android:background="@drawable/btn_invites_white_bg"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
+                    binding:clicks="@{click.gotoInviteReferralActivity}"
                     android:paddingTop="@dimen/d_10dp"
                     android:paddingBottom="@dimen/d_10dp">
 

cpt_main/src/main/res/layout/activity_invite_referral.xml

@@ -0,0 +1,22 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:Easy_title="推荐列表"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view_invite_referral"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+
+</layout>

cpt_main/src/main/res/layout/activity_profile_info.xml

@@ -0,0 +1,885 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <!--   Title的布局    -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_gradient_proifle_title_top"
+            android:orientation="vertical">
+
+            <com.guadou.lib_baselib.view.titlebar.StatusbarGrayView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/d_46dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="@dimen/d_20dp"
+                    android:background="@mipmap/back_white_icon"/>
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="个人详情"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/d_18sp" />
+
+            </FrameLayout>
+
+        </LinearLayout>
+
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            app:srlAccentColor="#03A3FE"
+            app:srlEnablePreviewInEditMode="false"
+            app:srlPrimaryColor="@color/app_blue">
+
+            <com.scwang.smart.refresh.header.ClassicsHeader
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:srlAccentColor="@color/white" />
+
+            <ScrollView
+                android:id="@+id/scroll_view_view_profile"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never">
+
+                <LinearLayout
+                    android:id="@+id/ll_root_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="#FAFDFF"
+                    android:orientation="vertical">
+
+                    <!--    头部     -->
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <!--     弧形的渐变    -->
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/d_120dp"
+                            android:background="@drawable/shape_gradient_proifle_title_bottom" />
+
+                        <!--    基本信息     -->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_5dp"
+                            android:background="@drawable/profile_white_shadow_comm_bg"
+                            android:orientation="vertical"
+                            android:paddingTop="@dimen/d_25dp"
+                            android:paddingBottom="@dimen/d_38dp">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:text="个人信息"
+                                android:textColor="@color/profile_black_28394a"
+                                android:textSize="17dp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/text_view_name"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:layout_marginRight="@dimen/d_10dp"
+                                android:drawableLeft="@drawable/profile_detail_name_icon"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp"
+                                android:text="阳顶天" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/text_view_email_address_below"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:layout_marginRight="@dimen/d_10dp"
+                                android:drawableLeft="@drawable/profile_detail_email_icon"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:text="12345678@qq.com"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/text_view_mobile_number"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:layout_marginRight="@dimen/d_10dp"
+                                android:drawableLeft="@drawable/profile_detail_phone_icon"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:text="+86 13567876543"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/text_view_nric_no"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:layout_marginRight="@dimen/d_10dp"
+                                android:drawableLeft="@drawable/profile_detail_nric_icon"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:text="438776565678761"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/text_view_nationality"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:layout_marginRight="@dimen/d_10dp"
+                                android:drawableLeft="@drawable/profile_detail_lang_icon"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:text="中国"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_rate"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:layout_marginRight="@dimen/d_10dp"
+                                android:drawableLeft="@drawable/profile_detail_rate_icon"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:text="15/时"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp" />
+
+
+                            <LinearLayout
+                                android:id="@+id/rl_request_view_profile_total_hours"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_20dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal"
+                                android:visibility="visible">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_23dp"
+                                    android:drawableLeft="@drawable/profile_detail_hours_icon"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:text="Total Hours: "
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_request_view_profile_total_hours"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="1024"
+                                    android:textColor="@color/app_blue"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_3dp"
+                                    android:text="Hrs"
+                                    android:textColor="@color/gray_text"
+                                    android:textSize="@dimen/d_15sp" />
+
+
+                                <View
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_weight="1" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_profile_rules"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_centerVertical="true"
+                                    android:layout_marginRight="@dimen/d_10dp"
+                                    android:layout_toLeftOf="@id/iv_total_hours_arrow"
+                                    android:text="Rules"
+                                    android:textColor="@color/app_blue"
+                                    android:textSize="14.5sp" />
+
+                                <ImageView
+                                    android:id="@+id/iv_total_hours_arrow"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:layout_marginRight="@dimen/d_15dp"
+                                    android:src="@drawable/back_more_black" />
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+
+                    </FrameLayout>
+
+                    <!-- 技能的选择 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_5dp"
+                        android:layout_marginRight="@dimen/d_5dp"
+                        android:background="@drawable/profile_white_shadow_comm_bg"
+                        android:orientation="vertical"
+                        android:paddingTop="@dimen/d_25dp"
+                        android:paddingBottom="@dimen/d_38dp">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_weight="1"
+                                android:text="技能"
+                                android:textColor="@color/profile_black_28394a"
+                                android:textSize="17dp" />
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_marginRight="@dimen/d_15dp"
+                                android:src="@drawable/back_more_black"
+                                app:tint="@color/gray_8098B2"
+                                tools:tint="@color/gray_8098B2" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_15dp"
+                            android:orientation="vertical"
+                            android:paddingLeft="@dimen/d_23dp"
+                            android:visibility="visible">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_edit_profile_work_type1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:drawableLeft="@drawable/profile_detail_skill_icon1"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:paddingBottom="@dimen/d_10dp"
+                                android:text="Clean Service"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp"
+                                android:visibility="visible" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_edit_profile_work_type2"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:layout_weight="1"
+                                android:drawableLeft="@drawable/profile_detail_skill_icon2"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:paddingBottom="@dimen/d_10dp"
+                                android:text="Business"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp"
+                                android:visibility="visible" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/ll_edit_profile_work_type2"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:orientation="vertical"
+                            android:paddingLeft="@dimen/d_23dp"
+                            android:visibility="visible">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_edit_profile_work_type3"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:drawableLeft="@drawable/profile_detail_skill_icon3"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:paddingBottom="@dimen/d_10dp"
+                                android:text="Finance"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp"
+                                android:visibility="visible" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_edit_profile_work_type4"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:layout_weight="1"
+                                android:drawableLeft="@drawable/profile_detail_skill_icon4"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:paddingBottom="@dimen/d_10dp"
+                                android:text="Food &#38; Banquet"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp"
+                                android:visibility="visible" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/ll_edit_profile_work_type3"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:orientation="vertical"
+                            android:paddingLeft="@dimen/d_23dp"
+                            android:visibility="visible"
+                            android:weightSum="2">
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_edit_profile_work_type5"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:drawableLeft="@drawable/profile_detail_skill_icon5"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:paddingBottom="@dimen/d_15dp"
+                                android:text="Recruitment"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp"
+                                android:visibility="visible" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/tv_edit_profile_work_type6"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:drawableLeft="@drawable/profile_detail_skill_icon6"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:text="Recruitment"
+                                android:textColor="@color/profile_black_8098b2"
+                                android:textSize="@dimen/d_14sp"
+                                android:visibility="visible" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <!--  证书  -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_5dp"
+                        android:layout_marginRight="@dimen/d_5dp"
+                        android:background="@drawable/profile_white_shadow_comm_bg"
+                        android:orientation="vertical"
+                        android:paddingTop="@dimen/d_25dp"
+                        android:paddingBottom="@dimen/d_38dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_23dp"
+                            android:text="食品证书"
+                            android:textColor="@color/profile_black_28394a"
+                            android:textSize="17dp" />
+
+
+                        <FrameLayout
+                            android:id="@+id/fl_certificate_box"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_23dp"
+                            android:layout_marginTop="@dimen/d_17dp">
+
+                            <ImageView
+                                android:id="@+id/iv_certificate_img"
+                                android:layout_width="98dp"
+                                android:layout_height="98dp"
+                                android:layout_gravity="center"
+                                android:background="#F0F2F9" />
+
+                            <ImageView
+                                android:id="@+id/iv_upload_empty"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:src="@drawable/profile_edit_cert_empty_img"
+                                android:visibility="visible" />
+
+                            <ImageView
+                                android:id="@+id/iv_certificate_img_delete"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right|top"
+                                android:layout_marginLeft="95dp"
+                                android:paddingLeft="@dimen/d_5dp"
+                                android:paddingTop="-10dp"
+                                android:paddingRight="@dimen/d_5dp"
+                                android:paddingBottom="@dimen/d_5dp"
+                                android:src="@drawable/profile_edit_cert_delete"
+                                android:visibility="visible" />
+
+                        </FrameLayout>
+
+                    </LinearLayout>
+
+                    <!-- 个人信息的到达率 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d_5dp"
+                        android:layout_marginRight="@dimen/d_5dp"
+                        android:background="@drawable/profile_white_shadow_comm_bg"
+                        android:orientation="vertical"
+                        android:paddingTop="@dimen/d_25dp"
+                        android:paddingBottom="@dimen/d_38dp">
+
+                        <com.guadou.lib_baselib.font_text_view.TextViewBold
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_23dp"
+                            android:layout_marginRight="@dimen/d_23dp"
+                            android:text="个人评价"
+                            android:textColor="@color/profile_black_28394a"
+                            android:textSize="17dp" />
+
+
+                        <LinearLayout
+                            android:id="@+id/ll_edit_profile_work_type1"
+                            android:layout_width="match_parent"
+                            android:layout_height="160dp"
+                            android:layout_marginLeft="@dimen/d_20dp"
+                            android:layout_marginTop="@dimen/d_15dp"
+                            android:layout_marginRight="@dimen/d_15dp"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <View
+                                        android:id="@+id/view_zi"
+                                        android:layout_width="2dp"
+                                        android:layout_height="@dimen/d_45dp"
+                                        android:background="@drawable/shape_5round_zi"
+                                        app:layout_constraintLeft_toLeftOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                        android:id="@+id/tv_no_show_text"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_13dp"
+                                        android:text="缺勤率"
+                                        android:textColor="#FF8098B2"
+                                        android:textSize="@dimen/d_15sp"
+                                        app:layout_constraintLeft_toRightOf="@id/view_zi"
+                                        app:layout_constraintTop_toTopOf="@id/view_zi" />
+
+                                    <ImageView
+                                        android:id="@+id/iv_no_show_icon"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_13dp"
+                                        android:layout_marginTop="5dp"
+                                        android:src="@drawable/no_show_rate_icon"
+                                        app:layout_constraintBottom_toBottomOf="@id/tv_no_show_value"
+                                        app:layout_constraintLeft_toRightOf="@id/view_zi"
+                                        app:layout_constraintTop_toTopOf="@id/tv_no_show_value" />
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                        android:id="@+id/tv_no_show_value"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_10dp"
+                                        android:layout_marginTop="@dimen/d_2dp"
+                                        android:text="10%"
+                                        android:textColor="#FF3C3C4F"
+                                        android:textSize="@dimen/d_19sp"
+                                        app:layout_constraintLeft_toRightOf="@id/iv_no_show_icon"
+                                        app:layout_constraintTop_toBottomOf="@id/tv_no_show_text" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="28dp">
+
+                                    <View
+                                        android:id="@+id/view_fen"
+                                        android:layout_width="2dp"
+                                        android:layout_height="@dimen/d_45dp"
+                                        android:background="@drawable/shape_5round_pink"
+                                        app:layout_constraintLeft_toLeftOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                        android:id="@+id/tv_cancel_text"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_13dp"
+                                        android:text="取消率"
+                                        android:textColor="#FF8098B2"
+                                        android:textSize="@dimen/d_15sp"
+                                        app:layout_constraintLeft_toRightOf="@id/view_fen"
+                                        app:layout_constraintTop_toTopOf="@id/view_fen" />
+
+                                    <ImageView
+                                        android:id="@+id/iv_cancel_icon"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_13dp"
+                                        android:layout_marginTop="@dimen/d_5dp"
+                                        android:src="@drawable/cancellation_rate_icon"
+                                        app:layout_constraintBottom_toBottomOf="@id/tv_cancel_value"
+                                        app:layout_constraintLeft_toRightOf="@id/view_fen"
+                                        app:layout_constraintTop_toTopOf="@id/tv_cancel_value" />
+
+                                    <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                        android:id="@+id/tv_cancel_value"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/d_10dp"
+                                        android:layout_marginTop="@dimen/d_2dp"
+                                        android:text="15%"
+                                        android:textColor="#FF3C3C4F"
+                                        android:textSize="@dimen/d_19sp"
+                                        app:layout_constraintLeft_toRightOf="@id/iv_cancel_icon"
+                                        app:layout_constraintTop_toBottomOf="@id/tv_cancel_text" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                            </LinearLayout>
+
+
+                            <com.guadou.cs_cptservices.widget.MyCircleProgressView
+                                android:id="@+id/turn_up_progress"
+                                android:layout_width="136dp"
+                                android:layout_height="wrap_content"
+                                android:minHeight="200dp"
+
+                                app:animTime="1000"
+                                app:antiAlias="true"
+                                app:digit="0"
+                                app:hint="出勤率"
+
+                                app:hintColor="#8098B2"
+                                app:hintSize="13sp"
+
+                                app:isanim="false"
+
+                                app:mBgCirColor="#DDE3F6"
+                                app:mBgCirWidth="5sp"
+                                app:mCirColor="#3277f9"
+                                app:mCirWidth="15sp"
+
+                                app:shadowColor="#734947B2"
+                                app:shadowShow="true"
+                                app:shadowSize="9"
+
+                                app:startAngle="270"
+                                app:sweepAngle="360"
+                                app:unit="%"
+
+                                app:value="0"
+                                app:valueColor="#5456A4"
+                                app:valueSize="25dp" />
+
+                        </LinearLayout>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:layout_marginLeft="@dimen/d_23dp"
+                            android:layout_marginTop="@dimen/d_10dp"
+                            android:layout_marginRight="@dimen/d_23dp"
+                            android:background="#FFD9E1ED" />
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_23dp"
+                            android:layout_marginTop="17dp"
+                            android:layout_marginRight="@dimen/d_10dp"
+                            android:orientation="horizontal">
+
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1.2"
+                                android:orientation="vertical">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_grooming_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="着装"
+                                    android:textColor="#FF3C3C4F"
+                                    android:textSize="14sp" />
+
+                                <ProgressBar
+                                    android:id="@+id/pb_grooming"
+                                    android:layout_width="@dimen/d_70dp"
+                                    android:layout_height="6dp"
+                                    android:layout_marginTop="@dimen/d_8dp"
+                                    android:indeterminateOnly="false"
+                                    android:max="5"
+                                    android:progress="3"
+                                    android:progressDrawable="@drawable/progress_horizontal_grooming" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                    android:id="@+id/tv_grooming_value"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_3dp"
+                                    android:text="3.7"
+                                    android:textColor="#FF5C75C6"
+                                    android:textSize="16sp" />
+
+                            </LinearLayout>
+
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1.2"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:id="@+id/tv_average_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="平均评级"
+                                    android:textColor="#FF3C3C4F"
+                                    android:textSize="14sp"
+                                    app:layout_constraintLeft_toLeftOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ProgressBar
+                                    android:id="@+id/pb_average"
+                                    android:layout_width="@dimen/d_70dp"
+                                    android:layout_height="6dp"
+                                    android:layout_marginTop="@dimen/d_8dp"
+                                    android:indeterminateOnly="false"
+                                    android:max="5"
+                                    android:progress="3"
+                                    android:progressDrawable="@drawable/progress_horizontal_average"
+                                    app:layout_constraintLeft_toLeftOf="@id/tv_average_text"
+                                    app:layout_constraintTop_toBottomOf="@id/tv_average_text" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                    android:id="@+id/tv_average_value"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_3dp"
+                                    android:text="3.7"
+                                    android:textColor="#FFF03C74"
+                                    android:textSize="16sp"
+                                    app:layout_constraintLeft_toLeftOf="@id/tv_average_text"
+                                    app:layout_constraintTop_toBottomOf="@id/pb_average" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_attitude_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="态度"
+                                    android:textColor="#FF3C3C4F"
+                                    android:textSize="14sp"
+                                    app:layout_constraintLeft_toLeftOf="@id/pb_attitude"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ProgressBar
+                                    android:id="@+id/pb_attitude"
+                                    android:layout_width="@dimen/d_70dp"
+                                    android:layout_height="6dp"
+                                    android:layout_marginTop="@dimen/d_8dp"
+                                    android:indeterminateOnly="false"
+                                    android:max="5"
+                                    android:progress="3"
+                                    android:progressDrawable="@drawable/progress_horizontal_attitude"
+                                    app:layout_constraintLeft_toLeftOf="parent"
+                                    app:layout_constraintRight_toRightOf="parent"
+                                    app:layout_constraintTop_toBottomOf="@id/tv_attitude_text" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                    android:id="@+id/tv_attitude_value"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_3dp"
+                                    android:text="3.7"
+                                    android:textColor="#FFFCC917"
+                                    android:textSize="16sp"
+                                    app:layout_constraintLeft_toLeftOf="@id/tv_attitude_text"
+                                    app:layout_constraintTop_toBottomOf="@id/pb_attitude" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_23dp"
+                            android:layout_marginTop="@dimen/d_23dp"
+                            android:layout_marginRight="@dimen/d_10dp"
+                            android:orientation="horizontal">
+
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1.2"
+                                android:orientation="vertical">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_perforamnce_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="个人能力"
+                                    android:textColor="#FF3C3C4F"
+                                    android:textSize="14sp" />
+
+                                <ProgressBar
+                                    android:id="@+id/pb_perforamnce"
+                                    android:layout_width="@dimen/d_70dp"
+                                    android:layout_height="6dp"
+                                    android:layout_marginTop="@dimen/d_8dp"
+                                    android:indeterminateOnly="false"
+                                    android:max="5"
+                                    android:progress="3"
+                                    android:progressDrawable="@drawable/progress_horizontal_perforamnce" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                    android:id="@+id/tv_perforamnce_value"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_3dp"
+                                    android:text="3.7"
+                                    android:textColor="#FFF99620"
+                                    android:textSize="16sp" />
+
+                            </LinearLayout>
+
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1.2"
+                                android:orientation="vertical">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_experience_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="经验"
+                                    android:textColor="#FF3C3C4F"
+                                    android:textSize="14sp"
+                                    app:layout_constraintLeft_toLeftOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ProgressBar
+                                    android:id="@+id/pb_experience"
+                                    android:layout_width="@dimen/d_70dp"
+                                    android:layout_height="6dp"
+                                    android:layout_marginTop="@dimen/d_8dp"
+                                    android:indeterminateOnly="false"
+                                    android:max="5"
+                                    android:progress="3"
+                                    android:progressDrawable="@drawable/progress_horizontal_experience"
+                                    app:layout_constraintLeft_toLeftOf="@id/tv_experience_text"
+                                    app:layout_constraintTop_toBottomOf="@id/tv_experience_text" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewBold
+                                    android:id="@+id/tv_experience_value"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="@dimen/d_3dp"
+                                    android:text="3.7"
+                                    android:textColor="#FF40C5A7"
+                                    android:textSize="16sp"
+                                    app:layout_constraintLeft_toLeftOf="@id/tv_experience_text"
+                                    app:layout_constraintTop_toBottomOf="@id/pb_experience" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                            <View
+                                android:layout_width="0dp"
+                                android:layout_height="1dp"
+                                android:layout_weight="1" />
+
+                        </LinearLayout>
+
+                        <View
+                            android:layout_width="1dp"
+                            android:layout_height="20dp" />
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="1dp"
+                        android:layout_height="18dp" />
+
+                </LinearLayout>
+
+            </ScrollView>
+
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+    </LinearLayout>
+
+</layout>

cpt_main/src/main/res/layout/activity_settings.xml

@@ -58,20 +58,20 @@
             android:visibility="gone"
             android:background="@color/page_bg" />
 
-        <!--重置密码-->
+        <!--FAQ-->
         <LinearLayout
-            android:id="@+id/ll_setting_reset_psd"
+            android:id="@+id/ll_setting_faq"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            binding:clicks="@{click.resetPassword}"
-            android:padding="@dimen/d_15dp">
+            android:padding="@dimen/d_15dp"
+            android:visibility="visible">
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="重置密码"
+                android:text="常见问题"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
@@ -83,25 +83,27 @@
                 android:src="@drawable/iv_back" />
 
         </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_1dp"
+            android:visibility="visible"
             android:background="@color/page_bg" />
 
-        <!--FAQ-->
+        <!--重置密码-->
         <LinearLayout
-            android:id="@+id/ll_setting_faq"
+            android:id="@+id/ll_setting_reset_psd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:padding="@dimen/d_15dp"
-            android:visibility="visible">
+            binding:clicks="@{click.resetPassword}"
+            android:padding="@dimen/d_15dp">
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="常用问题"
+                android:text="重置密码"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
@@ -117,15 +119,16 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/d_1dp"
-            android:visibility="visible"
             android:background="@color/page_bg" />
 
+
         <!--账户注销-->
         <LinearLayout
             android:id="@+id/ll_clear_cache"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:visibility="gone"
             android:padding="@dimen/d_15dp">
 
             <TextView
@@ -164,7 +167,37 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="隐私条款"
+                android:text="隐私政策"
+                android:textColor="@color/black"
+                android:textSize="@dimen/d_14sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/d_10dp"
+                android:layout_marginRight="@dimen/d_10dp"
+                android:src="@drawable/iv_back" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_1dp"
+            android:background="@color/page_bg" />
+
+        <!--免责条款-->
+        <LinearLayout
+            android:id="@+id/ll_setting_terms_conditions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/d_15dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="免责条款"
                 android:textColor="@color/black"
                 android:textSize="@dimen/d_14sp" />
 
@@ -182,6 +215,7 @@
             android:layout_height="@dimen/d_1dp"
             android:background="@color/page_bg" />
 
+        <!--版本号-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

cpt_main/src/main/res/layout/dialog_account_deactivation.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="332dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/iv_dialog_account_deactivate_bg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right">
+
+        <ImageView
+            android:id="@+id/iv_dialog_account_deactivation_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/d_5dp"
+            android:src="@drawable/iv_dialog_account_deactivate_cancel" />
+
+    </LinearLayout>
+
+    <com.guadou.lib_baselib.font_text_view.TextViewBold
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="160dp"
+        android:gravity="center"
+        android:text="关闭账户"
+        android:textColor="@color/app_blue"
+        android:textSize="@dimen/d_21sp" />
+
+    <com.guadou.lib_baselib.font_text_view.TextViewRegular
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/d_10dp"
+        android:gravity="center"
+        android:paddingLeft="@dimen/d_20dp"
+        android:paddingRight="@dimen/d_20dp"
+        android:text="您确定要注销您的账户吗？一旦注销账户，您将无法登录app。"
+        android:textColor="@color/black"
+        android:textSize="@dimen/d_15sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="@dimen/d_40dp"
+        android:paddingLeft="@dimen/d_25dp"
+        android:paddingRight="@dimen/d_25dp">
+
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+            android:id="@+id/tv_dialog_account_deactivation_yes"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/d_40dp"
+            android:layout_weight="1"
+            android:background="@drawable/iv_dialog_account_deactivate_blue_bg"
+            android:gravity="center"
+            android:text="是"
+            android:textColor="@color/white"
+            android:textSize="@dimen/d_15sp" />
+
+        <com.guadou.lib_baselib.font_text_view.TextViewMedium
+            android:id="@+id/tv_dialog_account_deactivation_no"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/d_40dp"
+            android:layout_weight="1"
+            android:background="@drawable/iv_dialog_account_deactivate_green_bg"
+            android:gravity="center"
+            android:text="否"
+            android:layout_marginLeft="@dimen/d_20dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/d_15sp" />
+
+
+    </LinearLayout>
+
+</LinearLayout>

cpt_main/src/main/res/layout/fragment_profile.xml

@@ -119,6 +119,7 @@
                                 android:layout_marginLeft="@dimen/d_5dp"
                                 android:layout_marginTop="@dimen/d_40dp"
                                 android:layout_marginRight="@dimen/d_5dp"
+                                binding:clicks="@{click.editUserInfo}"
                                 android:background="@drawable/profile_white_shadow_comm_bg"
                                 android:orientation="vertical">
 
@@ -351,6 +352,95 @@
 
                         </FrameLayout>
 
+                        <!--Status-->
+                        <LinearLayout
+                            android:id="@+id/ll_profile_me_detail_status"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/d_5dp"
+                            android:layout_marginRight="@dimen/d_5dp"
+                            android:background="@drawable/profile_white_shadow_comm_bg"
+                            android:orientation="vertical"
+                            android:paddingTop="@dimen/d_20dp"
+                            android:paddingBottom="@dimen/d_20dp">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_25dp"
+                                    android:layout_marginRight="@dimen/d_10dp"
+                                    android:drawableLeft="@drawable/iv_profile_status_icon"
+                                    android:drawablePadding="@dimen/d_12dp"
+                                    android:text="您的账户状态："
+                                    android:textColor="@color/profile_black_8098b2"
+                                    android:textSize="@dimen/d_14sp"
+                                    tool:text="You account status: " />
+
+                                <TextView
+                                    android:id="@+id/tv_profile_me_detail_user_status"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="-"
+                                    android:textColor="@color/green"
+                                    android:textSize="@dimen/d_14sp" />
+
+                            </LinearLayout>
+
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/text_view_additional_info_reject"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:layout_marginRight="@dimen/d_23dp"
+                                android:background="@drawable/shape_gray_3round"
+                                android:paddingLeft="33dp"
+                                android:paddingTop="@dimen/d_10dp"
+                                android:paddingRight="33dp"
+                                android:paddingBottom="@dimen/d_10dp"
+                                android:text="原因"
+                                android:textColor="#8098B2"
+                                android:textSize="@dimen/d_14sp"
+                                android:visibility="visible" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/text_view_additional_info"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="@dimen/d_25dp"
+                                android:layout_marginTop="@dimen/d_10dp"
+                                android:layout_marginRight="@dimen/d_10dp"
+                                android:drawableLeft="@drawable/iv_profile_additional_info_icon"
+                                android:drawablePadding="@dimen/d_12dp"
+                                android:text="- >"
+                                binding:clicks="@{click.editProfileInfo}"
+                                android:textColor="#FFC000"
+                                android:textSize="@dimen/d_14sp" />
+
+                            <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                android:id="@+id/btn_urgent"
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/d_35dp"
+                                android:layout_marginLeft="@dimen/d_23dp"
+                                android:layout_marginTop="@dimen/d_15dp"
+                                android:layout_marginRight="@dimen/d_23dp"
+                                android:layout_marginBottom="@dimen/d_10dp"
+                                android:background="@drawable/selector_app_blue_button_round5_bg"
+                                android:gravity="center"
+                                android:text="加急"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/d_15sp"
+                                android:visibility="visible"
+                                binding:clicks="@{click.userUrgent}" />
+
+                        </LinearLayout>
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -373,6 +463,44 @@
                                 android:textColor="@color/profile_black_28394a"
                                 android:textSize="@dimen/d_18dp" />
 
+                            <!-- 朋友圈  -->
+                            <LinearLayout
+                                android:id="@+id/ll_profile_news_feed"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/transparent_bg_selector"
+                                android:clickable="true"
+                                android:orientation="horizontal"
+                                android:gravity="center_vertical"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:paddingTop="@dimen/d_15dp"
+                                android:paddingRight="@dimen/d_25dp"
+                                android:paddingBottom="@dimen/d_15dp">
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@drawable/iv_me_news_feed" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/d_15dp"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_toRightOf="@id/iv_customer_support_black"
+                                    android:text="朋友圈"
+                                    android:textColor="@color/profile_black_28394a"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/back_more_black" />
+
+                            </LinearLayout>
 
                             <!--  邀请好友   -->
                             <RelativeLayout
@@ -418,7 +546,7 @@
                                     android:text="新"
                                     android:textColor="@color/white"
                                     android:textSize="@dimen/d_9sp"
-                                    android:visibility="gone"
+                                    android:visibility="visible"
                                     tool:visibility="visible" />
 
                                 <ImageView
@@ -430,91 +558,100 @@
 
                             </RelativeLayout>
 
+                            <!--  工作培训  -->
+                            <RelativeLayout
+                                android:id="@+id/ll_me_part_time_job_training"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/transparent_bg_selector"
+                                android:clickable="true"
+                                android:orientation="horizontal"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:paddingTop="@dimen/d_15dp"
+                                android:paddingRight="@dimen/d_25dp"
+                                android:paddingBottom="@dimen/d_15dp"
+                                android:visibility="visible">
 
-                            <!--Promotions (隐藏了)-->
-                            <!--                        <RelativeLayout-->
-                            <!--                            android:id="@+id/rl_me_promotion"-->
-                            <!--                            android:layout_width="match_parent"-->
-                            <!--                            android:layout_height="wrap_content"-->
-                            <!--                            android:background="@drawable/transparent_bg_selector"-->
-                            <!--                            android:clickable="true"-->
-                            <!--                            android:orientation="horizontal"-->
-                            <!--                            android:paddingLeft="@dimen/d_25dp"-->
-                            <!--                            android:paddingTop="@dimen/d_15dp"-->
-                            <!--                            android:paddingRight="@dimen/d_25dp"-->
-                            <!--                            android:paddingBottom="@dimen/d_15dp"-->
-                            <!--                            android:visibility="gone">-->
-
-                            <!--                            <ImageView-->
-                            <!--                                android:id="@+id/iv_me_promotion"-->
-                            <!--                                android:layout_width="@dimen/d_20dp"-->
-                            <!--                                android:layout_height="@dimen/d_20dp"-->
-                            <!--                                android:contentDescription="@string/customer_support"-->
-                            <!--                                android:src="@drawable/iv_me_promotions" />-->
-
-                            <!--                            <com.guadou.componentservice.font_text_view.TextViewRegular-->
-                            <!--                                android:layout_width="wrap_content"-->
-                            <!--                                android:layout_height="wrap_content"-->
-                            <!--                                android:layout_marginStart="@dimen/d_15dp"-->
-                            <!--                                android:layout_marginLeft="@dimen/d_15dp"-->
-                            <!--                                android:layout_toRightOf="@id/iv_me_promotion"-->
-                            <!--                                android:text="@string/my_promotions"-->
-                            <!--                                android:textColor="@color/black"-->
-                            <!--                                android:textSize="@dimen/me_text_size" />-->
-
-                            <!--                            <ImageView-->
-                            <!--                                android:id="@+id/iv_promotion_back"-->
-                            <!--                                android:layout_width="wrap_content"-->
-                            <!--                                android:layout_height="wrap_content"-->
-                            <!--                                android:layout_alignParentRight="true"-->
-                            <!--                                android:layout_centerVertical="true"-->
-                            <!--                                android:src="@drawable/iv_back" />-->
-
-                            <!--                        </RelativeLayout>-->
-
-
-                            <!--Operation Executive Evaluation 评分隐藏-->
-                            <!--                        <RelativeLayout-->
-                            <!--                            android:id="@+id/rl_me_evaluation"-->
-                            <!--                            android:layout_width="match_parent"-->
-                            <!--                            android:layout_height="wrap_content"-->
-                            <!--                            android:background="@drawable/transparent_bg_selector"-->
-                            <!--                            android:clickable="true"-->
-                            <!--                            android:orientation="horizontal"-->
-                            <!--                            android:paddingLeft="@dimen/d_25dp"-->
-                            <!--                            android:paddingTop="@dimen/d_15dp"-->
-                            <!--                            android:paddingRight="@dimen/d_25dp"-->
-                            <!--                            android:paddingBottom="@dimen/d_15dp"-->
-                            <!--                            android:visibility="gone">-->
-
-                            <!--                            <ImageView-->
-                            <!--                                android:id="@+id/iv_me_evaluation"-->
-                            <!--                                android:layout_width="@dimen/d_20dp"-->
-                            <!--                                android:layout_height="@dimen/d_20dp"-->
-                            <!--                                android:contentDescription="@string/customer_support"-->
-                            <!--                                android:src="@drawable/iv_me_evaluation" />-->
-
-                            <!--                            <com.guadou.componentservice.font_text_view.TextViewRegular-->
-                            <!--                                android:layout_width="wrap_content"-->
-                            <!--                                android:layout_height="wrap_content"-->
-                            <!--                                android:layout_marginStart="@dimen/d_15dp"-->
-                            <!--                                android:layout_marginLeft="@dimen/d_15dp"-->
-                            <!--                                android:layout_toRightOf="@+id/iv_me_evaluation"-->
-                            <!--                                android:text="@string/operation_executive_evaluation"-->
-                            <!--                                android:textColor="@color/black"-->
-                            <!--                                android:textSize="@dimen/me_text_size" />-->
-
-                            <!--                            <ImageView-->
-                            <!--                                android:id="@+id/iv_me_evaluation_back"-->
-                            <!--                                android:layout_width="wrap_content"-->
-                            <!--                                android:layout_height="wrap_content"-->
-                            <!--                                android:layout_alignParentRight="true"-->
-                            <!--                                android:layout_centerVertical="true"-->
-                            <!--                                android:src="@drawable/iv_back" />-->
-
-
-                            <!--                        </RelativeLayout>-->
+                                <ImageView
+                                    android:id="@+id/iv_me_training_gift"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@drawable/iv_me_job_training" />
 
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:id="@+id/tv_training_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/d_15dp"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_toRightOf="@id/iv_me_training_gift"
+                                    android:text="工作培训"
+                                    android:textColor="@color/black"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <TextView
+                                    android:id="@+id/tv_me_training_new"
+                                    android:layout_width="33dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="@dimen/d_10dp"
+                                    android:layout_toRightOf="@id/tv_training_text"
+                                    android:background="@drawable/iv_me_pet_farming_bg"
+                                    android:gravity="center"
+                                    android:paddingBottom="1.2dp"
+                                    android:text="新"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/d_9sp"
+                                    android:visibility="visible"
+                                    tool:visibility="visible" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/back_more_black" />
+
+                            </RelativeLayout>
+
+                            <!-- 个人详情  -->
+                            <LinearLayout
+                                android:id="@+id/ll_profile_profile_detail"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/transparent_bg_selector"
+                                android:clickable="true"
+                                android:orientation="horizontal"
+                                android:gravity="center_vertical"
+                                binding:clicks="@{click.gotoProfileInfoActivity}"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:paddingTop="@dimen/d_15dp"
+                                android:paddingRight="@dimen/d_25dp"
+                                android:paddingBottom="@dimen/d_15dp">
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@drawable/iv_me_profile_detail" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/d_15dp"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_toRightOf="@id/iv_customer_support_black"
+                                    android:text="个人详情"
+                                    android:textColor="@color/profile_black_28394a"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/back_more_black" />
+
+                            </LinearLayout>
 
                             <!-- Help Center  -->
                             <RelativeLayout
@@ -554,6 +691,45 @@
 
                             </RelativeLayout>
 
+                            <!-- 关闭账户  -->
+                            <LinearLayout
+                                android:id="@+id/ll_profile_account_deactivation"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/transparent_bg_selector"
+                                android:clickable="true"
+                                android:orientation="horizontal"
+                                android:gravity="center_vertical"
+                                binding:clicks="@{click.userDeactivationAccount}"
+                                android:paddingLeft="@dimen/d_25dp"
+                                android:paddingTop="@dimen/d_15dp"
+                                android:paddingRight="@dimen/d_25dp"
+                                android:paddingBottom="@dimen/d_15dp">
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@drawable/iv_me_account_deactivation" />
+
+                                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/d_15dp"
+                                    android:layout_marginLeft="@dimen/d_15dp"
+                                    android:layout_toRightOf="@id/iv_customer_support_black"
+                                    android:text="关闭账户"
+                                    android:textColor="@color/profile_black_28394a"
+                                    android:textSize="@dimen/d_14sp" />
+
+                                <ImageView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentRight="true"
+                                    android:layout_centerVertical="true"
+                                    android:src="@drawable/back_more_black" />
+
+                            </LinearLayout>
 
                             <!-- Setting  -->
                             <RelativeLayout

cpt_main/src/main/res/layout/item_invite_referral.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="item"
+            type="String" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingTop="@dimen/d_15dp"
+            android:paddingBottom="@dimen/d_15dp">
+
+            <com.guadou.lib_baselib.view.CircleImageView
+                android:id="@+id/iv_item_referrals_list"
+                android:layout_width="@dimen/d_43dp"
+                android:layout_height="@dimen/d_43dp"
+                android:layout_marginLeft="@dimen/d_16dp"
+                android:background="@drawable/im_default_head"
+                android:scaleType="centerCrop" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_16dp"
+                android:orientation="vertical">
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_user_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Broderick"
+                    android:textColor="@color/home_item_title_color"
+                    android:textSize="@dimen/d_16sp" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewLight
+                    android:id="@+id/tv_invite_tile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="@dimen/d_5dp"
+                    android:layout_marginRight="@dimen/d_16dp"
+                    android:text="02/12/2017"
+                    android:textColor="@color/gray_76"
+                    android:textSize="@dimen/d_14sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="0.7dp"
+            android:layout_marginLeft="@dimen/d_16dp"
+            android:layout_marginRight="@dimen/d_16dp"
+            android:background="@color/divider_color" />
+
+    </LinearLayout>
+
+</layout>

cpt_main/src/main/res/layout/view_popup_user_urgent.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="322dp"
+    android:layout_height="376dp"
+    android:background="@drawable/shape_5round_white"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/iv_dialog_delete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="@dimen/d_3dp"
+        android:layout_marginRight="@dimen/d_5dp"
+        android:src="@drawable/dialog_blue_delete" />
+
+
+    <ImageView
+        android:layout_width="288dp"
+        android:layout_height="149dp"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/user_urgent_dialog_img" />
+
+
+    <com.guadou.lib_baselib.font_text_view.TextViewLight
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/d_32dp"
+        android:layout_marginTop="@dimen/d_25dp"
+        android:layout_marginRight="@dimen/d_32dp"
+        android:text="You have sent urgent notification to our admin already. Please wait for our admin for approval."
+        android:textColor="@color/black"
+        android:textSize="18sp" />
+
+    <com.guadou.lib_baselib.font_text_view.TextViewLight
+        android:id="@+id/tv_dialog_ok"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/d_42dp"
+        android:layout_marginLeft="@dimen/d_25dp"
+        android:layout_marginTop="@dimen/d_25dp"
+        android:layout_marginRight="@dimen/d_25dp"
+        android:background="@drawable/selector_app_blue_button_round2_bg"
+        android:gravity="center"
+        android:text="OK"
+        android:textColor="@color/white"
+        android:textSize="@dimen/d_16sp" />
+
+</LinearLayout>

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/router/PartTimeComponentServiceImpl.kt

@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.guadou.cs_router.ARouterPath
 import com.guadou.cs_router.parttime.IParttimeComponentServer
+import com.hongyegroup.cpt_parttime.ui.PartJobEditProfileInfoActivity
 import com.hongyegroup.cpt_parttime.ui.activity.PartTimeJobDetailActivity
 import com.hongyegroup.cpt_parttime.ui.main.PartTimeActivesFragment
 import com.hongyegroup.cpt_parttime.ui.main.PartTimeHomeFragment
@@ -24,6 +25,12 @@ class PartTimeComponentServiceImpl : IParttimeComponentServer {
         return PartTimeActivesFragment()
     }
 
+    override fun startPartTimeJobEditProfileInfoActivity() {
+
+        PartJobEditProfileInfoActivity.startInstance()
+
+    }
+
     override fun init(context: Context?) {
 
     }

cs_cptServices/src/main/res/drawable/shape_gray_bg_border_line.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/gray_add_bank_card"/>
+    <stroke android:color="@color/divider_color" android:width="@dimen/d_0.5dp"/>
+
+</shape>

cs_cptServices/src/main/res/values/colors.xml

@@ -58,6 +58,7 @@
     <color name="progress_background">#22102A45</color>
     <color name="white_text_fe">#fefefe</color>
     <color name="gray_text_8e">#8E8E8E</color>
+    <color name="gray_add_bank_card">#F2F4F8</color>
 
     <color name="color_333">#767676</color>
     <color name="color_275D9D">#275D9D</color>

cs_router/src/main/java/com/guadou/cs_router/parttime/IParttimeComponentServer.kt

@@ -11,4 +11,6 @@ interface IParttimeComponentServer : IProvider {
 
     fun obtainActivesFragment(): Fragment
 
+    fun startPartTimeJobEditProfileInfoActivity()
+
 }