From 938bee4fdb195387173bb3f5592862588140b5f1 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 20 Mar 2024 11:03:29 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99-?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=E3=80=81=E8=BA=AB=E9=AB=98=E3=80=81=E7=88=B1?=
 =?UTF-8?q?=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/bean/CareerBean.java    |   76 +
 .../com/yunbao/common/http/PDLiveApi.java     |   21 +
 .../common/http/live/LiveNetManager.java      |   97 +-
 .../main/res/layout/view_title_not_color.xml  |   69 +
 common/src/main/res/values/style.xml          |    7 +
 main/src/main/AndroidManifest.xml             |    1 +
 .../main/activity/EditProfileActivity.java    |  142 +-
 .../main/activity/EditUserHobbyActivity.java  |  126 ++
 .../main/adapter/EditUserHobbyAdapter.java    |   86 ++
 .../main/res/layout/activity_edit_profile.xml | 1324 ++++++++++-------
 .../res/layout/activity_edit_user_hobby.xml   |   76 +
 .../main/res/layout/item_edit_user_hobby.xml  |   15 +
 .../main/res/mipmap-xxhdpi/ic_edit_avatar.png |  Bin 0 -> 1931 bytes
 .../res/mipmap-xxhdpi/ic_edit_birthday.png    |  Bin 0 -> 2382 bytes
 .../main/res/mipmap-xxhdpi/ic_edit_city.png   |  Bin 0 -> 2948 bytes
 .../main/res/mipmap-xxhdpi/ic_edit_height.png |  Bin 0 -> 2482 bytes
 .../main/res/mipmap-xxhdpi/ic_edit_hobby.png  |  Bin 0 -> 2904 bytes
 .../main/res/mipmap-xxhdpi/ic_edit_name.png   |  Bin 0 -> 1832 bytes
 .../res/mipmap-xxhdpi/ic_edit_occupation.png  |  Bin 0 -> 2786 bytes
 .../main/res/mipmap-xxhdpi/ic_edit_phone.png  |  Bin 0 -> 909 bytes
 .../main/res/mipmap-xxhdpi/ic_edit_sex.png    |  Bin 0 -> 2554 bytes
 .../main/res/mipmap-xxhdpi/ic_edit_sign.png   |  Bin 0 -> 1895 bytes
 main/src/main/res/values-zh/strings.xml       |    5 +
 main/src/main/res/values/strings.xml          |    5 +
 24 files changed, 1473 insertions(+), 577 deletions(-)
 create mode 100644 common/src/main/java/com/yunbao/common/bean/CareerBean.java
 create mode 100644 common/src/main/res/layout/view_title_not_color.xml
 create mode 100644 main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java
 create mode 100644 main/src/main/java/com/yunbao/main/adapter/EditUserHobbyAdapter.java
 create mode 100644 main/src/main/res/layout/activity_edit_user_hobby.xml
 create mode 100644 main/src/main/res/layout/item_edit_user_hobby.xml
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_avatar.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_birthday.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_city.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_height.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_hobby.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_name.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_occupation.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_phone.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_sex.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_edit_sign.png

diff --git a/common/src/main/java/com/yunbao/common/bean/CareerBean.java b/common/src/main/java/com/yunbao/common/bean/CareerBean.java
new file mode 100644
index 000000000..405785447
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/bean/CareerBean.java
@@ -0,0 +1,76 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class CareerBean extends BaseModel {
+    int id;
+    int pid;
+    @SerializedName("cn_title")
+    String titleCn;
+    @SerializedName("en_title")
+    String titleEn;
+    @SerializedName("create_time")
+    long createTime;
+    @SerializedName("uplong_time")
+    long uplongTime;
+    @SerializedName("children")
+    List<CareerBean> children;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getPid() {
+        return pid;
+    }
+
+    public void setPid(int pid) {
+        this.pid = pid;
+    }
+
+    public String getTitleCn() {
+        return titleCn;
+    }
+
+    public void setTitleCn(String titleCn) {
+        this.titleCn = titleCn;
+    }
+
+    public String getTitleEn() {
+        return titleEn;
+    }
+
+    public void setTitleEn(String titleEn) {
+        this.titleEn = titleEn;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public long getUplongTime() {
+        return uplongTime;
+    }
+
+    public void setUplongTime(long uplongTime) {
+        this.uplongTime = uplongTime;
+    }
+
+    public List<CareerBean> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<CareerBean> children) {
+        this.children = children;
+    }
+}
diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index 39a114f28..1f85509a1 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -10,6 +10,7 @@ import com.yunbao.common.bean.BattlePassPoints;
 import com.yunbao.common.bean.BattlePassTask;
 import com.yunbao.common.bean.BattlePassUserInfoBean;
 import com.yunbao.common.bean.BlindBoxInfoModel;
+import com.yunbao.common.bean.CareerBean;
 import com.yunbao.common.bean.CheckLiveModel;
 import com.yunbao.common.bean.CheckRemainingBalance;
 import com.yunbao.common.bean.ContributeModel;
@@ -1267,4 +1268,24 @@ public interface PDLiveApi {
     @GET("/api/public/?service=Pdluserhome.getUserHomeInfo")
     Observable<ResponseModel<HomeUserExhibitInfoBean>> getUserHomeExhibitInfo(@Query("select_uid") String tuid);
 
+    @GET("/api/public/?service=Pdlinfos.getCareer")
+    Observable<ResponseModel<List<CareerBean>>> getCareer();
+
+    @GET("/api/public/?service=Pdlinfos.setCareer")
+    Observable<ResponseModel<List<BaseModel>>> setCareer(
+            @Query("career") String career,
+            @Query("en_career") String en
+            );
+
+    @GET("/api/public/?service=Pdlinfos.setHeight")
+    Observable<ResponseModel<List<BaseModel>>> setUserHeight(
+            @Query("height") String height
+            );
+
+    @GET("/api/public/?service=Pdllable.get")
+    Observable<ResponseModel<List<CareerBean>>> getHobby();
+    @GET("/api/public/?service=Pdlinfos.setLabel")
+    Observable<ResponseModel<List<BaseModel>>> setHobby(
+            @Query("labels") String labelsId
+    );
 }
diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
index 512cf203b..8998844cb 100644
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -15,6 +15,7 @@ import com.yunbao.common.bean.BattlePassPoints;
 import com.yunbao.common.bean.BattlePassTask;
 import com.yunbao.common.bean.BattlePassUserInfoBean;
 import com.yunbao.common.bean.BlindBoxInfoModel;
+import com.yunbao.common.bean.CareerBean;
 import com.yunbao.common.bean.CheckLiveModel;
 import com.yunbao.common.bean.CheckRemainingBalance;
 import com.yunbao.common.bean.CoolConfig;
@@ -3381,7 +3382,101 @@ public class LiveNetManager {
                     }
                 }).isDisposed();
     }
-
+    public void getCareer(HttpCallback<List<CareerBean>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getCareer()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(roomMicStatusModelResponseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(roomMicStatusModelResponseModel.getData().getInfo());
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+    public void setCareer(String career,String careerEn, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .setCareer(career,careerEn)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(listResponseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(new HttpCallbackModel(listResponseModel.getData().getCode(), listResponseModel.getData().getMsg()));
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+    public void setUserHeight(String height, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .setUserHeight(height)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(listResponseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(new HttpCallbackModel(listResponseModel.getData().getCode(), listResponseModel.getData().getMsg()));
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+    public void getHobby(HttpCallback<List<CareerBean>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getHobby()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(roomMicStatusModelResponseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(roomMicStatusModelResponseModel.getData().getInfo());
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+    public void setHobby(String ids, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .setHobby(ids)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(listResponseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(new HttpCallbackModel(listResponseModel.getData().getCode(), listResponseModel.getData().getMsg()));
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
     private MultipartBody.Part createUploadFile(File file) {
         RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
         return MultipartBody.Part.createFormData("file", file.getName(), requestBody);
diff --git a/common/src/main/res/layout/view_title_not_color.xml b/common/src/main/res/layout/view_title_not_color.xml
new file mode 100644
index 000000000..82f5bf9a9
--- /dev/null
+++ b/common/src/main/res/layout/view_title_not_color.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:paddingTop="24dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/titleView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/btn_back"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_centerVertical="true"
+            android:onClick="backClick"
+            android:padding="9dp"
+            android:src="@mipmap/icon_back"
+            android:tint="@color/textColor" />
+
+        <ImageView
+            android:id="@+id/img_more"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:padding="9dp"
+            android:src="@mipmap/btn_more_black"
+            android:tint="@color/textColor"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/rView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toLeftOf="@+id/redPacketMain"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:text="@string/not_received"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/redPacketMain"
+            android:layout_width="20dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="15dp"
+            android:visibility="invisible"
+            app:srcCompat="@mipmap/ic_red_packet_record"
+            tools:visibility="visible" />
+
+    </RelativeLayout>
+</FrameLayout>
diff --git a/common/src/main/res/values/style.xml b/common/src/main/res/values/style.xml
index c444de78d..0511f2543 100644
--- a/common/src/main/res/values/style.xml
+++ b/common/src/main/res/values/style.xml
@@ -98,6 +98,13 @@
         <item name="android:paddingRight">15dp</item>
         <item name="android:background">@color/white</item>
     </style>
+    <style name="edit_profile_group_not_color" parent="AppTheme">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">45dp</item>
+        <item name="android:paddingLeft">15dp</item>
+        <item name="android:paddingRight">15dp</item>
+
+    </style>
 
     <style name="Theme.PayssionTrans" parent="Theme.AppCompat.Light">
         <item name="android:windowIsTranslucent">true</item>
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 81f36666e..3e7cdc95b 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -170,6 +170,7 @@
             android:screenOrientation="portrait" />
         <activity android:name=".activity.CompleteUserInfoActivity"
             android:screenOrientation="portrait" />
+        <activity android:name=".activity.EditUserHobbyActivity"  android:screenOrientation="portrait"  />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
index e540e924f..d65665e66 100644
--- a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
@@ -13,6 +13,10 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.configure.PickerOptions;
+import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
+import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.core.BasePopupView;
 import com.lxj.xpopup.interfaces.XPopupCallback;
@@ -27,6 +31,9 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.activity.WebViewActivity;
+import com.yunbao.common.bean.CareerBean;
+import com.yunbao.common.bean.HttpCallbackModel;
+import com.yunbao.common.bean.MessageUserInfoBean;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.event.UpdateFieldEvent;
 import com.yunbao.common.glide.ImgLoader;
@@ -59,6 +66,8 @@ import org.greenrobot.eventbus.ThreadMode;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import cn.qqtheme.framework.entity.City;
 import cn.qqtheme.framework.entity.County;
@@ -90,6 +99,7 @@ public class EditProfileActivity extends AbsActivity {
     private View viewProgress1, viewProgress2, viewProgress3;
     private FrameLayout completeInformation, completeInformation1, completeInformation2, completeInformation3;
     private TextView information, information1, information2, information3, submit;
+    private MessageUserInfoBean userInfoBean;
 
     @Override
     protected int getLayoutId() {
@@ -130,10 +140,10 @@ public class EditProfileActivity extends AbsActivity {
             public void onSuccess(File file) {
 
                 if (file != null) {
-                    System.err.println("头像---->收到头像文件 file = "+file.getAbsolutePath()+" | length = "+file.length());
-                    if (file.getName().contains(".gif")){
-                        ToastUtil.show(WordUtil.isNewZh()?"暫不支持該文件":"This file is not supported");
-                    }else {
+                    System.err.println("头像---->收到头像文件 file = " + file.getAbsolutePath() + " | length = " + file.length());
+                    if (file.getName().contains(".gif")) {
+                        ToastUtil.show(WordUtil.isNewZh() ? "暫不支持該文件" : "This file is not supported");
+                    } else {
                         ImgLoader.display(mContext, file, mAvatar);
                         MainHttpUtil.updateAvatar(file, new HttpCallback() {
                             @Override
@@ -185,12 +195,14 @@ public class EditProfileActivity extends AbsActivity {
         mUserBean = CommonAppConfig.getInstance().getUserBean();
         if (mUserBean != null) {
             showData(mUserBean);
+            initUserInfoData();
         } else {
             MainHttpUtil.getBaseInfo(new CommonCallback<UserBean>() {
                 @Override
                 public void callback(UserBean u) {
                     mUserBean = u;
                     showData(u);
+                    initUserInfoData();
                 }
             });
         }
@@ -399,9 +411,102 @@ public class EditProfileActivity extends AbsActivity {
                     .putExtra("token", CommonAppConfig.getInstance().getToken())
                     .putExtra("isBind", isBind)
                     .putExtra("mobile", mobile));
+        } else if (i == R.id.btn_occupation) {
+            showOccupationDialog();
+        } else if (i == R.id.btn_height) {
+            showUserHeightDialog();
+        } else if (i == R.id.btn_hobby) {
+            startActivity(new Intent(this, EditUserHobbyActivity.class));
         }
     }
 
+    List<CareerBean> careerBeans;
+
+    private void showOccupationDialog() {
+        LiveNetManager.get(mContext)
+                .getCareer(new com.yunbao.common.http.base.HttpCallback<List<CareerBean>>() {
+                    @Override
+                    public void onSuccess(List<CareerBean> data) {
+                        careerBeans = new ArrayList<>(data);
+                        List<String> items1 = new ArrayList<>();
+                        List<List<String>> items2 = new ArrayList<>();
+                        for (CareerBean bean : data) {
+                            items1.add(WordUtil.isNewZh() ? bean.getTitleCn() : bean.getTitleEn());
+                            List<String> tmp = new ArrayList<>();
+                            for (CareerBean child : bean.getChildren()) {
+                                tmp.add(WordUtil.isNewZh() ? child.getTitleCn() : child.getTitleEn());
+                            }
+                            items2.add(tmp);
+                        }
+                        OptionsPickerView<String> pickerView = new OptionsPickerBuilder(mContext, new OnOptionsSelectListener() {
+                            @Override
+                            public void onOptionsSelect(int i, int i1, int i2, View view) {
+                                CareerBean val = careerBeans.get(i).getChildren().get(i1);
+                                setOccupation(val.getTitleCn(), val.getTitleEn());
+                            }
+
+                            private void setOccupation(String cn, String en) {
+                                LiveNetManager.get(mContext)
+                                        .setCareer(cn, en, new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() {
+                                            @Override
+                                            public void onSuccess(HttpCallbackModel data) {
+                                                ToastUtil.show(data.getMsg());
+                                                ((TextView) findViewById(R.id.occupation)).setText(WordUtil.isNewZh() ? cn : en);
+                                            }
+
+                                            @Override
+                                            public void onError(String error) {
+                                                ToastUtil.show(error);
+                                            }
+                                        });
+                            }
+                        }).build();
+                        pickerView.setPicker(items1, items2);
+                        pickerView.show();
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        ToastUtil.show(error);
+                    }
+                });
+
+
+    }
+
+    private void showUserHeightDialog() {
+        List<String> height = new ArrayList<>();
+        for (int i = 50; i <= 250; i++) {
+            height.add(i + "cm");
+        }
+        OptionsPickerView<String> pickerView = new OptionsPickerBuilder(mContext, new OnOptionsSelectListener() {
+            @Override
+            public void onOptionsSelect(int i, int i1, int i2, View view) {
+                String height = (i + 50) + "";
+                setUserHeight(height);
+            }
+
+            private void setUserHeight(String height) {
+                LiveNetManager.get(mContext)
+                        .setUserHeight(height, new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() {
+                            @Override
+                            public void onSuccess(HttpCallbackModel data) {
+                                ToastUtil.show(data.getMsg());
+                                ((TextView) findViewById(R.id.height)).setText(height + "cm");
+                            }
+
+                            @Override
+                            public void onError(String error) {
+                                ToastUtil.show(error);
+                            }
+                        });
+            }
+        }).setSelectOptions(120)
+                .build();
+        pickerView.setPicker(height);
+        pickerView.show();
+    }
+
     private void showTaskDialog() {
         final Dialog dialog = new Dialog(EditProfileActivity.this, com.yunbao.live.R.style.dialog);
         dialog.setContentView(R.layout.dialog_task);
@@ -418,7 +523,7 @@ public class EditProfileActivity extends AbsActivity {
             @Override
             public void onClick(View v) {
                 String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
-                WebViewActivity.forward(mContext, url,false);
+                WebViewActivity.forward(mContext, url, false);
                 dialog.dismiss();
             }
         });
@@ -453,7 +558,7 @@ public class EditProfileActivity extends AbsActivity {
         }
         Constants.myIntoIndex = 2;
         Intent intent = new Intent(mContext, MyWebViewActivity2.class);
-        intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
+        intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
         startActivity(intent);
     }
 
@@ -767,12 +872,37 @@ public class EditProfileActivity extends AbsActivity {
         });
     }
 
+    private void initUserInfoData() {
+        LiveNetManager.get(mContext)
+                .getOtherInfo(userModel.getId() + "", new com.yunbao.common.http.base.HttpCallback<MessageUserInfoBean>() {
+                    @Override
+                    public void onSuccess(MessageUserInfoBean data) {
+                        userInfoBean = data;
+                        ((TextView) findViewById(R.id.occupation)).setText(data.getInfo().getCareer());
+                        ((TextView) findViewById(R.id.height)).setText(data.getInfo().getHeight() + "cm");
+                        List<String> tags = WordUtil.isNewZh() ? data.getInfo().getCn_label() : data.getInfo().getEn_label();
+                        if (tags == null || tags.isEmpty()) return;
+                        StringBuilder sb = new StringBuilder();
+                        for (String tag : tags) {
+                            sb.append(tag).append(",");
+                        }
+                        ((TextView) findViewById(R.id.hobby)).setText(sb.substring(0, sb.length() - 1));
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
         if (Constants.isShowPage != -1) {
             finish();
         }
+        initUserInfoData();
         MainHttpUtil.getBaseInfo(new CommonCallback<UserBean>() {
             @Override
             public void callback(UserBean u) {
diff --git a/main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java b/main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java
new file mode 100644
index 000000000..c34982aac
--- /dev/null
+++ b/main/src/main/java/com/yunbao/main/activity/EditUserHobbyActivity.java
@@ -0,0 +1,126 @@
+package com.yunbao.main.activity;
+
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.alibaba.fastjson.JSONArray;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.activity.AbsActivity;
+import com.yunbao.common.bean.CareerBean;
+import com.yunbao.common.bean.HttpCallbackModel;
+import com.yunbao.common.bean.MessageUserInfoBean;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
+import com.yunbao.main.R;
+import com.yunbao.main.adapter.EditUserHobbyAdapter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class EditUserHobbyActivity extends AbsActivity {
+    TextView mNumber;
+    RecyclerView recyclerView;
+    EditUserHobbyAdapter adapter;
+    Button mSave, mCancel;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_edit_user_hobby;
+    }
+
+    @Override
+    protected void main() {
+        super.main();
+        mNumber = findViewById(R.id.number);
+        recyclerView = findViewById(R.id.recyclerView);
+        mSave = findViewById(R.id.btn_save);
+        mCancel = findViewById(R.id.btn_cancel);
+        adapter = new EditUserHobbyAdapter();
+        recyclerView.setAdapter(adapter);
+        adapter.setOnItemClickListener(new OnItemClickListener<List<String>>() {
+            @Override
+            public void onItemClick(List<String> bean, int position) {
+                mNumber.setText(String.format("(%s/%s)", position, "5"));
+                System.out.println(JSONArray.toJSONString(bean));
+            }
+        });
+        initData();
+        mCancel.setOnClickListener(view -> {
+            finish();
+        });
+        mSave.setOnClickListener(view -> {
+            List<String> strings = adapter.getmSelectedList();
+            uploadSelectData(strings);
+        });
+    }
+
+    private void uploadSelectData(List<String> strings) {
+        StringBuilder sb = new StringBuilder();
+        String hobby = "";
+        for (String tag : strings) {
+            if (!StringUtil.isEmpty(tag)) {
+                sb.append(tag).append(",");
+            }
+        }
+        if (sb.length() != 0) {
+            hobby = sb.substring(0, sb.length() - 1);
+        }
+
+        LiveNetManager.get(mContext)
+                .setHobby(hobby, new HttpCallback<HttpCallbackModel>() {
+                    @Override
+                    public void onSuccess(HttpCallbackModel data) {
+                        ToastUtil.show(data.getMsg());
+                        finish();
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        ToastUtil.show(error);
+                    }
+                });
+    }
+
+    private void initData() {
+        LiveNetManager.get(mContext)
+                .getHobby(new HttpCallback<List<CareerBean>>() {
+                    @Override
+                    public void onSuccess(List<CareerBean> data) {
+                        adapter.setHobbyData(data);
+                        adapter.notifyDataSetChanged();
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+        LiveNetManager.get(mContext)
+                .getOtherInfo(CommonAppConfig.getInstance().getUid(), new HttpCallback<MessageUserInfoBean>() {
+                    @Override
+                    public void onSuccess(MessageUserInfoBean data) {
+                        String labelIds = data.getInfo().getLabel_id();
+                        if (StringUtil.isEmpty(labelIds)) {
+                            adapter.setSelectData(new ArrayList<>());
+                            return;
+                        }
+                        List<String> list = new ArrayList<>(Arrays.asList(labelIds.split(",")));
+                        mNumber.setText(String.format("(%s/%s)", list.size(), "5"));
+                        adapter.setSelectData(list);
+                        adapter.notifyDataSetChanged();
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+    }
+}
diff --git a/main/src/main/java/com/yunbao/main/adapter/EditUserHobbyAdapter.java b/main/src/main/java/com/yunbao/main/adapter/EditUserHobbyAdapter.java
new file mode 100644
index 000000000..69c0ea8fa
--- /dev/null
+++ b/main/src/main/java/com/yunbao/main/adapter/EditUserHobbyAdapter.java
@@ -0,0 +1,86 @@
+package com.yunbao.main.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.CareerBean;
+import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.utils.WordUtil;
+import com.yunbao.main.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EditUserHobbyAdapter extends RecyclerView.Adapter<EditUserHobbyAdapter.ViewHolder> {
+    List<CareerBean> mList = new ArrayList<>();
+    List<String> mSelectedList = new ArrayList<>();
+    OnItemClickListener<List<String>> onItemClickListener;
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_edit_user_hobby, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.setData(mList.get(position), position);
+    }
+
+    public void setOnItemClickListener(OnItemClickListener<List<String>> onItemClickListener) {
+        this.onItemClickListener = onItemClickListener;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList.size();
+    }
+
+    public void setSelectData(List<String> list) {
+        mSelectedList = list;
+    }
+
+    public List<String> getmSelectedList() {
+        return mSelectedList;
+    }
+
+    public void setHobbyData(List<CareerBean> data) {
+        mList = data;
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        Button button;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            button = itemView.findViewById(R.id.btn);
+        }
+
+        public void setData(CareerBean careerBean, int position) {
+            button.setBackgroundResource(R.drawable.dialog_bg_chat_status_config);
+            String tag = careerBean.getId() + "";
+            for (String select : mSelectedList) {
+                if (select.equals(tag)) {
+                    button.setBackgroundResource(R.drawable.dialog_bg_chat_status_config_select);
+                }
+            }
+            button.setOnClickListener(view -> {
+                if (mSelectedList.contains(tag)) {
+                    mSelectedList.remove(tag);
+                } else if (mSelectedList.size() < 5) {
+                    mSelectedList.add(tag);
+                }
+                if (onItemClickListener != null) {
+                    onItemClickListener.onItemClick(mSelectedList, mSelectedList.size());
+                }
+                notifyDataSetChanged();
+            });
+            button.setText(WordUtil.isNewZh() ? careerBean.getTitleCn() : careerBean.getTitleEn());
+        }
+    }
+}
diff --git a/main/src/main/res/layout/activity_edit_profile.xml b/main/src/main/res/layout/activity_edit_profile.xml
index 7cfa48adc..2dd2d680f 100644
--- a/main/src/main/res/layout/activity_edit_profile.xml
+++ b/main/src/main/res/layout/activity_edit_profile.xml
@@ -3,585 +3,769 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F8F9"
+    android:background="#F7F7F7"
     android:orientation="vertical">
 
-    <include layout="@layout/view_title" />
-
-    <RelativeLayout
-        android:id="@+id/btn_avatar"
-        style="@style/edit_profile_group"
-        android:onClick="editProfileClick">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/edit_profile_avatar"
-            android:textColor="@color/textColor"
-            android:textSize="14sp" />
-
-
-        <com.makeramen.roundedimageview.RoundedImageView
-            android:id="@+id/avatar"
-            android:layout_width="46dp"
-            android:layout_height="46dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="25dp"
-            android:scaleType="centerCrop"
-            app:riv_oval="true" />
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@mipmap/icon_arrow_right" />
-
-    </RelativeLayout>
-
-    <View
-        style="@style/line2"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:visibility="gone" />
-
-    <RelativeLayout
-        android:id="@+id/btn_name"
-        style="@style/edit_profile_group"
-        android:onClick="editProfileClick">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/edit_profile_nickname"
-            android:textColor="@color/textColor"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="70dp"
-            android:layout_marginRight="25dp"
-            android:ellipsize="end"
-            android:gravity="right"
-            android:singleLine="true"
-            android:textColor="#353535"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@mipmap/icon_arrow_right" />
-    </RelativeLayout>
-
-
-    <View
-        style="@style/line2"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:visibility="gone" />
-
-    <RelativeLayout
-        android:id="@+id/btn_sign"
-        style="@style/edit_profile_group"
-        android:onClick="editProfileClick">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/edit_profile_sign"
-            android:textColor="@color/textColor"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/sign"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="70dp"
-            android:layout_marginRight="25dp"
-            android:ellipsize="end"
-            android:gravity="right"
-            android:singleLine="true"
-            android:textColor="#353535"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@mipmap/icon_arrow_right" />
-    </RelativeLayout>
-
-    <View
-        style="@style/line2"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:visibility="gone" />
-
-
-    <RelativeLayout
-        android:id="@+id/btn_birthday"
-        style="@style/edit_profile_group"
-        android:onClick="editProfileClick">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/edit_profile_birthday"
-            android:textColor="@color/textColor"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="10dp"
-            android:text="*"
-            android:textColor="#FF5730"
-            android:textSize="9sp" />
-
-        <TextView
-            android:id="@+id/birthday"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="70dp"
-            android:layout_marginRight="25dp"
-            android:ellipsize="end"
-            android:gravity="right"
-            android:singleLine="true"
-            android:textColor="#353535"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@mipmap/icon_arrow_right" />
-    </RelativeLayout>
-
-
-    <View
-        style="@style/line2"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:visibility="gone" />
-
-    <RelativeLayout
-        android:id="@+id/btn_sex"
-        style="@style/edit_profile_group"
-        android:onClick="editProfileClick">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/edit_profile_sex"
-            android:textColor="@color/textColor"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="10dp"
-            android:text="*"
-            android:textColor="#FF5730"
-            android:textSize="9sp" />
-
-        <TextView
-            android:id="@+id/sex"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="25dp"
-            android:textColor="#353535"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@mipmap/icon_arrow_right" />
-
-    </RelativeLayout>
-
-
-    <View
-        style="@style/line2"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:visibility="gone" />
-
-    <RelativeLayout
-        android:id="@+id/btn_city"
-        style="@style/edit_profile_group"
-        android:onClick="editProfileClick">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/edit_profile_city"
-            android:textColor="@color/textColor"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="44dp"
-            android:layout_marginTop="10dp"
-            android:text="*"
-            android:textColor="#FF5730"
-            android:textSize="9sp" />
-
-        <TextView
-            android:id="@+id/city"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="70dp"
-            android:layout_marginRight="25dp"
-            android:ellipsize="end"
-            android:gravity="right"
-            android:singleLine="true"
-            android:textColor="#353535"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@mipmap/icon_arrow_right" />
-    </RelativeLayout>
-
-    <View
-        style="@style/line2"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:visibility="gone" />
-
-
-    <RelativeLayout
-        android:id="@+id/rt_bind_phone"
-        style="@style/edit_profile_group"
-        android:onClick="editProfileClick">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/bind_phone"
-            android:textColor="@color/textColor"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="58dp"
-            android:layout_marginTop="10dp"
-            android:text="*"
-            android:textColor="#FF5730"
-            android:textSize="9sp" />
-
-        <TextView
-            android:id="@+id/tv_bind_phone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="70dp"
-            android:layout_marginRight="25dp"
-            android:ellipsize="end"
-            android:gravity="right"
-            android:singleLine="true"
-            android:hint="@string/bind_phone_text"
-            android:textColor="#353535"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <ImageView
-            android:layout_width="16dp"
-            android:layout_height="18dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@mipmap/icon_arrow_right" />
-    </RelativeLayout>
-
-    <View
-        style="@style/line2"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:visibility="gone" />
-
-    <View
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="213.5dp"
-        android:layout_gravity="bottom"
-        android:background="@mipmap/bg_gift_completely"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/complete_information_top"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="24.5dp"
-            android:orientation="horizontal">
+            android:orientation="vertical" >
+            <include layout="@layout/view_title_not_color" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/complete_information"
-                android:textColor="#333333"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+            <RelativeLayout
+                android:id="@+id/btn_avatar"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:text="@string/complete_information_consumable"
-                android:textColor="#999999"
-                android:textSize="13sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_avatar"
+                    android:text="@string/edit_profile_avatar"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp"
+                    />
+
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar"
+                    android:layout_width="46dp"
+                    android:layout_height="46dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="25dp"
+                    android:scaleType="centerCrop"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+
+            </RelativeLayout>
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+            <RelativeLayout
+                android:id="@+id/btn_name"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_nickname"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+            <RelativeLayout
+                android:id="@+id/btn_sign"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_sign"
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_sign"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/sign"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+
+            <RelativeLayout
+                android:id="@+id/btn_birthday"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_birthday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_birthday"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="30dp"
+                    android:layout_marginTop="10dp"
+                    android:text="*"
+                    android:textColor="#FF5730"
+                    android:textSize="9sp" />
+
+                <TextView
+                    android:id="@+id/birthday"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+            <RelativeLayout
+                android:id="@+id/btn_sex"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_sex"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_sex"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="30dp"
+                    android:layout_marginTop="10dp"
+                    android:text="*"
+                    android:textColor="#FF5730"
+                    android:textSize="9sp" />
+
+                <TextView
+                    android:id="@+id/sex"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="25dp"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+
+            </RelativeLayout>
+
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+            <RelativeLayout
+                android:id="@+id/btn_city"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_city"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_city"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="28dp"
+                    android:layout_marginTop="10dp"
+                    android:text="*"
+                    android:textColor="#FF5730"
+                    android:textSize="9sp" />
+
+                <TextView
+                    android:id="@+id/city"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+
+            <RelativeLayout
+                android:id="@+id/rt_bind_phone"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_phone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/bind_phone"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="28dp"
+                    android:layout_marginTop="10dp"
+                    android:text="*"
+                    android:textColor="#FF5730"
+                    android:textSize="9sp" />
+
+                <TextView
+                    android:id="@+id/tv_bind_phone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:hint="@string/bind_phone_text"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+            <RelativeLayout
+                android:id="@+id/btn_occupation"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_occupation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_occupation"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="44dp"
+                    android:layout_marginTop="10dp"
+                    android:visibility="gone"
+                    android:text="*"
+                    android:textColor="#FF5730"
+                    android:textSize="9sp" />
+
+                <TextView
+                    android:id="@+id/occupation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+            <RelativeLayout
+                android:id="@+id/btn_height"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_height"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_height"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="44dp"
+                    android:layout_marginTop="10dp"
+                    android:text="*"
+                    android:visibility="gone"
+                    android:textColor="#FF5730"
+                    android:textSize="9sp" />
+
+                <TextView
+                    android:id="@+id/height"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+            <RelativeLayout
+                android:id="@+id/btn_hobby"
+                style="@style/edit_profile_group_not_color"
+                android:onClick="editProfileClick">
+
+                <TextView
+                    android:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_hobby"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="@string/edit_profile_hobby"
+                    android:textColor="@color/textColor"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="44dp"
+                    android:visibility="gone"
+                    android:layout_marginTop="10dp"
+                    android:text="*"
+                    android:textColor="#FF5730"
+                    android:textSize="9sp" />
+
+                <TextView
+                    android:id="@+id/hobby"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="70dp"
+                    android:layout_marginRight="25dp"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:singleLine="true"
+                    android:textColor="#353535"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="18dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_arrow_right" />
+            </RelativeLayout>
+
+            <View
+                style="@style/line2"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:visibility="gone" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="213.5dp"
+                android:layout_gravity="bottom"
+                android:background="@mipmap/bg_gift_completely"
+                android:orientation="vertical"
+                android:visibility="visible">
+
+                <LinearLayout
+                    android:id="@+id/complete_information_top"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14.5dp"
+                    android:layout_marginTop="24.5dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/complete_information"
+                        android:textColor="#333333"
+                        android:textSize="15sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="7dp"
+                        android:text="@string/complete_information_consumable"
+                        android:textColor="#999999"
+                        android:textSize="13sp" />
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/complete_information_top2"
+                    android:layout_width="230dp"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/complete_information_top"
+                    android:layout_marginStart="14.5dp"
+                    android:layout_marginTop="10.9dp">
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="4dp"
+                        android:layout_gravity="center_vertical">
+
+                        <View
+                            android:id="@+id/view_progress1"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="7dp"
+                            android:layout_marginEnd="1dp"
+                            android:layout_weight="1"
+                            android:background="#FFE5D0" />
+
+                        <View
+                            android:id="@+id/view_progress2"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginEnd="10dp"
+                            android:layout_weight="1"
+                            android:background="#FFE5D0" />
+
+                        <View
+                            android:id="@+id/view_progress3"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginEnd="12dp"
+                            android:layout_weight="1"
+                            android:background="#FFE5D0" />
+
+
+                    </LinearLayout>
+
+                    <FrameLayout
+                        android:id="@+id/complete_information"
+                        android:layout_width="15.5dp"
+                        android:layout_height="15.5dp"
+                        android:background="@mipmap/bg_complete_information_progress2">
+
+                        <TextView
+                            android:id="@+id/information"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="1"
+                            android:textColor="@color/white"
+                            android:textSize="7.99sp" />
+                    </FrameLayout>
+
+                    <FrameLayout
+                        android:id="@+id/complete_information1"
+                        android:layout_width="15.5dp"
+                        android:layout_height="15.5dp"
+                        android:layout_marginStart="70dp"
+                        android:background="@mipmap/bg_complete_information_progress">
+
+                        <TextView
+                            android:id="@+id/information1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="2"
+                            android:textColor="@color/white"
+                            android:textSize="7.99sp" />
+
+                    </FrameLayout>
+
+                    <FrameLayout
+                        android:id="@+id/complete_information2"
+                        android:layout_width="15.5dp"
+                        android:layout_height="15.5dp"
+                        android:layout_marginStart="140dp"
+                        android:background="@mipmap/bg_complete_information_progress">
+
+                        <TextView
+                            android:id="@+id/information2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="3"
+                            android:textColor="@color/white"
+                            android:textSize="7.99sp" />
+                    </FrameLayout>
+
+                    <FrameLayout
+                        android:id="@+id/complete_information3"
+                        android:layout_width="15.5dp"
+                        android:layout_height="15.5dp"
+                        android:layout_marginStart="215dp"
+                        android:background="@mipmap/bg_complete_information_progress">
+
+                        <TextView
+                            android:id="@+id/information3"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="4"
+                            android:textColor="@color/white"
+                            android:textSize="7.99sp" />
+                    </FrameLayout>
+                </FrameLayout>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="81.5dp"
+                    android:layout_marginEnd="15dp"
+                    android:layout_marginBottom="20dp"
+                    app:cardBackgroundColor="#FDF3EB"
+                    app:cardCornerRadius="8dp"
+                    app:cardElevation="0dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+                            <!--头像 金豆 勋章-->
+                            <ImageView
+                                android:layout_width="49dp"
+                                android:layout_height="49dp"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="16dp"
+                                android:src="@mipmap/icon_profile_photo" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="7.5dp"
+                                android:gravity="center"
+                                android:text="@string/love_powder"
+                                android:textColor="#C7683C"
+                                android:textSize="10sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="49dp"
+                                android:layout_height="49dp"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="16dp"
+                                android:src="@mipmap/icon_golden_bean" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="7.5dp"
+                                android:gravity="center"
+                                android:text="@string/golden_beans_128"
+                                android:textColor="#C7683C"
+                                android:textSize="10sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <ImageView
+                                android:layout_width="49dp"
+                                android:layout_height="49dp"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="16dp"
+                                android:src="@mipmap/icon_medal" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="7.5dp"
+                                android:gravity="center"
+                                android:text="@string/love_powder_medal"
+                                android:textColor="#C7683C"
+                                android:textSize="10sp" />
+                        </LinearLayout>
+                    </LinearLayout>
+                </androidx.cardview.widget.CardView>
+
+                <TextView
+                    android:id="@+id/submit"
+                    android:layout_width="64dp"
+                    android:layout_height="25.5dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginEnd="8.5dp"
+                    android:background="@mipmap/bg_submit"
+                    android:gravity="center"
+                    android:text="@string/to_complete"
+                    android:textColor="@color/white"
+                    android:textSize="12.44sp" />
+
+            </RelativeLayout>
         </LinearLayout>
+    </ScrollView>
 
-        <FrameLayout
-            android:id="@+id/complete_information_top2"
-            android:layout_width="230dp"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/complete_information_top"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="10.9dp">
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_gravity="center_vertical">
-
-                <View
-                    android:id="@+id/view_progress1"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="7dp"
-                    android:layout_marginEnd="1dp"
-                    android:layout_weight="1"
-                    android:background="#FFE5D0" />
-
-                <View
-                    android:id="@+id/view_progress2"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="10dp"
-                    android:layout_weight="1"
-                    android:background="#FFE5D0" />
-
-                <View
-                    android:id="@+id/view_progress3"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="12dp"
-                    android:layout_weight="1"
-                    android:background="#FFE5D0" />
-
-
-            </LinearLayout>
-
-            <FrameLayout
-                android:id="@+id/complete_information"
-                android:layout_width="15.5dp"
-                android:layout_height="15.5dp"
-                android:background="@mipmap/bg_complete_information_progress2">
-
-                <TextView
-                    android:id="@+id/information"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="1"
-                    android:textColor="@color/white"
-                    android:textSize="7.99sp" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/complete_information1"
-                android:layout_width="15.5dp"
-                android:layout_height="15.5dp"
-                android:layout_marginStart="70dp"
-                android:background="@mipmap/bg_complete_information_progress">
-
-                <TextView
-                    android:id="@+id/information1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="2"
-                    android:textColor="@color/white"
-                    android:textSize="7.99sp" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/complete_information2"
-                android:layout_width="15.5dp"
-                android:layout_height="15.5dp"
-                android:layout_marginStart="140dp"
-                android:background="@mipmap/bg_complete_information_progress">
-
-                <TextView
-                    android:id="@+id/information2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="3"
-                    android:textColor="@color/white"
-                    android:textSize="7.99sp" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/complete_information3"
-                android:layout_width="15.5dp"
-                android:layout_height="15.5dp"
-                android:layout_marginStart="215dp"
-                android:background="@mipmap/bg_complete_information_progress">
-
-                <TextView
-                    android:id="@+id/information3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="4"
-                    android:textColor="@color/white"
-                    android:textSize="7.99sp" />
-            </FrameLayout>
-        </FrameLayout>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="81.5dp"
-            android:layout_marginEnd="15dp"
-            android:layout_marginBottom="20dp"
-            app:cardBackgroundColor="#FDF3EB"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="0dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-                    <!--头像 金豆 勋章-->
-                    <ImageView
-                        android:layout_width="49dp"
-                        android:layout_height="49dp"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="16dp"
-                        android:src="@mipmap/icon_profile_photo" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="7.5dp"
-                        android:gravity="center"
-                        android:text="@string/love_powder"
-                        android:textColor="#C7683C"
-                        android:textSize="10sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="49dp"
-                        android:layout_height="49dp"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="16dp"
-                        android:src="@mipmap/icon_golden_bean" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="7.5dp"
-                        android:gravity="center"
-                        android:text="@string/golden_beans_128"
-                        android:textColor="#C7683C"
-                        android:textSize="10sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="49dp"
-                        android:layout_height="49dp"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="16dp"
-                        android:src="@mipmap/icon_medal" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="7.5dp"
-                        android:gravity="center"
-                        android:text="@string/love_powder_medal"
-                        android:textColor="#C7683C"
-                        android:textSize="10sp" />
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-
-        <TextView
-            android:id="@+id/submit"
-            android:layout_width="64dp"
-            android:layout_height="25.5dp"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="8.5dp"
-            android:background="@mipmap/bg_submit"
-            android:gravity="center"
-            android:text="@string/to_complete"
-            android:textColor="@color/white"
-            android:textSize="12.44sp" />
-
-    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/main/src/main/res/layout/activity_edit_user_hobby.xml b/main/src/main/res/layout/activity_edit_user_hobby.xml
new file mode 100644
index 000000000..fa9b42be3
--- /dev/null
+++ b/main/src/main/res/layout/activity_edit_user_hobby.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/include5"
+        layout="@layout/view_title_not_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/titleView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:text="@string/edit_profile_hobby"
+        android:textColor="#333333"
+        android:textSize="30sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/include5" />
+
+    <TextView
+        android:id="@+id/number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:text="(0/5)"
+        android:textColor="#777777"
+        android:textSize="11sp"
+        app:layout_constraintStart_toStartOf="@+id/titleView"
+        app:layout_constraintTop_toBottomOf="@+id/titleView" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="20dp"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/number"
+        app:spanCount="4"
+        tools:listitem="@layout/item_edit_user_hobby" />
+
+    <Button
+        android:id="@+id/btn_save"
+        android:layout_width="186dp"
+        android:layout_height="54dp"
+        android:textColor="#FFFFFF"
+        android:layout_marginEnd="21dp"
+        android:layout_marginBottom="112dp"
+        android:background="@drawable/bg_msg_address_book_user_btn_fan"
+        android:text="@string/edit_profile_hobby_save"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <Button
+        android:id="@+id/btn_cancel"
+        android:layout_width="122dp"
+        android:layout_height="54dp"
+        android:layout_marginStart="21dp"
+        android:layout_marginBottom="112dp"
+        android:background="@drawable/dialog_bg_chat_status_config"
+        android:text="@string/edit_profile_hobby_cancel"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btn_save"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/main/src/main/res/layout/item_edit_user_hobby.xml b/main/src/main/res/layout/item_edit_user_hobby.xml
new file mode 100644
index 000000000..8e137422d
--- /dev/null
+++ b/main/src/main/res/layout/item_edit_user_hobby.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
+    android:layout_marginBottom="15dp"
+    android:layout_marginEnd="15dp"
+    android:layout_height="wrap_content">
+
+    <Button
+        android:id="@+id/btn"
+        android:layout_width="wrap_content"
+        android:background="@drawable/dialog_bg_chat_status_config"
+        android:layout_height="wrap_content"
+        android:text="Button" />
+</LinearLayout>
\ No newline at end of file
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_avatar.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a05c50d575556bf5390f2d55532e333d98af65
GIT binary patch
literal 1931
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
RrJw)+002ovPDHLkV1jxktup`s

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_birthday.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_birthday.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a481c75a6f3a42f556b897872f360c2166dd7a5
GIT binary patch
literal 2382
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
A&j0`b

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_city.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_city.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8fb33b52a37462924ceb4964abc5ec677ce3f29
GIT binary patch
literal 2948
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

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_height.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_height.png
new file mode 100644
index 0000000000000000000000000000000000000000..7084d7c537f3cc197a539ae6267c7f9cb6705546
GIT binary patch
literal 2482
zcmV;j2~GBiP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px;Y)M2xRA@u(TYZomMHPRqJG-}+co&MK_^^-!OhE7AeN4~o)#aolsSrd%6eTIN
zFcpkdib*UHEm5c#P|;GMw7^)Rm=e_Z6@moIKcZAb!gAT^*$WZPhhUNdjbFi!VD|2I
z`nhkJu_nvy?aY293jNPr&Aje@zkWThfA76sgqK;vml<Ao1@Qm7#p|&!_oZeo(25l+
zWOsLW<T*BO+-R!l6AN%UoxZ^Hyc>vU2_nw)2R}kYn~xnkcHf~xhw{}XjPhP7WdXo<
z0iZMHq7owJJkML7%jFJFHdiFT>2!Klp-{L*2=QSagy`f&7eatBhM!-Hh(FX?PecJW
znM_Yl&x}MO@h~D@T0T#dF%gmVFrMel8XX<|dwHL#fR$3O1Ar}3%0AEYrkv9UzDaAn
zHi~kS$tb0!1Hg7fTwDua9@7W?W3BaySb&vMvjHFj0Q15f85j>5SevaIG=H*twbt*e
z74*Qsz?+RRKa*0%8p88D-g<!%pVeBwCKh1Zwm(TkpAB^)A{voW-jvN|A5%&RB6<fR
zeh~n|gP$<QEYIa~KaZtxox<sKnnJtqIj!~i0C18ctGK26`ufh0Qa(}K&KHNa$sJnj
zkCyAz*Vi{!O1TXY`+{vqME4`&ntHzHxcKV=tdtrQLOc;{*Wx$zsFd=`k&%&qR`~W_
z3jnU~S$WGpH8wVO$=<ztpO33}t@3pNwk&J4lyY+bn22t0UH8kCl<}R-HUL-}$P@~N
z^Y-l7^IWX};`XZ-@Xb=n&-j2Rj4^9+x!nCz08RkFHvwQ3%do@oJa3NH`bb>GYn87H
zuu|$nLWr+~Jn)TL>pLqcGc+{RJ~lS?eMDUDd+#wsyg+OH$65if$F*&H2@x%-HU=V&
z6=gPtj<R@8tGBl|-PYDN67qTvc64;SYv<0Lld`G){{A^ah}{5imap8?Qp&;IyLbPs
znzEJNvolO262Fgn9+%0*1I+Bo^Sr$PaBfJUwOZ><lPPH1_D)266YmKBEdCw<tggpP
zE2S1mDIcjucq%MdJixr2lu~@Y-WVEi8~}D0W7Y;-)wb<45q%o~n2`mIxARKJaUQDG
zy4-JYaPYiBq42a2B3aGKyvSh!1OTxCgJoIs5OD_p%ncOhfthIqs~+&^@Oxv-R@Zf}
zt_N(;x3{<VA}J;F>M3a#BIc!(-wJ__511$Qx%7iVh>Ocs@FjS7F+9)PlFQ}Z-3YL8
z$EeFohbQar?|-!rVzUrpDQ~Uv?G^B9W6bTHot>Yq<k;c@h%4VPz`?|}Z4VRCO#txL
zfTR=A7$0AV`1Ncy`%GLV8!6v#z^vT7dGp#jJ3B`aF>q4*lF6i%$z)D6Qu$iOY6{@)
z?(Q>Fsnp{^Pyqn@#>dAOHj6V`mZbpTDnt}hEkfPIV+t}bUrNaY;|yOW?|I&m(b3Ue
zwOD1UJ}o64lPThR><19>^?~E^Nd`wmS7@zA8VS19#N#C0dwO~<NF)-EgwNzMaDOg_
zhszrY+9w{r6GF7Lgm?siy1Kev)!yFz5F#$BGVxI%#Bc+>H3ts^p678EbISZ%!-$7Z
zJ~jy<u8%@Ih-e=ozTI)0{f*q-QO0VBmsUzWz+SS_gyCdfNahG4E^RgFdI59ru(6l~
z+Ykm@Ou|0~0B0lOeE&J8b$$u}Hv>TU=-5}xcwYWLlK`-7`)x$Dm6I0?jDrLsdX$LX
z2>=Ybl-vV=gB=|mUB{0fUqwXs28-hd6%6_+tu_B`daK#OmSwFhT98W}(?VMAH^wY3
z6bdI2iNr|A!UvMc<WMG)dA^voy$t|vDMNNJl}f2yyLSDn7Q{-aHyC4vo9eVI%i4j6
zO9BNE@mV6ej4kCeEl$o~<i8I9AM+g?=e5>^z>Oo~YR7T5#09LBI$sD;su4BySW-%T
zRZ96mp2Qe4Mnq}Xb)V#k8E{)$+paP$J)Fs8N`QUPcL*Uq!v7m%j1c0IY&OeuG*;{H
z?;lDglaCh)g;@Q3;pp*jS65eZ`t<478DlJC%$G(-M-K)w_Vo0el}IEw6WQiJ<AT+E
zt@U368SbA-rIvBZmWVh${$(v1`^4iQBBrABuPdijX#%Cx2ZRt`3(jQUnXPvm=k6#<
z#gyTb;xYiZv|7KW1rJK8KNMr%bIVrqL^7G2b*e+en!R+T)wC?@V^Yd5lrt_rfp)j+
zy6dZ1qM7d-3V80^xvAN+XJ?40FQjz1Jjvg3Z!3vL`QkMcuw_}71HexZF>qFY0f7C8
z_(p$wb1C&U*L81=c}<~VMsFBkPV3B^Ig{&3rHZ=GqCUq=OiJm5w)l}`GT9$KqUuFs
zSym4bEo>_BC|A-y9)1G=9X<(oVcN85bMpCoK9NXl2Y^!ThYM(hLg7l+bsw%5DEA*2
z7&ylmvtJ0&*;L|DuB=jOgAn4@Q0ep@L|n&Z6fU|IYr<S)D{*c_{FCE2=QILv%ZNu<
zS)YV3+X^1%5%F5baX7F5zXrvz@2p_Ed!BcV>$*Rv7c^5#05}|kpw-4}2=P!#-CjJ@
zKM@-2fYv&Qlu9~SmUWj9VqHk)8Lc&6go%8qtOA(Ul}lLx-&y@SxW&WHs+g9&CY#Nk
zWIe78kB^UYS+w0(e1eFsb6uAsu9mgBy|iuH?<Jypg71@vCS2D|PKLm??R7$kyMiJc
z5&eRT<67%~w+eAxfPL$7NLNbl_!YzVyROR%@RH`=`q={j{N0u03x&eMTrS6<WJ_9I
zfCmN!E;Pm*2wC@VB9Z8+bc=@_v}IWv5b;wlI_uIEz$dlVy)8leq64k{o|a`<_em+=
z6RPNcLu-9K093qx=zG;10GxR$tXwnT1q&9OJ!8g<qoKh2I1#<Yb=_Z8vsSSdv|R|X
zEab6sT5HZLM{bs7Ek?v`QcAu}8@bhd^-wAG@nX>Z`OvMptn0ezC^Pe7wYRq)4bjbi
z5Ydq9y1$Lme|UJfBcIQ6ifOPKyQ(yve{OGg9H(@nDBLE^=7+*Sl2W4QdCRocoQjRq
zlu|zuLR{^GenAK^n9XLNiqhG?{<KvHaYZeF{ZQ2q(S?)UnXXvAP)e~kURmU^cV@F$
z&PGOV%+A`|+xb@B0FxHSasHdWjWP(AND=WnwOkM<qS1+oiB*-#w^i>;M^P|>Oie!*
wIORV9hyd)g7ipD+Pn(5!1@LKOiY6)YA1@eGh$}JXi2wiq07*qoM6N<$g2}nC7ytkO

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_hobby.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_hobby.png
new file mode 100644
index 0000000000000000000000000000000000000000..65a77341199cd01493a092ea823849e2191e07b9
GIT binary patch
literal 2904
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
C{C$N0

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_name.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_name.png
new file mode 100644
index 0000000000000000000000000000000000000000..76eb0a3d5454883447c84757197b2c06dfcb37ca
GIT binary patch
literal 1832
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
WXpl_Wnhs$A0000<MNUMnLSTZqy;Ac4

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_occupation.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_occupation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a797429a39608bf2b45127d6871f0d777c01f82
GIT binary patch
literal 2786
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

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_phone.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfaf41deb2a71a91fbc6f65a11c8d4f4ce91b745
GIT binary patch
literal 909
zcmV;819JR{P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px&M@d9MRA@u(n$2qyK^VrLcalZaNIj@X712WD$HgY&x_1>7v8Nsc{{-<Mc+<1q
zya@gaf(J#E9z^kIX|uCQFY%)wDzzx0)XxReozW?ql2)6Yw8=J_*<0D!cjouLGtWDr
z5242%>M>qe;QzhiE3Ghb&Ijh^<}zs~$Z;IXWHR5!$H!*?$X4fX3Aj)wY-NmH1aKC>
z24KyOga-WqU^EQF3)O1%rzyBGaG_8*#u$4*L`*4V8o#6ChzRjoP75JMO(rt}E*6W!
zM05+l`g%}3*;+nJlKw?XIZ`f{A0@3Ran+o22f(5&qhY0#J`uf3ds`EcR7wphrSf{W
zX~4MBpM?;c+W~xoh|V=+bef1peBYl)3f{^0p63llQS?|TwX+T_rMw&j!PRE-npC(7
zV80H+*nC0{mrA8lCt*xuyRPd3n2>Tote*=Z_N@k3x1VVM{c(_QLWoVK3rb@g=lm;x
zTs+r|5JFdcSyfG{FyoxR0k9(uXmn1}0Iko#IiCg47ytcM2(hbKf40C&s$(l`BK>wt
zcQ6C?3|rA!yuGYSTa~sKkK|t@9Teq1LR*!#Ds5G|>4~#<X?vGWQ<DEOmsM%2(pIId
zN;hV}wk6w^Y+Fh<1GW#_K5YB2?Za*B!})xEOD>nYO+*6#q69f(MD)>doTFo7W1mc=
zud76hb6z2$gDrYOUJD_1|Es|70c<l}d~Bt76$HT^({H-1!k$v<Nj96Ew+=LWG;FO_
zn~kFA#N_0pv7Mr;fRiBG@!kU4i$`l0kDfENfOGx~z+RoFZnG^74Gp=D<1E;glu}QF
zAUM!e9Fv5jSS(&*j9qCorbSV7q*AF&C4Jk;_Zl{n$=m_3U`zvW!}tC3s{+;^Yb7M2
zz6NOR1bab5Q%b4CmeXc%MMT>H99nvz3Bzz*lCw7HAL8?C<(wY}aJP%ir6FVNOsQ15
zpOjo9U>(GD-C-%^y#~u}QtXbukJloJ=%nxa4^1XC297JOowe70`x{Ti2Jy7FbDc?B
z3$;P~rj+tpxm^BW0;|Wg1l$mmd7jrFMbXAut(Ll5Je$o%LWq~mJeA8OV5PvO3GKRZ
j7P#w5(&h#AT!nuDtiX|5yFav~00000NkvXXu0mjfrNX4O

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_sex.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_sex.png
new file mode 100644
index 0000000000000000000000000000000000000000..204cda92a906df80b766e4499524a4fab3f78361
GIT binary patch
literal 2554
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
Q_W%F@07*qoM6N<$f`bV0UH||9

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_edit_sign.png b/main/src/main/res/mipmap-xxhdpi/ic_edit_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..acb7f9768a10512cdbdc08c14c1a65d5443c9515
GIT binary patch
literal 1895
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

literal 0
HcmV?d00001

diff --git a/main/src/main/res/values-zh/strings.xml b/main/src/main/res/values-zh/strings.xml
index 552011a0a..e6ec7cc5b 100644
--- a/main/src/main/res/values-zh/strings.xml
+++ b/main/src/main/res/values-zh/strings.xml
@@ -74,4 +74,9 @@
     <string name="activity_msg_chat_top_status_online">在线</string>
     <string name="activity_msg_chat_top_status_offline">离线</string>
     <string name="activity_msg_chat_list_card">[名片]</string>
+    <string name="edit_profile_occupation">職業</string>
+    <string name="edit_profile_height">身高</string>
+    <string name="edit_profile_hobby">愛好</string>
+    <string name="edit_profile_hobby_save">完成</string>
+    <string name="edit_profile_hobby_cancel">退出</string>
 </resources>
\ No newline at end of file
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index ec58876e5..245512a9f 100644
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -74,4 +74,9 @@
     <string name="activity_msg_chat_top_status_online">Online</string>
     <string name="activity_msg_chat_top_status_offline">Offline</string>
     <string name="activity_msg_chat_list_card">[Card]</string>
+    <string name="edit_profile_occupation">Profession</string>
+    <string name="edit_profile_height">Height</string>
+    <string name="edit_profile_hobby">Hobby</string>
+    <string name="edit_profile_hobby_save">Save</string>
+    <string name="edit_profile_hobby_cancel">Cancel</string>
 </resources>