From 3f49cf37904957790074d59e7c2f8915b4d22f38 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 21 Jan 2026 10:11:23 +0800
Subject: [PATCH] =?UTF-8?q?cp=E6=8C=82=E4=BB=B6=E5=A4=B4=E5=83=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AEnull=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=AF=B7=E6=B1=82=E5=A4=B4=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xscm/moduleutil/http/RetrofitClient.java  |   4 -
 .../dialog/RoomUserInfoFragment.java          | 105 +++++++++---------
 2 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index e1364655..dc7644c0 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -121,10 +121,6 @@ public class RetrofitClient {
             sslContext = SSLContext.getInstance("SSL");
             sslContext.init(null, new TrustManager[]{trustAllCert}, new SecureRandom());
 
-            headers.entrySet().stream()
-                    .forEach(entry -> LogUtils.e("Header: %-20s Value: %s", entry.getKey(), entry.getValue()));
-
-
             final OkHttpClient client = new OkHttpClient.Builder()
                     .addInterceptor(new DataLoggingInterceptor(new DataLogger()))
                     .addInterceptor(new AccessTokenInterceptor(headers))
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
index 8a480d0b..cdddd247 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -221,7 +221,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                     .create()
                     .showAsDropDown(mBinding.roomDian, 0, 20);
         } else if (id == R.id.im_room_t) {
-            if (userInfo != null && TextUtils.isEmpty(userInfo.getNickname())){
+            if (userInfo != null && TextUtils.isEmpty(userInfo.getNickname())) {
                 ToastUtils.show("用户信息加载中，请稍后...");
                 return;
             }
@@ -462,7 +462,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             }
 
             return "";
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return "";
         }
@@ -491,9 +491,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         mBinding.ivAvatar.setData(userInfo.getAvatar(), "", userInfo.getNobility_image() + "");
         String sex = userInfo.getSex() == 1 ? "男" : "女";
         mBinding.tvId.setText(sex + " ID:" + userInfo.getUser_code());
-        if (userInfo.getIs_use_code() == 1){
+        if (userInfo.getIs_use_code() == 1) {
             mBinding.ivLh.setVisibility(VISIBLE);
-        }else {
+        } else {
             mBinding.ivLh.setVisibility(GONE);
         }
         mBinding.tvName.setText(userInfo.getNickname());
@@ -582,7 +582,6 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         }
 
 
-
         if (userInfo.getProfile().isEmpty()) {
             mBinding.jianj.setText("");
             mBinding.jianj.setVisibility(GONE);
@@ -626,52 +625,54 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                     ConstraintLayout.LayoutParams.WRAP_CONTENT);
             //挂件上的头像位置：0-上，1-右上，2-右，3-右下，4-下，5-左下，6-左，7-左上'
             try {
-                switch (Integer.parseInt(userInfo.getCp_info().direction)) {
-                    case 0:
-                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.bottomToTop = mBinding.topGuideline.getId();
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
-                        break;
-                    case 1:
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
-                        break;
-                    case 2:
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
-                        break;
-                    case 3:
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                        break;
-                    case 4:
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
-                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.topToBottom = mBinding.bottomGuideline.getId();
-                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                        break;
-                    case 5:
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                        break;
-                    case 6:
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
-                        break;
-                    case 7:
-                        mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                        params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
-                        break;
+                if (userInfo.getCp_info().direction != null) {
+                    switch (Integer.parseInt(userInfo.getCp_info().direction)) {
+                        case 0:
+                            params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.bottomToTop = mBinding.topGuideline.getId();
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                            break;
+                        case 1:
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                            params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                            break;
+                        case 2:
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                            params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                            break;
+                        case 3:
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                            params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                            break;
+                        case 4:
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                            params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.topToBottom = mBinding.bottomGuideline.getId();
+                            params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                            break;
+                        case 5:
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                            params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                            break;
+                        case 6:
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                            params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                            break;
+                        case 7:
+                            mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                            params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                            params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                            break;
+                    }
                 }
             } catch (NullPointerException e) {
                 LogUtils.e("挂件位置异常" + e.toString());
@@ -681,7 +682,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 
         if (!userInfo.getIcon().isEmpty()) {
             mBinding.flexEntry.setVisibility(VISIBLE);
-            if (mBinding.rlCpAnim.getVisibility() == VISIBLE){
+            if (mBinding.rlCpAnim.getVisibility() == VISIBLE) {
                 ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mBinding.flexEntry.getLayoutParams();
                 params.endToStart = mBinding.rlCpAnim.getId();
                 mBinding.flexEntry.setLayoutParams(params);