From 3735616af5c84ad690d424f7c66667f110dc531c Mon Sep 17 00:00:00 2001
From: hch <16607480311@163.com>
Date: Tue, 24 Oct 2023 18:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/login/ChooseLabelActivity.java   | 36 +++++++++++++++++++
 .../activity/setting/SettingActivity.java     |  2 +-
 .../com/shayu/onetoone/bean/LabelBean.java    |  8 ++++-
 .../main/res/layout/activity_edit_profile.xml | 10 +++---
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
index a1440c60c..697319053 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
@@ -17,16 +17,21 @@ import com.shayu.onetoone.activity.AbsOTOActivity;
 import com.shayu.onetoone.adapter.LabelTagAdapter;
 import com.shayu.onetoone.adapter.LableChooseAdapter;
 import com.shayu.onetoone.bean.LabelBean;
+import com.shayu.onetoone.bean.UserBean;
 import com.shayu.onetoone.manager.OTONetManager;
 import com.shayu.onetoone.manager.RouteManager;
 import com.xuexiang.xui.widget.flowlayout.FlowTagLayout;
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.http.base.HttpCallback;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import io.rong.imkit.userinfo.RongUserInfoManager;
+
 
 /**
  * 设置标签
@@ -69,10 +74,41 @@ public class ChooseLabelActivity extends AbsOTOActivity {
             @Override
             public void onSuccess(List<LabelBean> data) {
                 lableChooseAdapter.setList(data);
+
             }
 
             @Override
             public void onError(String error) {
+
+            }
+        });
+        if (isUserHome) {
+            next.setVisibility(View.GONE);
+            getUserLabel();
+
+        }
+    }
+
+    private void getUserLabel() {
+
+        OTONetManager.getInstance(mContext).getBaseInfos(true, new com.yunbao.common.http.base.HttpCallback<com.shayu.onetoone.bean.UserBean>() {
+            @Override
+            public void onSuccess(com.shayu.onetoone.bean.UserBean data) {
+                String[] strs = data.getInfo().getCn_label().split(",");
+                List<String> tempStrlist = Arrays.asList(strs);
+
+                String[] ids = data.getInfo().getLabel_id().split(",");
+                List<String> tempIdlist = Arrays.asList(ids);
+
+                for (int i = 0; i < tempStrlist.size(); i++) {
+                    myLabelList.add(new LabelBean.Children(Integer.parseInt(tempIdlist.get(i)), tempStrlist.get(i)));
+                }
+                myAdapter.setData(myLabelList);
+            }
+
+            @Override
+            public void onError(String error) {
+
             }
         });
     }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java
index 91c2c7e53..dfc27c0e1 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java
@@ -115,7 +115,7 @@ public class SettingActivity extends AbsActivity {
     @SuppressLint("SetTextI18n")
     private void intiData() {
         versionCode.setText(VersionUtil.getVersion());
-        cacheSize.setText(GlideCatchUtil.getInstance().getCacheSize() + "MB");
+        cacheSize.setText(GlideCatchUtil.getInstance().getCacheSize());
     }
 
 
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/LabelBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/LabelBean.java
index d1b2a9e4a..217375dea 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/bean/LabelBean.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/LabelBean.java
@@ -12,7 +12,7 @@ public class LabelBean extends BaseModel {
     private String en_title;
     private List<Children> children;
 
-    public class Children {
+    public static class Children {
         private int id;
         private int pid;
         private String cn_title;
@@ -30,6 +30,12 @@ public class LabelBean extends BaseModel {
         }
 
         public Children() {
+
+        }
+
+        public Children(int id, String cn_title) {
+            this.id = id;
+            this.cn_title = cn_title;
         }
 
         public int getId() {
diff --git a/OneToOne/src/main/res/layout/activity_edit_profile.xml b/OneToOne/src/main/res/layout/activity_edit_profile.xml
index ffe6e5a0f..e39e43706 100644
--- a/OneToOne/src/main/res/layout/activity_edit_profile.xml
+++ b/OneToOne/src/main/res/layout/activity_edit_profile.xml
@@ -23,8 +23,8 @@
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/avatar"
-            android:layout_width="46dp"
-            android:layout_height="46dp"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="25dp"
@@ -350,11 +350,11 @@
 
         <LinearLayout
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="70dp"
-            android:orientation="horizontal"
             android:layout_marginRight="25dp"
-            android:layout_height="wrap_content">
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/auth_status"
@@ -375,13 +375,13 @@
 
         </LinearLayout>
 
-
         <ImageView
             android:layout_width="16dp"
             android:layout_height="18dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@mipmap/icon_arrow_right" />
+
     </RelativeLayout>
 
     <RelativeLayout