add 编辑资料-职业、身高、爱好

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;
+    }
+}

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
+    );
 }

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);

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>

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>

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>

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());
+                    System.err.println("头像---->收到头像文件 file = " + file.getAbsolutePath() + " | length = " + file.length());
-                    if (file.getName().contains(".gif")){
+                    if (file.getName().contains(".gif")) {
-                        ToastUtil.show(WordUtil.isNewZh()?"暫不支持該文件":"This file is not supported");
+                        ToastUtil.show(WordUtil.isNewZh() ? "暫不支持該文件" : "This file is not supported");
-                    }else {
+                    } 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) {

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) {
+
+                    }
+                });
+    }
+}

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());
+        }
+    }
+}

main/src/main/res/layout/activity_edit_profile.xml

@@ -3,23 +3,34 @@
     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" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+            <include layout="@layout/view_title_not_color" />
 
             <RelativeLayout
                 android:id="@+id/btn_avatar"
-        style="@style/edit_profile_group"
+                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:drawablePadding="10dp"
+                    app:drawableLeftCompat="@mipmap/ic_edit_avatar"
                     android:text="@string/edit_profile_avatar"
                     android:textColor="@color/textColor"
-            android:textSize="14sp" />
+                    android:textSize="14sp"
+                    />
 
 
                 <com.makeramen.roundedimageview.RoundedImageView
@@ -49,10 +60,12 @@
 
             <RelativeLayout
                 android:id="@+id/btn_name"
-        style="@style/edit_profile_group"
+                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"
@@ -91,7 +104,7 @@
 
             <RelativeLayout
                 android:id="@+id/btn_sign"
-        style="@style/edit_profile_group"
+                style="@style/edit_profile_group_not_color"
                 android:onClick="editProfileClick">
 
                 <TextView
@@ -99,6 +112,8 @@
                     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" />
 
@@ -133,10 +148,12 @@
 
             <RelativeLayout
                 android:id="@+id/btn_birthday"
-        style="@style/edit_profile_group"
+                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"
@@ -184,12 +201,14 @@
 
             <RelativeLayout
                 android:id="@+id/btn_sex"
-        style="@style/edit_profile_group"
+                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"
@@ -233,10 +252,12 @@
 
             <RelativeLayout
                 android:id="@+id/btn_city"
-        style="@style/edit_profile_group"
+                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"
@@ -247,7 +268,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-            android:layout_marginStart="44dp"
+                    android:layout_marginStart="28dp"
                     android:layout_marginTop="10dp"
                     android:text="*"
                     android:textColor="#FF5730"
@@ -284,10 +305,12 @@
 
             <RelativeLayout
                 android:id="@+id/rt_bind_phone"
-        style="@style/edit_profile_group"
+                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"
@@ -298,7 +321,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-            android:layout_marginStart="58dp"
+                    android:layout_marginStart="28dp"
                     android:layout_marginTop="10dp"
                     android:text="*"
                     android:textColor="#FF5730"
@@ -313,8 +336,165 @@
                     android:layout_marginRight="25dp"
                     android:ellipsize="end"
                     android:gravity="right"
-            android:singleLine="true"
                     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" />
@@ -343,7 +523,8 @@
                 android:layout_height="213.5dp"
                 android:layout_gravity="bottom"
                 android:background="@mipmap/bg_gift_completely"
-        android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="visible">
 
                 <LinearLayout
                     android:id="@+id/complete_information_top"
@@ -584,4 +765,7 @@
                     android:textSize="12.44sp" />
 
             </RelativeLayout>
+        </LinearLayout>
+    </ScrollView>
+
 </LinearLayout>

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>

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>

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>

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>