From 7709020221370aeb6b56d59149211d29affd6568 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 27 Dec 2023 14:47:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E9=A1=B5=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/svga/user_in_live.svga    | Bin 0 -> 2968 bytes
 .../nnbc123/app/home/fragment/MeFragment.kt   |   6 +-
 .../nnbc123/app/ui/user/UserInfoActivity.java |  69 ++++--
 .../user_info_bg_room_info.webp               | Bin 0 -> 17968 bytes
 .../res/drawable/user_info_ic_room_arrow.xml  |  12 +
 .../main/res/layout/activity_user_info.xml    | 222 +++++++++++++-----
 app/src/main/res/layout/fragment_me.xml       |   4 +-
 .../core/user/bean/UserDetailInfo.java        |  19 ++
 8 files changed, 248 insertions(+), 84 deletions(-)
 create mode 100644 app/src/main/assets/svga/user_in_live.svga
 create mode 100644 app/src/main/res/drawable-xxhdpi/user_info_bg_room_info.webp
 create mode 100644 app/src/main/res/drawable/user_info_ic_room_arrow.xml

diff --git a/app/src/main/assets/svga/user_in_live.svga b/app/src/main/assets/svga/user_in_live.svga
new file mode 100644
index 0000000000000000000000000000000000000000..95ca195d1f731f885ae3e5d255e4ae9fd7e8ef89
GIT binary patch
literal 2968
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
O(sEK92>c7yhQkovgWwbZ

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt
index 9bcecda7d..477525867 100644
--- a/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt
+++ b/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt
@@ -274,7 +274,11 @@ class MeFragment : BaseFragment(), View.OnClickListener {
             if (it.isParentMode) {
                 mBinding.meItemSkill.isVisible = false
             }
-            it.userHeadwear?.effect?.let { effect ->
+            var avatarBorder = it.userHeadwear?.effect
+            if (avatarBorder.isNullOrEmpty()) {
+                avatarBorder = it.userHeadwear?.pic
+            }
+            avatarBorder?.let { effect ->
                 if (mBinding.ivHeadWear.tag != effect) {
                     NobleUtil.loadHeadWear(effect, mBinding.ivHeadWear)
                     mBinding.ivHeadWear.tag = effect
diff --git a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java
index 3634334a8..4e30ee809 100644
--- a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java
+++ b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java
@@ -66,6 +66,7 @@ import com.nnbc123.app.vip.VipHelper;
 import com.nnbc123.core.auth.AuthModel;
 import com.nnbc123.core.im.friend.IMFriendModel;
 import com.nnbc123.core.level.UserLevelVo;
+import com.nnbc123.core.noble.NobleUtil;
 import com.nnbc123.core.praise.PraiseModel;
 import com.nnbc123.core.praise.event.IsLikedEvent;
 import com.nnbc123.core.praise.event.PraiseEvent;
@@ -86,6 +87,7 @@ import com.nnbc123.library.annatation.ActLayoutRes;
 import com.nnbc123.library.utils.ListUtils;
 import com.nnbc123.library.utils.SingleToastUtil;
 import com.nnbc123.library.utils.SizeUtils;
+import com.nnbc123.library.utils.StringUtils;
 import com.nnbc123.xchat_android_constants.XChatConstants;
 
 import org.greenrobot.eventbus.EventBus;
@@ -207,19 +209,40 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         mBinding.ivEdit.setOnClickListener(this);
         mBinding.flAvatar.setOnClickListener(this);
         mBinding.tvErbanId.setOnClickListener(this);
+        mBinding.layoutRoom.setOnClickListener(this);
     }
 
-    /**
-     * 找到TA, 主态不展示
-     */
-    private void setWhereVisible() {
-        if (viewModel.getMRoomUid() != 0) {
-            mBinding.flLiving.setVisibility(View.VISIBLE);
-            ImageLoadKt.loadFromAssets(mBinding.svgaLiving, "svga/living_black.svga");
-            mBinding.ivAvatar.setBorderColor(Color.parseColor("#FFE710"));
+    private void loadRoomInfo(UserDetailInfo.DataBean info){
+        if (info != null && info.getRoomUid() > 0) {
+            mBinding.layoutRoom.setVisibility(View.VISIBLE);
+            ImageLoadKt.loadFromAssets(mBinding.svgaRoom, "svga/user_in_live.svga");
+            mBinding.tvRoomName.setText(info.getRoomTitle());
         } else {
-            mBinding.flLiving.setVisibility(View.GONE);
+            mBinding.svgaRoom.stopAnimation();
+            mBinding.layoutRoom.setVisibility(View.GONE);
+        }
+    }
+
+    private void loadUserAvatar(UserDetailInfo.DataBean info) {
+        if (info == null) {
+            return;
+        }
+        String avatar = info.getAvatar();
+        String avatarBorder = null;
+        if (info.getUserHeadwear() != null) {
+            avatarBorder = info.getUserHeadwear().getEffect();
+            if (StringUtils.isEmpty(avatarBorder)) {
+                avatarBorder = info.getUserHeadwear().getPic();
+            }
+        }
+        ImageLoadKt.loadAvatar(mBinding.ivAvatar, avatar);
+        if (StringUtils.isEmpty(avatarBorder)) {
             mBinding.ivAvatar.setBorderColor(Color.WHITE);
+            mBinding.ivAvatarBorder.setVisibility(View.GONE);
+        } else {
+            mBinding.ivAvatar.setBorderColor(Color.TRANSPARENT);
+            NobleUtil.loadHeadWear(avatarBorder, mBinding.ivAvatarBorder);
+            mBinding.ivAvatarBorder.setVisibility(View.VISIBLE);
         }
     }
 
@@ -308,7 +331,13 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 isShowPage = true;
             }
             initPhoto(dataBean.getPrivatePhoto());
-            setWhereVisible();
+            loadRoomInfo(dataBean);
+            loadUserAvatar(dataBean);
+            if (dataBean.isInOnline()) {
+                mBinding.layoutOnline.setVisibility(View.VISIBLE);
+            } else {
+                mBinding.layoutOnline.setVisibility(View.GONE);
+            }
         });
     }
 
@@ -386,7 +415,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
             }
 
             VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
-            ImageLoadKt.loadAvatar(mBinding.ivAvatar, userInfo.getAvatar());
         }
     }
 
@@ -536,6 +564,17 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.layout_room:
+                if (userInfo == null) {
+                    toast("用户信息为空。");
+                    return;
+                }
+                if (viewModel.getMRoomUid() != 0) {
+                    AVRoomActivity.startForFromType(this, viewModel.getMRoomUid(),
+                            AVRoomActivity.FROM_TYPE_USER, userInfo.getNick(), String.valueOf(userInfo.getUid()));
+                }
+                break;
+
             case R.id.iv_user_back:
                 finish();
                 break;
@@ -602,14 +641,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 }
                 break;
             case R.id.fl_avatar:
-                if (userInfo == null) {
-                    toast("用户信息为空。");
-                    return;
-                }
-                if (viewModel.getMRoomUid() != 0) {
-                    AVRoomActivity.startForFromType(this, viewModel.getMRoomUid(),
-                            AVRoomActivity.FROM_TYPE_USER, userInfo.getNick(), String.valueOf(userInfo.getUid()));
-                }
                 break;
             case R.id.tv_erban_id:
                 if (userInfo == null) {
diff --git a/app/src/main/res/drawable-xxhdpi/user_info_bg_room_info.webp b/app/src/main/res/drawable-xxhdpi/user_info_bg_room_info.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f8ae559fe85221571f9b183f7fcf94dff0049e2b
GIT binary patch
literal 17968
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/user_info_ic_room_arrow.xml b/app/src/main/res/drawable/user_info_ic_room_arrow.xml
new file mode 100644
index 000000000..79f38c687
--- /dev/null
+++ b/app/src/main/res/drawable/user_info_ic_room_arrow.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+  <path
+      android:pathData="M4.65,0.65C4.45,0.85 4.45,1.175 4.65,1.375L8.266,5L4.65,8.625C4.45,8.825 4.45,9.15 4.65,9.35C4.849,9.55 5.173,9.55 5.373,9.35L9.35,5.362C9.55,5.162 9.55,4.838 9.35,4.638L5.373,0.65C5.173,0.45 4.849,0.45 4.65,0.65Z"
+      android:strokeWidth="0.1"
+      android:fillColor="#347ACA"
+      android:strokeColor="#347ACA"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index e49b09d0e..66ae8d8cc 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -103,9 +103,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="211dp"
                             android:background="@drawable/shape_white_top_14dp"
-                            android:orientation="vertical"
-                            android:paddingStart="15dp"
-                            android:paddingEnd="15dp">
+                            android:orientation="vertical">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
@@ -116,6 +114,7 @@
                                     android:id="@+id/iv_vip_icon"
                                     android:layout_width="wrap_content"
                                     android:layout_height="20dp"
+                                    android:layout_marginStart="15dp"
                                     android:adjustViewBounds="true"
                                     android:visibility="gone"
                                     app:layout_constraintBottom_toBottomOf="@id/tv_nick"
@@ -138,7 +137,7 @@
                                     android:textSize="18dp"
                                     app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
                                     app:layout_constraintTop_toTopOf="parent"
-                                    app:layout_goneMarginStart="0dp"
+                                    app:layout_goneMarginStart="@dimen/dp_15"
                                     tools:drawableRight="@drawable/ic_gender_male"
                                     tools:text="KiKing天地天地King天地天地ng天地天地" />
 
@@ -160,10 +159,32 @@
                                     app:layout_constraintTop_toTopOf="@id/tv_nick"
                                     tools:text="金牛座" />
 
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/tv_attention"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="@dimen/dp_26"
+                                    android:layout_gravity="end"
+                                    android:background="@drawable/bg_attention"
+                                    android:drawableStart="@drawable/icon_new_attention"
+                                    android:drawablePadding="2dp"
+                                    android:gravity="center_vertical"
+                                    android:paddingStart="@dimen/dp_12"
+                                    android:paddingEnd="@dimen/dp_14"
+                                    android:text="@string/attention"
+                                    android:textColor="@color/color_2B2D33"
+                                    android:textSize="@dimen/sp_12"
+                                    android:visibility="gone"
+                                    app:layout_constraintBottom_toBottomOf="@id/tv_nick"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintStart_toEndOf="@id/tv_constellation"
+                                    app:layout_constraintTop_toTopOf="@id/tv_nick"
+                                    tools:visibility="visible" />
+
                                 <LinearLayout
                                     android:id="@+id/ll_id"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
+                                    android:layout_marginHorizontal="15dp"
                                     android:layout_marginTop="5dp"
                                     android:gravity="center"
                                     app:layout_constraintStart_toStartOf="parent"
@@ -206,6 +227,7 @@
                                     android:id="@+id/ll_level"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
+                                    android:layout_marginHorizontal="15dp"
                                     android:layout_marginTop="@dimen/dp_8"
                                     android:orientation="horizontal"
                                     app:layout_constraintTop_toBottomOf="@id/ll_id">
@@ -276,64 +298,136 @@
 
                                 </LinearLayout>
 
-                            </androidx.constraintlayout.widget.ConstraintLayout>
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:id="@+id/layout_room"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_marginHorizontal="@dimen/dp_12"
+                                    android:layout_marginTop="@dimen/dp_12"
+                                    android:background="@drawable/user_info_bg_room_info"
+                                    android:visibility="gone"
+                                    app:layout_constraintDimensionRatio="351:63"
+                                    app:layout_constraintTop_toBottomOf="@id/ll_level"
+                                    tools:visibility="visible">
 
-                            <TextView
-                                android:id="@+id/tv_desc"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_10"
-                                android:background="@drawable/shape_f8f8fb_radius_4dp"
-                                android:ellipsize="end"
-                                android:maxLines="2"
-                                android:padding="10dp"
-                                android:textColor="@color/text_secondary_878b9c"
-                                android:textSize="@dimen/sp_12"
-                                tools:text="关注我喜欢关注我喜欢我就关注我喜欢我就关注我我就关注我我就关注我喜欢我就关注我我就关注我" />
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/line_content_bottom"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="horizontal"
+                                        app:layout_constraintGuide_percent="0.7619" />
+
+                                    <com.opensource.svgaplayer.SVGAImageView
+                                        android:id="@+id/svga_room"
+                                        android:layout_width="@dimen/dp_10"
+                                        android:layout_height="@dimen/dp_10"
+                                        android:layout_marginStart="@dimen/dp_16"
+                                        app:autoPlay="true"
+                                        app:clearsAfterDetached="true"
+                                        app:layout_constraintBottom_toTopOf="@id/tv_room_name"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        app:layout_constraintVertical_chainStyle="packed"
+                                        tools:src="@drawable/default_cover" />
+
+                                    <TextView
+                                        android:id="@+id/tv_room_living"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="@dimen/dp_4"
+                                        android:text="正在房间"
+                                        android:textColor="@color/white"
+                                        android:textSize="@dimen/dp_10"
+                                        app:layout_constraintBottom_toBottomOf="@id/svga_room"
+                                        app:layout_constraintStart_toEndOf="@id/svga_room"
+                                        app:layout_constraintTop_toTopOf="@id/svga_room" />
+
+                                    <TextView
+                                        android:id="@+id/tv_room_name"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="@dimen/dp_16"
+                                        android:layout_marginTop="@dimen/dp_2"
+                                        android:ellipsize="end"
+                                        android:maxLines="1"
+                                        android:textColor="@color/white"
+                                        android:textSize="@dimen/dp_12"
+                                        app:layout_constraintBottom_toBottomOf="@id/line_content_bottom"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toBottomOf="@id/svga_room"
+                                        tools:text="Name" />
+
+                                    <TextView
+                                        android:id="@+id/tv_room_go"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="@dimen/dp_24"
+                                        android:layout_marginEnd="@dimen/dp_16"
+                                        android:background="@drawable/shape_white_12dp_round"
+                                        android:drawableEnd="@drawable/user_info_ic_room_arrow"
+                                        android:gravity="center_vertical"
+                                        android:paddingStart="@dimen/dp_10"
+                                        android:paddingEnd="@dimen/dp_9"
+                                        android:text="热聊中"
+                                        android:textColor="#347ACA"
+                                        android:textSize="@dimen/dp_11"
+                                        app:layout_constraintBottom_toBottomOf="@id/line_content_bottom"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <TextView
+                                    android:id="@+id/tv_desc"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginHorizontal="15dp"
+                                    android:background="@drawable/shape_f8f8fb_radius_4dp"
+                                    android:ellipsize="end"
+                                    android:maxLines="2"
+                                    android:padding="10dp"
+                                    android:textColor="@color/text_secondary_878b9c"
+                                    android:textSize="@dimen/sp_12"
+                                    app:layout_constraintTop_toBottomOf="@id/layout_room"
+                                    app:layout_goneMarginTop="10dp"
+                                    tools:text="关注我喜欢关注我喜欢我就关注我喜欢我就关注我我就关注我我就关注我喜欢我就关注我我就关注我" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
 
                         </LinearLayout>
 
                         <FrameLayout
                             android:id="@+id/fl_avatar"
-                            android:layout_width="72dp"
-                            android:layout_height="72dp"
-                            android:layout_marginStart="22dp"
-                            android:layout_marginTop="175dp">
+                            android:layout_width="88dp"
+                            android:layout_height="88dp"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginTop="167dp">
 
                             <com.nnbc123.app.common.widget.CircleImageView
                                 android:id="@+id/iv_avatar"
-                                android:layout_width="72dp"
-                                android:layout_height="72dp"
+                                android:layout_width="65dp"
+                                android:layout_height="65dp"
+                                android:layout_gravity="center"
                                 android:src="@drawable/default_avatar"
                                 app:cborder_color="@color/white"
                                 app:cborder_width="1dp" />
 
-                            <FrameLayout
-                                android:id="@+id/fl_living"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
-                                android:layout_gravity="bottom|end"
-                                android:background="@drawable/shape_circle_fef411"
-                                android:visibility="gone">
-
-                                <com.opensource.svgaplayer.SVGAImageView
-                                    android:id="@+id/svga_living"
-                                    android:layout_width="12dp"
-                                    android:layout_height="12dp"
-                                    android:layout_gravity="center"
-                                    app:autoPlay="false" />
-
-                            </FrameLayout>
-
+                            <ImageView
+                                android:id="@+id/iv_avatar_border"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:visibility="gone"
+                                tools:visibility="visible" />
 
                         </FrameLayout>
 
                         <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="106dp"
+                            android:layout_marginStart="96dp"
                             android:layout_marginTop="221dp"
+                            android:layout_marginEnd="@dimen/dp_20"
                             android:baselineAligned="true"
+                            android:gravity="center_vertical"
                             android:orientation="horizontal">
 
                             <TextView
@@ -349,32 +443,36 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="5dp"
+                                android:layout_weight="1"
                                 android:maxLines="1"
                                 android:textColor="@color/text_normal_282828"
                                 android:textSize="@dimen/sp_13"
                                 tools:text="19" />
 
-                        </LinearLayout>
+                            <LinearLayout
+                                android:id="@+id/layout_online"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:visibility="gone"
+                                tools:visibility="visible">
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/tv_attention"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="end"
-                            android:layout_marginTop="221dp"
-                            android:layout_marginEnd="@dimen/dp_16"
-                            android:drawableStart="@drawable/icon_new_attention"
-                            android:drawablePadding="2dp"
-                            android:paddingStart="@dimen/dp_12"
-                            android:paddingTop="@dimen/dp_6"
-                            android:paddingEnd="@dimen/dp_14"
-                            android:paddingBottom="@dimen/dp_6"
-                            android:text="@string/attention"
-                            android:textColor="@color/color_2B2D33"
-                            android:textSize="@dimen/sp_12"
-                            android:visibility="gone"
-                            android:background="@drawable/bg_attention"
-                            tools:visibility="visible" />
+                                <ImageView
+                                    android:id="@+id/iv_online"
+                                    android:layout_width="@dimen/dp_6"
+                                    android:layout_height="@dimen/dp_6"
+                                    android:src="@drawable/base_circle_4dff91" />
+
+                                <TextView
+                                    android:id="@+id/tv_online"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/dp_4"
+                                    android:text="在线"
+                                    android:textColor="#696D7A"
+                                    android:textSize="@dimen/dp_11" />
+                            </LinearLayout>
+                        </LinearLayout>
 
                     </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 14da2f33b..0cb696f90 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -54,8 +54,8 @@
                 <com.nnbc123.app.common.widget.CircleImageView
                     android:id="@+id/iv_user_head"
                     avatarUrl="@{TextUtils.isEmptyText(userInfo.newAvatar)?userInfo.avatar:userInfo.newAvatar}"
-                    android:layout_width="68dp"
-                    android:layout_height="68dp"
+                    android:layout_width="65dp"
+                    android:layout_height="65dp"
                     android:layout_marginStart="25dp"
                     android:layout_marginTop="@dimen/dp_10"
                     android:onClick="@{click}"
diff --git a/core/src/main/java/com/nnbc123/core/user/bean/UserDetailInfo.java b/core/src/main/java/com/nnbc123/core/user/bean/UserDetailInfo.java
index 6ea3f1364..d695a0aec 100644
--- a/core/src/main/java/com/nnbc123/core/user/bean/UserDetailInfo.java
+++ b/core/src/main/java/com/nnbc123/core/user/bean/UserDetailInfo.java
@@ -2,6 +2,7 @@ package com.nnbc123.core.user.bean;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.nnbc123.core.community.bean.WorldDynamicBean;
+import com.nnbc123.core.decoration.headwear.bean.HeadWearInfo;
 
 import java.io.Serializable;
 import java.util.List;
@@ -71,6 +72,24 @@ public class UserDetailInfo implements Serializable {
         private List<UserGameGangUpInfo> userGamePartner;
         private String nameplatePic;
         private String nameplateWord;
+        private boolean inOnline;
+        private HeadWearInfo userHeadwear;
+
+        public HeadWearInfo getUserHeadwear() {
+            return userHeadwear;
+        }
+
+        public void setUserHeadwear(HeadWearInfo userHeadwear) {
+            this.userHeadwear = userHeadwear;
+        }
+
+        public boolean isInOnline() {
+            return inOnline;
+        }
+
+        public void setInOnline(boolean inOnline) {
+            this.inOnline = inOnline;
+        }
 
         public long getRoomUid() {
             return roomUid;