From 50ef12ee3b71af47db45bff2ab1013d0b912e7a6 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 3 Dec 2025 14:58:21 +0800
Subject: [PATCH] fix bugs.

---
 .../com/xscm/moduleutil/bean/UserInfo.java    |  12 +-
 .../room/fragment/RoomMentorShipFragment.kt   |   3 +
 .../activity/user/activity/HeartCpActivity.kt |   8 +-
 .../user/fragment/UserHomepageFragment.java   | 129 +++++++++---------
 .../dialog/RoomUserInfoFragment.java          |  96 ++++++-------
 .../widget/RoomMentorShipWheatView.kt         |   5 +-
 .../main/res/layout/fragment_mentor_ship.xml  |   1 +
 .../layout/layout_room_mentorship_wheat.xml   |   2 +-
 8 files changed, 137 insertions(+), 119 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
index d8705a7b..c3293361 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
@@ -120,17 +120,17 @@ public class UserInfo extends BaseEvent implements Serializable {
 
         private long createtime;
 
-        public String name = "";
-        public String level = "";
-        public String exp = "";
-        public String pendant = "";
-        public String direction;
+        public String name = "-1";
+        public String level = "-1";
+        public String exp = "-1";
+        public String pendant = "-1";
+        public String direction = "-1";
         public UserInfo1 user_info1;
         public UserInfo2 user_info2;
 
         @Override
         public int getItemType() {
-            if (!name.isEmpty()) {
+            if (name != null && !name.isEmpty()) {
                 return 1;
             }
             return 2;
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
index 28575e41..58e38122 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
@@ -48,6 +48,9 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
     BaseMvpFragment<MentorShipPresenter, FragmentMentorShipBinding>(), MentorShipContacts.View,
     View.OnClickListener {
 
+    // 无参构造函数
+    constructor() : this(null)
+
     companion object {
 
         fun newInstance(roomInfoResp: RoomInfoResp): RoomMentorShipFragment {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
index 8cae3eb9..044468e5 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt
@@ -102,13 +102,13 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
         mHeartData = heartCpBean
 
         if (userId == heartCpBean.user_id1) {
-            ImageUtils.loadHead(heartCpBean.user_info1.avatar, mBinding.ivHeadLeft)
-            ImageUtils.loadHead(heartCpBean.user_info2.avatar, mBinding.ivHeadRight)
+            ImageUtils.loadHeadCC(heartCpBean.user_info1.avatar, mBinding.ivHeadLeft)
+            ImageUtils.loadHeadCC(heartCpBean.user_info2.avatar, mBinding.ivHeadRight)
             leftUserId = heartCpBean.user_id1
             rightUserId = heartCpBean.user_id2
         } else {
-            ImageUtils.loadHead(heartCpBean.user_info2.avatar, mBinding.ivHeadLeft)
-            ImageUtils.loadHead(heartCpBean.user_info1.avatar, mBinding.ivHeadRight)
+            ImageUtils.loadHeadCC(heartCpBean.user_info2.avatar, mBinding.ivHeadLeft)
+            ImageUtils.loadHeadCC(heartCpBean.user_info1.avatar, mBinding.ivHeadRight)
             leftUserId = heartCpBean.user_id2
             rightUserId = heartCpBean.user_id1
         }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
index 06b6a2b9..5214392f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
@@ -22,6 +22,7 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.LogUtils;
 import com.google.android.flexbox.FlexboxLayout;
 import com.tencent.imsdk.v2.V2TIMConversation;
 import com.tencent.qcloud.tuicore.TUIConstants;
@@ -170,15 +171,15 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
             mBinding.headerInfo.imBeautiful.setVisibility(View.GONE);
         }
 
-        if(userInfo.getMaster()!=null){
+        if (userInfo.getMaster() != null) {
             mBinding.headerInfo.ivRightAvatar.setVisibility(VISIBLE);
             mBinding.headerInfo.ivRightAvatar.setMaster(userInfo.getMaster().getAvatar());
-        }else {
+        } else {
             mBinding.headerInfo.ivRightAvatar.setVisibility(GONE);
         }
 
 
-        if (!userInfo.getIcon().isEmpty()){
+        if (!userInfo.getIcon().isEmpty()) {
             mBinding.headerInfo.flexEntry.setVisibility(VISIBLE);
             for (String url : userInfo.getIcon()) {
                 if (url.contains("http")) {
@@ -187,16 +188,16 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                             LinearLayout.LayoutParams.WRAP_CONTENT,
                             Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_20)
                     );
-                    params.setMargins(0, 0,Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_10), 0); // 右边距
+                    params.setMargins(0, 0, Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_10), 0); // 右边距
                     imageView1.setLayoutParams(params);
                     imageView1.setScaleType(ImageView.ScaleType.FIT_START);
 
                     // 使用 Glide 加载图片
-                    ImageUtils.loadHeadCC(url, imageView1,params);
+                    ImageUtils.loadHeadCC(url, imageView1, params);
                     mBinding.headerInfo.flexEntry.addView(imageView1);
                 }
             }
-        }else {
+        } else {
             mBinding.headerInfo.flexEntry.setVisibility(GONE);
         }
 
@@ -217,7 +218,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                     );
 
                     params.setMargins(0, 15, 15, 0);
-                    textView.setLayoutParams( params);
+                    textView.setLayoutParams(params);
                     mBinding.headerInfo.flexText.addView(textView);
                 }
             }
@@ -239,6 +240,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
 
         mBinding.headerInfo.imGiftW.setOnClickListener(this::onClick);
     }
+
     private void showCp() {
         if (userInfo.getCp_info() != null) {
             mBinding.headerInfo.llCp.setVisibility(VISIBLE);
@@ -248,7 +250,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                 @Override
                 public void onClick(View v) {
                     Intent intent = new Intent(ActivityUtils.getTopActivity(), HeartCpActivity.class);
-                    intent.putExtra("userId",userInfo.getUser_id());
+                    intent.putExtra("userId", userInfo.getUser_id());
                     startActivity(intent);
                 }
             });
@@ -275,59 +277,64 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
             ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.WRAP_CONTENT,
                     ConstraintLayout.LayoutParams.WRAP_CONTENT);
             //挂件上的头像位置：0-上，1-右上，2-右，3-右下，4-下，5-左下，6-左，7-左上'
-            switch (Integer.parseInt(userInfo.getCp_info().direction)) {
-                case 0:
-                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.bottomToTop = mBinding.headerInfo.topGuideline.getId();
-                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
-                    break;
-                case 1:
-                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
-                    break;
-                case 2:
-                    mBinding.headerInfo.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.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                    break;
-                case 4:
-                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
-                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.topToBottom = mBinding.headerInfo.bottomGuideline.getId();
-                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                    break;
-                case 5:
-                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
-                    break;
-                case 6:
-                    mBinding.headerInfo.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.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
-                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
-                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
-                    break;
+            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.headerInfo.topGuideline.getId();
+                        mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                        break;
+                    case 1:
+                        mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                        params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                        break;
+                    case 2:
+                        mBinding.headerInfo.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.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                        break;
+                    case 4:
+                        mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                        params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                        params.topToBottom = mBinding.headerInfo.bottomGuideline.getId();
+                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                        break;
+                    case 5:
+                        mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                        params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                        break;
+                    case 6:
+                        mBinding.headerInfo.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.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                        params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                        params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                        break;
+                }
+            } catch (NullPointerException e) {
+                LogUtils.e("cp_info.direction is null" + e.toString());
             }
             mBinding.headerInfo.llCpAnimAvatar.setLayoutParams(params);
-        }else {
+        } else {
             mBinding.headerInfo.llCp.setVisibility(GONE);
             mBinding.headerInfo.rlCpAnim.setVisibility(GONE);
         }
     }
+
     private void refreshView() {
         if (SpUtil.getUserId() == userInfo.getUser_id()) {
             mBinding.headerInfo.tvGsSx.setVisibility(View.GONE);
@@ -372,12 +379,12 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
 
 //                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", userInfo.getRoom_id()).navigation();
             }
-        }else if (view.getId() == R.id.im_gift_w) {
-            Intent intent=new Intent(getContext(), GiftWallActivity.class);
-            intent.putExtra("userId",userInfo.getUser_id());
+        } else if (view.getId() == R.id.im_gift_w) {
+            Intent intent = new Intent(getContext(), GiftWallActivity.class);
+            intent.putExtra("userId", userInfo.getUser_id());
             startActivity(intent);
-        }else if (view.getId()==R.id.iv_right_avatar){
-            ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId",userInfo.getMaster().getUser_id()).navigation();
+        } else if (view.getId() == R.id.iv_right_avatar) {
+            ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getMaster().getUser_id()).navigation();
         }
     }
 
@@ -410,7 +417,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                 return CirleListFragment.newInstance(userId);
             } else if ("2".equals(model.getMyBagType())) {
 //                return UserGiftWallFragment.newInstance(userId);
-                return  BosomFriendFragment.newInstance(userId,1);
+                return BosomFriendFragment.newInstance(userId, 1);
             } else {
                 return MyAlbumFragment.newInstance(userId);
             }
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 767d612c..e46ad337 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -599,52 +599,56 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.WRAP_CONTENT,
                     ConstraintLayout.LayoutParams.WRAP_CONTENT);
             //挂件上的头像位置：0-上，1-右上，2-右，3-右下，4-下，5-左下，6-左，7-左上'
-            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;
+            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;
+                }
+            }catch (NullPointerException e){
+               LogUtils.e("挂件位置异常"+e.toString());
             }
             mBinding.llCpAnimAvatar.setLayoutParams(params);
         }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomMentorShipWheatView.kt b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomMentorShipWheatView.kt
index a4f01f5a..f1cfb094 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/widget/RoomMentorShipWheatView.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/widget/RoomMentorShipWheatView.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.res.TypedArray
 import android.text.TextUtils
 import android.util.AttributeSet
+import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.xscm.modulemain.R
@@ -67,6 +68,7 @@ class RoomMentorShipWheatView : BaseWheatView {
         mCharmView.setBg(0)
         when (bean.pit_number) {
             "9" -> {
+                iv_tag_type?.visibility = View.VISIBLE
                 if (bean.user_id != "0") {
                     mCharmView.visibility = VISIBLE
                     mTvName.visibility = VISIBLE
@@ -86,10 +88,12 @@ class RoomMentorShipWheatView : BaseWheatView {
                 } else {
                     mCharmView.visibility = INVISIBLE
                 }
+                iv_tag_type?.visibility = View.GONE
             }
 
             else -> {
                 mCharmView.visibility = GONE
+                iv_tag_type?.visibility = View.GONE
             }
         }
 
@@ -100,7 +104,6 @@ class RoomMentorShipWheatView : BaseWheatView {
             handleOffState(bean)
         }
 
-        iv_tag_type!!.visibility = GONE
     }
 
     fun setSex(value: String?, format: Boolean) {
diff --git a/MainModule/src/main/res/layout/fragment_mentor_ship.xml b/MainModule/src/main/res/layout/fragment_mentor_ship.xml
index f5d7e2ae..327366a9 100644
--- a/MainModule/src/main/res/layout/fragment_mentor_ship.xml
+++ b/MainModule/src/main/res/layout/fragment_mentor_ship.xml
@@ -114,6 +114,7 @@
             android:id="@+id/iv_host_bg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:layout_marginStart="@dimen/dp_48"
             android:layout_marginTop="@dimen/dp_4"
             android:src="@mipmap/icon_host_top_tips_bg"
diff --git a/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml b/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml
index 309d7717..bc747652 100644
--- a/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml
+++ b/MainModule/src/main/res/layout/layout_room_mentorship_wheat.xml
@@ -152,7 +152,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_13"
                 android:scaleType="fitCenter"
-                android:src="@mipmap/mu_yc"
+                android:src="@mipmap/zc"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@id/riv"
                 app:layout_constraintEnd_toEndOf="@id/riv"