From a48f7684342a68ad6be61273054faf7b83dda214 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Wed, 13 Nov 2024 17:20:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/user/activity/UserInfoActivity.java    | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
index 2f6d9d0fc..5033ffb8f 100644
--- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
+++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
@@ -419,50 +419,51 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         }else {
             mBinding.cpViews.setVisibility(View.INVISIBLE);
 
-            if (userInfo != null) {
-                //正常头像
+            //正常头像
+            if (userInfo != null && userInfo.getUserHeadwear() != null && userInfo.getUserHeadwear().getFirstUrl() != null) {
                 HeadWearInfo headWearInfo = userInfo.getUserHeadwear();
-                if (headWearInfo != null && headWearInfo.getFirstUrl() != null) {
-                    AvatarHelper.loadAvatarFrame(mBinding.ivHeadWear, headWearInfo.getFirstUrl(), headWearInfo.getType());
-                    mBinding.ivUserHead.setPadding(0, 0, 0, 0);
-                    mBinding.ivHeadWear.setVisibility(View.VISIBLE);
-                } else {
-                    int padding = getResources().getDimensionPixelOffset(R.dimen.dp_0_5);
-                    mBinding.ivUserHead.setPadding(padding, padding, padding, padding);
-                    mBinding.cpViews.setVisibility(View.INVISIBLE);
-                    mBinding.ivHeadWear.setVisibility(View.INVISIBLE);
-                }
+                AvatarHelper.loadAvatarFrame(mBinding.ivHeadWear, headWearInfo.getFirstUrl(), headWearInfo.getType());
+                mBinding.ivUserHead.setPadding(0, 0, 0, 0);
+                mBinding.ivHeadWear.setVisibility(View.VISIBLE);
+            }else {
+                int padding = getResources().getDimensionPixelOffset(R.dimen.dp_0_5);
+                mBinding.ivUserHead.setPadding(padding, padding, padding, padding);
+                mBinding.cpViews.setVisibility(View.INVISIBLE);
+                mBinding.ivHeadWear.setVisibility(View.INVISIBLE);
             }
         }
 
-        if (userInfo != null) {
-            //cp 卡片
-            if (cpInfo!= null && cpInfo.cpAvatar != null && !cpInfo.cpAvatar.isEmpty()) {
-                mBinding.cpCardDay.setText(cpInfo.cpDay + ""+ ResUtil.getString(R.string.days));
-                mBinding.cpCardDay.setVisibility(cpInfo.cpDay > 0? View.VISIBLE : View.INVISIBLE);
 
-                mBinding.cpCardLevel.setImageResource(CpUtils.INSTANCE.getLevelImg(cpInfo.cpLevel));
-                mBinding.cpCardLevel.setVisibility(View.VISIBLE);
-                mBinding.cpCardLevelEmpty.setVisibility(View.INVISIBLE);
+        //cp 卡片
+        if (cpInfo != null && cpInfo.cpAvatar != null && !cpInfo.cpAvatar.isEmpty()) {
+            mBinding.cpCardDay.setText(cpInfo.cpDay + "" + ResUtil.getString(R.string.days));
+            mBinding.cpCardDay.setVisibility(cpInfo.cpDay > 0 ? View.VISIBLE : View.INVISIBLE);
 
-                ImageLoadUtils.loadAvatar(userInfo.getAvatar(),mBinding.cpCardUserAvatar);
-                ImageLoadUtils.loadAvatar(cpInfo.cpAvatar,mBinding.cpCardUserAvatarCp);
-                mBinding.cpCardUserHeadCp.setVisibility(View.VISIBLE);
-                mBinding.cpCardUserAvatarCp.setOnClickListener(v -> {
-                    UserInfoActivity.Companion.start(context,cpInfo.cpUid);
-                });
-            }else {
-                mBinding.cpCardDay.setVisibility(View.INVISIBLE);
-                mBinding.cpCardLevelEmpty.setVisibility(View.VISIBLE);
-                mBinding.cpCardLevel.setVisibility(View.INVISIBLE);
-                mBinding.cpCardUserAvatarCp.setImageResource(R.drawable.ic_user_info_cp_def_avatar);
-                mBinding.cpCardUserAvatarCp.setOnClickListener(null);
-                mBinding.cpCardUserHeadCp.setVisibility(View.INVISIBLE);
+            mBinding.cpCardLevel.setImageResource(CpUtils.INSTANCE.getLevelImg(cpInfo.cpLevel));
+            mBinding.cpCardLevel.setVisibility(View.VISIBLE);
+            mBinding.cpCardLevelEmpty.setVisibility(View.INVISIBLE);
+            if (userInfo != null) {
+                ImageLoadUtils.loadAvatar(userInfo.getAvatar(), mBinding.cpCardUserAvatar);
+            }
+            ImageLoadUtils.loadAvatar(cpInfo.cpAvatar, mBinding.cpCardUserAvatarCp);
+            mBinding.cpCardUserHeadCp.setVisibility(View.VISIBLE);
+            mBinding.cpCardUserAvatarCp.setOnClickListener(v -> {
+                UserInfoActivity.Companion.start(context, cpInfo.cpUid);
+            });
+        } else {
+            mBinding.cpCardDay.setVisibility(View.INVISIBLE);
+            mBinding.cpCardLevelEmpty.setVisibility(View.VISIBLE);
+            mBinding.cpCardLevel.setVisibility(View.INVISIBLE);
+            mBinding.cpCardUserAvatarCp.setImageResource(R.drawable.ic_user_info_cp_def_avatar);
+            mBinding.cpCardUserAvatarCp.setOnClickListener(null);
+            mBinding.cpCardUserHeadCp.setVisibility(View.INVISIBLE);
+            if (userInfo != null) {
                 ImageLoadUtils.loadAvatar(userInfo.getAvatar(), mBinding.cpCardUserAvatar);
             }
         }
 
 
+
         //cp 动画
         if (cpInfo != null && cpInfo.showCpAnim && isFirst) {
             String animUrl = CpUtils.INSTANCE.getUserInfoAnim(cpInfo.cpLevel);