From 3d8e152cd85722c801525ce1461b4814f182be94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 17 Dec 2025 19:00:37 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9mqtt=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=80=82=E7=94=A8=E5=9F=9F=E5=90=8D=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2：修改粉丝列表展示按钮错误的问题
---
 .../xscm/moduleutil/bean/BlackUserBean.java   |  2 +-
 .../utils/config/EnvironmentEnum.java         |  6 ++--
 .../xscm/modulemain/adapter/BlackAdapter.java | 33 ++++++++++---------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/BlackUserBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/BlackUserBean.java
index d77e2d19..3def5056 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/BlackUserBean.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/BlackUserBean.java
@@ -16,6 +16,6 @@ public class BlackUserBean {
     private int sex;
     private String user_code;
     private int is_online;
-    private int is_follow;
+    private int is_follow;// 是否关注  0:未关注 1：已关注 2：别人关注了你，你没有关注别人，这个2只会在粉丝中使用
     private List<String> icon;
 }
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
index 9254b838..e793f0b5 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -15,7 +15,8 @@ public enum EnvironmentEnum {
             1600096860,
             "3e8f3add448d4692bc1d04c75ffe801b",
             //"tcp://1.13.101.98",
-            "tcp://1.13.20.30",
+//            "tcp://1.13.20.30",
+            "tcp://yushengapi.qxyushen.top",
            // "https://vespa.qxyushen.top/h5",
             "https://yushengapi.qxyushen.top/h5",
             0),
@@ -30,7 +31,8 @@ public enum EnvironmentEnum {
             "wxc7681513be9f926b",
             1600096890,
             "02f7339ec98947deaeab173599891932",
-            "tcp://1.13.181.248",
+//            "tcp://1.13.181.248",
+            "tcp://test.vespa.qxyushen.top",
             "https://test.vespa.qxyushen.top/h5",
             1);
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/BlackAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/BlackAdapter.java
index 8c37df17..b046148b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/BlackAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/BlackAdapter.java
@@ -20,10 +20,11 @@ import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.MeHeadView;
 
 import java.util.List;
+
 /**
- *@author qx
- *@data 2025/5/19
- *@description: 黑名单、关注、粉丝列表适配器
+ * @author qx
+ * @data 2025/5/19
+ * @description: 黑名单、关注、粉丝列表适配器
  */
 public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder> {
 
@@ -45,9 +46,9 @@ public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder
     @Override
     protected void convert(BaseViewHolder helper, BlackUserBean item) {
         MeHeadView headView = helper.getView(R.id.im_user);
-        headView.setData(item.getAvatar(), "",  "");
+        headView.setData(item.getAvatar(), "", "");
         helper.setText(R.id.tv_nick_name, item.getNickname());
-        TextView imageView= helper.getView(R.id.im_g);
+        TextView imageView = helper.getView(R.id.im_g);
         helper.setText(R.id.tv_oline, item.getIs_online() == 1 ? "[在线]" : "[离线]");
         // 根据 type 设置图片资源
         // 根据 type 和 status 设置图片资源
@@ -55,33 +56,33 @@ public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder
         if (item.getType() == 0) { // 关注
             if (item.getIs_follow() == 0) {
 //                imageView.setImageResource(com.xscm.moduleutil.R.mipmap.gz);
-                ThemeableDrawableUtils.setThemeableRoundedBackground( imageView, ColorManager.getInstance().getPrimaryColorInt(), 34);
+                ThemeableDrawableUtils.setThemeableRoundedBackground(imageView, ColorManager.getInstance().getPrimaryColorInt(), 34);
                 imageView.setTextColor(ColorManager.getInstance().getButtonColorInt());
                 imageView.setText("关注");
             } else {
 //                imageView.setImageResource(com.xscm.moduleutil.R.mipmap.yigz);
-                ThemeableDrawableUtils.setThemeableRoundedBackground( imageView, Color.parseColor("#EFF2F8"), 34);
+                ThemeableDrawableUtils.setThemeableRoundedBackground(imageView, Color.parseColor("#EFF2F8"), 34);
                 imageView.setTextColor(Color.BLACK);
                 imageView.setText("已关注");
             }
         } else if (item.getType() == 1) { // 黑名单
 //            imageView.setImageResource(com.xscm.moduleutil.R.mipmap.yic);
-            ThemeableDrawableUtils.setThemeableRoundedBackground( imageView, Color.parseColor("#333333"), 34);
+            ThemeableDrawableUtils.setThemeableRoundedBackground(imageView, Color.parseColor("#333333"), 34);
             imageView.setTextColor(Color.WHITE);
             imageView.setText("移除");
         } else if (item.getType() == 2) { // 粉丝
-            if (item.getIs_follow() == 0) {
+            if (item.getIs_follow() != 1) { //只有等于1的时候，是已经关注了，等于0或者2的时候，都是需要回关别人，显示回关按钮
 //                imageView.setImageResource(com.xscm.moduleutil.R.mipmap.hg);
-                ThemeableDrawableUtils.setThemeableRoundedBackground( imageView, ColorManager.getInstance().getPrimaryColorInt(), 34);
+                ThemeableDrawableUtils.setThemeableRoundedBackground(imageView, ColorManager.getInstance().getPrimaryColorInt(), 34);
                 imageView.setTextColor(ColorManager.getInstance().getButtonColorInt());
                 imageView.setText("回关");
             } else {
 //                imageView.setImageResource(com.xscm.moduleutil.R.mipmap.yigz);
-                ThemeableDrawableUtils.setThemeableRoundedBackground( imageView, Color.parseColor("#EFF2F8"), 34);
+                ThemeableDrawableUtils.setThemeableRoundedBackground(imageView, Color.parseColor("#EFF2F8"), 34);
                 imageView.setTextColor(Color.BLACK);
                 imageView.setText("已关注");
             }
-        }else if (item.getType() == 3){
+        } else if (item.getType() == 3) {
             imageView.setVisibility(View.GONE);
         }
 
@@ -91,13 +92,13 @@ public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder
                 onItemClickListener.onItemClick(item);
             }
         });
-        LinearLayout llContainer =helper.getView(R.id.ll_in);
+        LinearLayout llContainer = helper.getView(R.id.ll_in);
         llContainer.removeAllViews(); // 清空旧的 ImageView
 
         List<String> images = item.getIcon(); // 获取图片列表
 
         for (String url : images) {
-            if (url.contains("http")) {
+            if (url != null && url.contains("http")) {
                 ImageView imageView1 = new ImageView(getContext());
                 LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                         getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_57),
@@ -117,8 +118,8 @@ public class BlackAdapter extends BaseQuickAdapter<BlackUserBean, BaseViewHolder
         headView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (item.getType() !=1){
-                    ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id()+"").navigation();
+                if (item.getType() != 1) {
+                    ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id() + "").navigation();
                 }
             }
         });