[Modify]标签功能

core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java

@@ -242,4 +242,9 @@ public interface IUserModel extends IModel {
      */
     Single<String> saveLabel(String label);
 
+    /**
+     * 获取地区列表
+     */
+    Single<List<String>> getAreaInfo();
+
 }

core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java

@@ -830,6 +830,13 @@ public final class UserModel extends BaseModel implements IUserModel {
     @Override
     public Single<String> saveLabel(String label) {
         return api.saveLabel(label)
+                .compose(RxHelper.handleStringData())
+                .compose(RxHelper.handleSchedulers());
+    }
+
+    @Override
+    public Single<List<String>> getAreaInfo() {
+        return api.getAreaInfo()
                 .compose(RxHelper.handleBeanData())
                 .compose(RxHelper.handleSchedulers());
     }
@@ -1096,5 +1103,11 @@ public final class UserModel extends BaseModel implements IUserModel {
         @POST("/label/save")
         Single<ServiceResult<String>> saveLabel(@Query("labels") String labels);
 
+        /**
+         * 获取地区列表
+         */
+        @GET("/region/config")
+        Single<ServiceResult<List<String>>> getAreaInfo();
+
     }
 }

core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java

@@ -70,6 +70,15 @@ public class UserDetailInfo implements Serializable {
         private List<PrivatePhotoBean> privatePhoto;
         private String nameplatePic;
         private String nameplateWord;
+        private String region;
+
+        public String getRegion() {
+            return region;
+        }
+
+        public void setRegion(String region) {
+            this.region = region;
+        }
 
         public long getRoomUid() {
             return roomUid;

core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java

@@ -106,6 +106,8 @@ public class UserInfo implements Serializable {
     //1普通账号，2官方账号，3机器账号 ,4公会账号
     private int defUser;
     //地区
+    @Getter
+    @Setter
     private String region;
     //个人简介
     private String userDesc;
@@ -302,6 +304,12 @@ public class UserInfo implements Serializable {
     @Setter
     private boolean hasPermitRoom;
 
+    /**
+     * 标签
+     */
+    @Getter
+    private List<String> labels;
+
     public UserInfo() {
 
     }
@@ -519,14 +527,6 @@ public class UserInfo implements Serializable {
         this.defUser = defUser;
     }
 
-    public String getRegion() {
-        return region;
-    }
-
-    public void setRegion(String region) {
-        this.region = region;
-    }
-
     public String getUserDesc() {
         return userDesc;
     }

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java

@@ -16,5 +16,4 @@ public class ClanInfo {
     private boolean userIsElder;
     private long hallId;
     private String levelIcon;
-
 }

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallInfo.java

@@ -41,4 +41,5 @@ public class HallInfo {
      * 厅主昵称
      */
     private String ownerNick;
+
 }