1.编辑用户信息界面搭建

2.编辑用户Name界面搭建
3.编辑用户Phone界面搭建
4.注销账号弹框
5.注销账号原因界面搭建

cpt_main/src/main/AndroidManifest.xml

@@ -20,6 +20,14 @@
 
         <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/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/ProfileFragment.kt

@@ -10,6 +10,7 @@ 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
@@ -66,28 +67,28 @@ class ProfileFragment : YYBaseVDBFragment<ProfileViewModel, FragmentProfileBindi
     inner class ClickProxy {
 
         //跳转到邀请朋友界面
-        fun gotoInviteFriendsActivity(){
+        fun gotoInviteFriendsActivity() {
 
             InviteFriendsActivity.startInstance()
 
         }
 
         //跳转到Settings界面
-        fun  gotoSettingsActivity(){
+        fun gotoSettingsActivity() {
 
             SettingsActivity.startInstance()
 
         }
 
         //编辑个人信息
-        fun editProfileInfo(){
+        fun editProfileInfo() {
 
             YYRouterService.parttimeComponentServer?.startPartTimeJobEditProfileInfoActivity()
 
         }
 
         //审核状态加急
-        fun userUrgent(){
+        fun userUrgent() {
 
             //弹窗展示以及申请成功
             XPopup.Builder(mActivity)
@@ -98,12 +99,38 @@ class ProfileFragment : YYBaseVDBFragment<ProfileViewModel, FragmentProfileBindi
         }
 
         //跳转到个人信息界面
-        fun gotoProfileInfoActivity(){
+        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/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/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/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">
 
@@ -699,6 +700,7 @@
                                 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"

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>