diff --git a/app/build.gradle b/app/build.gradle
index 261581b79..63524e17e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -214,7 +214,7 @@ dependencies {
     api "com.jzxiang.pickerview:TimePickerDialog:1.0.1"
     api "com.github.zyyoona7:EasyPopup:1.0.2"
     api "com.github.donkingliang:LabelsView:1.2.0"
-    api "com.github.yyued:SVGAPlayer-Android:2.4.2"
+    api "com.github.yyued:SVGAPlayer-Android:2.5.3"
     api "com.mcxiaoke.packer-ng:helper:2.0.0"
     implementation "com.orhanobut:logger:2.2.0"
     api "com.ms-square:expandableTextView:0.1.4"
diff --git a/app/src/common/res/mipmap-xhdpi/ic_private_chat.png b/app/src/common/res/mipmap-xhdpi/ic_private_chat.png
index c3da0b280..4d60d42af 100644
Binary files a/app/src/common/res/mipmap-xhdpi/ic_private_chat.png and b/app/src/common/res/mipmap-xhdpi/ic_private_chat.png differ
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java b/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java
index b9e19fb1b..8761ee9dc 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java
@@ -162,9 +162,9 @@ public class ButtonItemFactory {
         // 私聊
         buttonItems.add(createPrivateChatItem(context, account, isInRoom));
         //装扮
-        if (!SuperAdminUtil.isSuperAdmin()) {
+     /*   if (!SuperAdminUtil.isSuperAdmin()) {
             buttonItems.add(createSendDecorationItem(context, uid));
-        }
+        }*/
         //关注
         buttonItems.add(createAttentItem());
 
@@ -225,7 +225,7 @@ public class ButtonItemFactory {
         // 私聊
         buttonItems.add(createPrivateChatItem(context, account, isInRoom));
         //装扮和关注目前是都有的操作
-        buttonItems.add(createSendDecorationItem(context, uid));
+        //buttonItems.add(createSendDecorationItem(context, uid));
         buttonItems.add(createAttentItem());
         buttonItems.add(createFindMeItem());
         if (PublicChatHallDataManager.get().isRoomAdmin()) {
@@ -536,7 +536,7 @@ public class ButtonItemFactory {
      */
     public static ViewItem createSendGiftItem(final Context context, long otherUid, boolean isInRoom,
                                               final GiftDialog.OnGiftDialogBtnClickListener giftDialogBtnClickListener) {
-        return createSendGiftItem(context, otherUid, isInRoom, false, giftDialogBtnClickListener);
+        return createSendGiftItem(context, otherUid, isInRoom, true, giftDialogBtnClickListener);
     }
 
     /**
@@ -647,7 +647,7 @@ public class ButtonItemFactory {
         // 私聊
         buttonItems.add(createPrivateChatItem(context, account, isInRoom));
         //装扮和关注目前是都有的操作
-        buttonItems.add(createSendDecorationItem(context, uid));
+       // buttonItems.add(createSendDecorationItem(context, uid));
         buttonItems.add(createAttentItem());
         buttonItems.add(createFindMeItem());
         return buttonItems;
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
index 546fc032c..80b429027 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
@@ -1,11 +1,14 @@
 package com.yizhuan.erban.avroom.adapter;
 
 import androidx.lifecycle.Observer;
+
 import android.content.Context;
 import android.graphics.drawable.BitmapDrawable;
+
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,8 +27,10 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.common.widget.CircleImageView;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
 import com.yizhuan.erban.utils.RegexUtil;
+import com.yizhuan.xchat_android_core.UriProvider;
 import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
 import com.yizhuan.xchat_android_core.noble.NobleUtil;
@@ -169,6 +174,12 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
                     return;
                 }
                 tvCharmValue.setText(GiftValueFormat.longToString(longValue));
+                llCharmClick.setOnClickListener(v -> {
+                    if (info.mChatRoomMember != null) {
+                        CommonWebViewActivity.start(context,
+                                UriProvider.getPersonalCharismaRank() + "?uid=" + info.mChatRoomMember.getAccount());
+                    }
+                });
                 llCharmClick.setOnLongClickListener(v -> {
                     if (longValue < 100 * 10000L) {
                         //小于100万，不需要长按弹框
@@ -378,6 +389,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
     class BasicMicroViewHolder extends NormalMicroViewHolder {
 
         TextView tvPkMark;
+
         BasicMicroViewHolder(View itemView) {
             super(itemView);
             tvPkMark = (TextView) itemView.findViewById(R.id.tv_pk_mark);
@@ -430,7 +442,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
         void bind(RoomQueueInfo info, int position) {
             super.bind(info, position);
             ChatRoomMember chatRoomMember = info.mChatRoomMember;
-            if (rotateAnimation==null){
+            if (rotateAnimation == null) {
                 rotateAnimation = new RotateAnimation(0, 359, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
                 rotateAnimation.setDuration(3000);
                 rotateAnimation.setFillAfter(true);
@@ -476,7 +488,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
         @Override
         public void clear() {
             super.clear();
-            if (rotateAnimation!=null) rotateAnimation.cancel();
+            if (rotateAnimation != null) rotateAnimation.cancel();
         }
     }
 
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java
index 73863a5b9..83b7bc764 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java
@@ -2,9 +2,11 @@ package com.yizhuan.erban.avroom.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
+
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -114,22 +116,13 @@ public class OnlineUserAdapter extends BaseMultiItemQuickAdapter<OnlineChatMembe
     private void setNormalData(BaseViewHolder baseViewHolder, OnlineChatMember onlineChatMember) {
         setSexData(baseViewHolder, onlineChatMember);
 
-        ImageView roomOwnnerTag = baseViewHolder.getView(R.id.room_owner_logo);
+        ImageView roomOnlineTag = baseViewHolder.getView(R.id.room_online_tag);
         ImageView managerLogo = baseViewHolder.getView(R.id.manager_logo);
-        if (onlineChatMember.isOnMic) {
-            baseViewHolder.setVisible(R.id.manager_logo, onlineChatMember.isAdmin || onlineChatMember.isRoomOwer);
-            managerLogo.setVisibility(onlineChatMember.isAdmin || onlineChatMember.isRoomOwer ? View.VISIBLE : View.GONE);
-            managerLogo.setImageResource(onlineChatMember.isAdmin ? R.drawable.icon_admin_logo
-                    : R.drawable.icon_user_list_room_ownner);
-            roomOwnnerTag.setImageResource(R.drawable.icon_user_list_up_mic);
-            roomOwnnerTag.setVisibility((!mIsHomeParty && onlineChatMember.isRoomOwer) ? View.GONE : View.VISIBLE);
-        } else {
-            baseViewHolder.getView(R.id.manager_logo).setVisibility(View.GONE);
-            roomOwnnerTag.setVisibility((onlineChatMember.isAdmin || onlineChatMember.isRoomOwer)
-                    ? View.VISIBLE : View.GONE);
-            roomOwnnerTag.setImageResource(onlineChatMember.isAdmin ? R.drawable.icon_admin_logo
-                    : R.drawable.icon_user_list_room_ownner);
-        }
+        roomOnlineTag.setVisibility(onlineChatMember.isOnMic ? View.VISIBLE : View.GONE);
+        managerLogo.setVisibility((onlineChatMember.isAdmin || onlineChatMember.isRoomOwer)
+                ? View.VISIBLE : View.GONE);
+        managerLogo.setImageResource(onlineChatMember.isAdmin ? R.drawable.icon_admin_logo
+                : R.drawable.icon_user_list_room_ownner);
 
         Object isEnterHide = NobleUtil.getResource(NobleResourceType.KEY_ENTER_HIDE, onlineChatMember.chatRoomMember);
 
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
index 636263437..32e447979 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
@@ -76,11 +76,11 @@ public class RoomOperationDialog extends BottomSheetDialog {
                 Utils.dip2px(getContext(), 10),
                 Utils.dip2px(getContext(), 20),
                 true));
-        rvOPtList.setLayoutManager(new FullyGridLayoutManager(getContext(), 5));
+        rvOPtList.setLayoutManager(new FullyGridLayoutManager(getContext(), 4));
         optAdapter = new OptAdapter(context, null);
-        addPKAction(optAdapter);
+        //addPKAction(optAdapter);
         addKTVAction(optAdapter);
-        addGameAction(optAdapter);
+        //addGameAction(optAdapter);
         addRoomLimit(optAdapter);
         addGiftEffectAction(optAdapter);
         addOpenOrClosePublicScreenAction(optAdapter);
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
index 1fa73df8a..6c3c8a269 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
@@ -663,39 +663,6 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
     @SuppressLint("CheckResult")
     private void showMoreItems() {
         List<ButtonItem> buttonItems = new ArrayList<>();
-        ButtonItem buttonItem0 = new ButtonItem("随机进入嗨聊房", () -> {
-            StatisticManager.Instance().onEvent(StatisticsProtocol.Event.room_hiparty, "房间内随机进入嗨聊房");
-            AvRoomModel.get()
-                    .getPartyRoomList(AuthModel.get().getCurrentUid())
-                    .subscribe((partyRoomResult, throuble) -> {
-                        if (throuble != null) {
-                            SingleToastUtil.showToastShort(throuble.getMessage());
-                        } else if (partyRoomResult.getData() != null && partyRoomResult.isSuccess()) {
-                            if (partyRoomResult.getData().size() > 0) {
-
-                                // 普通房切嗨聊房清屏逻辑；
-                                // cp房清屏逻辑在AVRoomActivity "切换房间后" 弹框监听, 防止用户取消切换房间，但公屏被清空的情况
-                                if (!AvRoomDataManager.get().isCpRoom()) {
-                                    clearScreen();
-                                    ChatRoomMessage firstMsg = IMNetEaseManager.get().getFirstMessageContent();
-                                    addMessage(firstMsg);
-                                }
-
-                                AvRoomDataManager.get().setRoomUidList(partyRoomResult.getData());
-                                AVRoomActivity.start(getActivity(), true);
-                            } else {
-                                SingleToastUtil.showToastShort("暂无嗨聊房");
-                            }
-                        } else if (partyRoomResult.getData() != null && !partyRoomResult.isSuccess()) {
-                            SingleToastUtil.showToastShort(partyRoomResult.getError());
-                        } else {
-                            SingleToastUtil.showToastShort("未知错误");
-                        }
-                    });
-//            HomeModel.get().getGuildRoomId()
-//                    .subscribe(s -> AVRoomActivity.start(getActivity(), JavaUtil.str2long(s)));
-
-        });
 
         ButtonItem buttonItem1 = new ButtonItem("退出房间", new ButtonItem.OnClickListener() {
             @Override
@@ -747,7 +714,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
                 UIHelper.showReportPage(mContext, roomInfo.getUid(), XChatConstants.REPORT_TYPE_ROOM);
             }
         });
-        buttonItems.add(buttonItem0);
+        //buttonItems.add(buttonItem0);
         buttonItems.add(buttonItem1);
         buttonItems.add(buttonItem2);
         buttonItems.add(buttonItem3);
@@ -770,7 +737,9 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
             ShareModel.get().shareRoom(
                     platform,
                     currentRoomInfo.getUid(),
-                    currentRoomInfo.getTitle()
+                    currentRoomInfo.getRoomId(),
+                    currentRoomInfo.getTitle(),
+                    currentRoomInfo.getAvatar()
             )
                     .compose(bindUntilEvent(FragmentEvent.DESTROY))
                     .doAfterTerminate(new Action() {
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyUserListPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyUserListPresenter.java
index 02602eaa3..e09dafd61 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyUserListPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyUserListPresenter.java
@@ -36,7 +36,7 @@ public class HomePartyUserListPresenter extends BaseMvpPresenter<IHomePartyUserL
      *             填0会使用当前服务器最新时间开始查询，即第一页，单位毫秒
      */
     public void requestChatMemberByPage(final int page, long time, List<OnlineChatMember> oldList) {
-        mHomePartyUserListMode.getOnLinePageMembers(page, time, oldList, true)
+        mHomePartyUserListMode.getOnLinePageMembers(page, time, oldList, false)
                 .subscribe(onlineChatMembers -> {
                     Logger.i("第%1d页成员人数:%2d", page, onlineChatMembers.size());
                     if (getMvpView() != null) {
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
index 4dac2b2a8..b82cbaa2e 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
@@ -246,7 +246,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
                     GiftReceiveInfo giftReceiveInfo = giftReceiveInfos.get(i);
                     SparseArray<Point> micViewPoint = AvRoomDataManager.get().mMicPointMap;
                     GiftInfo giftInfo = GiftModel.get().findGiftInfoById(giftReceiveInfo.getGiftId());
-                    if (giftInfo==null || TextUtils.isEmpty(giftInfo.getGiftUrl())){
+                    if (giftInfo == null || TextUtils.isEmpty(giftInfo.getGiftUrl())) {
                         giftInfo = giftReceiveInfo.getGift();
                     }
                     if (giftInfo == null) {
@@ -285,18 +285,18 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
                     giftReceiver.setNick(giftReceiveInfo.getTargetNick());
                     targetUsers.add(giftReceiver);
                 }
-
-                if (totalCoin >= 520) {
+                GiftReceiveInfo giftReceiveInfo = giftReceiveInfos.get(0);
+                GiftInfo giftInfo = giftReceiveInfo.getGift();
+                if (totalCoin >= 520 || (giftInfo != null && giftInfo.isHasEffect())) {
                     Message msg = Message.obtain();
                     msg.what = 0;
-                    GiftReceiveInfo giftReceiveInfo = giftReceiveInfos.get(0);
                     GiftEffectInfo giftEffectInfo = new GiftEffectInfo();
                     giftEffectInfo.setUid(giftReceiveInfo.getUid());
                     giftEffectInfo.setNick(giftReceiveInfo.getNick());
                     giftEffectInfo.setAvatar(giftReceiveInfo.getAvatar());
                     giftEffectInfo.setGiftId(giftReceiveInfo.getGiftId());
                     giftEffectInfo.setGiftNum(giftReceiveInfo.getGiftNum());
-                    giftEffectInfo.setGift(giftReceiveInfo.getGift());
+                    giftEffectInfo.setGift(giftInfo);
                     giftEffectInfo.setTargetUsers(targetUsers);
                     giftEffectInfo.setGiftReceiveType(giftReceiveType);
                     msg.obj = giftEffectInfo;
@@ -475,6 +475,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
 
     /**
      * 打怪兽时使用的动画效果
+     *
      * @param monsterAttackReceiveInfo
      * @param monsterView
      */
@@ -540,7 +541,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
     }
 
     private void drawMagicView(Point senderPoint, Point receivePoint, MagicReceivedInfo magicReceivedInfo) {
-        if (! AvRoomDataManager.get().mIsNeedGiftEffect) return;
+        if (!AvRoomDataManager.get().mIsNeedGiftEffect) return;
 
         if (senderPoint == null)
             senderPoint = new Point(mScreenWidth - giftWidth, mScreenHeight - UIUtil.dip2px(context, 50));
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
index f5531ea56..5b5ea1265 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
@@ -196,7 +196,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
     }
 
     public GiftDialog(Context context, long OtherUid, boolean isInRoom, boolean isMagic) {
-        this(context, OtherUid, isInRoom, isMagic, false);
+        this(context, OtherUid, isInRoom, isMagic, true);
     }
 
     /***
@@ -391,7 +391,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
         ivFirstRecharge = root.findViewById(R.id.iv_first_recharge);
         ivFirstRecharge.setOnClickListener(this);
         //首充逻辑
-        updateFirstRechargeStatus();
+        //updateFirstRechargeStatus();
 
         View descLayout = root.findViewById(R.id.desc_layout);
 
@@ -1352,7 +1352,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onFirstRechargeEvent(FirstRechargeEvent event) {
-        updateFirstRechargeStatus();
+        //updateFirstRechargeStatus();
     }
 
     private void onGiftOutOfDate(String message) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
index b2bbb3878..dda9b6eb0 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
@@ -3,10 +3,12 @@ package com.yizhuan.erban.ui.widget;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
+
 import androidx.appcompat.app.AppCompatDialog;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -121,6 +123,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
     private AppCompatImageView ivNewUser;
     private AppCompatImageView mIvGoodNumber;
     private AppCompatImageView mIvUserLevel;
+    private AppCompatImageView mIvUserNameplate;
     private AppCompatImageView mIvUserCharm;
     private LinearLayout llFamily;
     private TextView tvFamilyNameLabel;
@@ -193,6 +196,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         mIvGoodNumber = findViewById(R.id.iv_good_number);
         mIvUserLevel = findViewById(R.id.iv_user_level);
         mIvUserCharm = findViewById(R.id.iv_user_charm);
+        mIvUserNameplate = findViewById(R.id.iv_user_nameplate);
 
         llFamily = (LinearLayout) findViewById(R.id.ll_family);
         tvFamilyNameLabel = (TextView) findViewById(R.id.tv_family_name_label);
@@ -284,6 +288,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         int dialogWidth = context.getResources().getDimensionPixelOffset(
                 R.dimen.dp_room_user_dialog_width);
         int itemWidth = dialogWidth / 4;
+        if (buttons.size() < 4) itemWidth = dialogWidth / 3;
         flexbox.removeAllViews();
         //底部item，不添加到网格
         List<ViewItem> bottomList = new ArrayList<>();
@@ -439,7 +444,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
             // 这个方法能让图片不失真
             ImageLoadUtils.laodUsrInfoAvatar(context, userInfo.getAvatar(), avatar);
             nick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
-            erbanId.setText("ID" + userInfo.getErbanNo());
+            erbanId.setText("66号" + userInfo.getErbanNo());
             ivGender.setImageResource(
                     userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
 
@@ -468,6 +473,10 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
                     ImageLoadUtils.loadImage(context, userLevelVo.getCharmUrl(), mIvUserCharm);
                 }
             }
+            if (!TextUtils.isEmpty(userInfo.getNameplatePic())){
+                mIvUserNameplate.setVisibility(View.VISIBLE);
+                ImageLoadUtils.loadImage(context, userInfo.getNameplatePic(), mIvUserNameplate);
+            }
             // 改变贵族
             updateNobleView();
 
@@ -639,7 +648,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
                 break;
             case R.id.fl_avatar_layout:
             case R.id.user_info_page_btn:
-                StatisticManager.Instance().onEvent(StatisticsProtocol.Event.data_dard_homepage_click,"资料卡片-主页");
+                StatisticManager.Instance().onEvent(StatisticsProtocol.Event.data_dard_homepage_click, "资料卡片-主页");
                 UserInfoActivity.Companion.start(context, uid);
                 dismiss();
                 break;
@@ -962,12 +971,9 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
 
         if (AvRoomDataManager.get().mCurrentRoomInfo.isOpenKTV()) {
             new DialogManager(context).showOkCancelDialog("KTV模式下下麦会移除您已点的所有歌曲,确定进行此操作?", false,
-                    () ->
-                    {
+                    () -> {
                         handleDownMicro();
-                        KtvMusicManager.INSTANCE.deleteUserAllChooseMusic()
-                                .subscribe(s -> {
-                                });
+                        KtvMusicManager.INSTANCE.deleteUserAllChooseMusic().subscribe();
                     }
             );
         } else if (AvRoomDataManager.get().haveStartDragon) {
@@ -1200,6 +1206,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         return textView;
     }
 
+    @SuppressLint("CheckResult")
     private TextView createKickMicItem() {
         TextView textView = getTextView("抱Ta下麦");
         textView.setOnClickListener(v -> {
@@ -1233,15 +1240,12 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
                                 IMNetEaseManager.get().downMicroPhoneBySdk(micPosition, null);
                                 RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
                                 if (roomInfo != null) {
-                                    UserModel.get().getUserInfo(uid).subscribe(new Consumer<UserInfo>() {
-                                        @Override
-                                        public void accept(UserInfo userInfo) throws Exception {
-                                            String nick = userInfo != null ? RegexUtil.getPrintableString(userInfo.getNick()) : "";
-                                            IMNetEaseManager.get().kickMicroPhoneBySdk(uid, nick,
-                                                    roomInfo.getRoomId()).subscribe(chatRoomMessage ->
-                                                            KickModel.get().onSendRoomMessageSuccess(chatRoomMessage)
-                                                    , Throwable::printStackTrace);
-                                        }
+                                    UserModel.get().getUserInfo(uid).subscribe(userInfo -> {
+                                        String nick = userInfo != null ? RegexUtil.getPrintableString(userInfo.getNick()) : "";
+                                        IMNetEaseManager.get().kickMicroPhoneBySdk(uid, nick,
+                                                roomInfo.getRoomId()).subscribe(chatRoomMessage ->
+                                                        KickModel.get().onSendRoomMessageSuccess(chatRoomMessage)
+                                                , Throwable::printStackTrace);
                                     });
                                 }
                                 dismiss();
diff --git a/app/src/main/res/drawable-xhdpi/bg_room_msg_input.png b/app/src/main/res/drawable-xhdpi/bg_room_msg_input.png
new file mode 100644
index 000000000..3b65ff1aa
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_room_msg_input.png differ
diff --git a/app/src/main/res/drawable-xhdpi/bg_room_msg_input.webp b/app/src/main/res/drawable-xhdpi/bg_room_msg_input.webp
deleted file mode 100644
index 8c6823375..000000000
Binary files a/app/src/main/res/drawable-xhdpi/bg_room_msg_input.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_admin_logo.png b/app/src/main/res/drawable-xhdpi/icon_admin_logo.png
new file mode 100644
index 000000000..1bb5f76b0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_admin_logo.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_admin_logo.webp b/app/src/main/res/drawable-xhdpi/icon_admin_logo.webp
deleted file mode 100644
index 44168ef51..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_admin_logo.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_close_gift_value.webp b/app/src/main/res/drawable-xhdpi/icon_close_gift_value.webp
index 4d07d1ce3..20fea5073 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_close_gift_value.webp and b/app/src/main/res/drawable-xhdpi/icon_close_gift_value.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_close_my_effect.webp b/app/src/main/res/drawable-xhdpi/icon_close_my_effect.webp
index e923c868a..52d1678e0 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_close_my_effect.webp and b/app/src/main/res/drawable-xhdpi/icon_close_my_effect.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_close_public_screen.webp b/app/src/main/res/drawable-xhdpi/icon_close_public_screen.webp
index aa0ea5e79..4ea0c2a66 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_close_public_screen.webp and b/app/src/main/res/drawable-xhdpi/icon_close_public_screen.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_contribute_left.webp b/app/src/main/res/drawable-xhdpi/icon_contribute_left.webp
index 522926974..76fbad80d 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_contribute_left.webp and b/app/src/main/res/drawable-xhdpi/icon_contribute_left.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_dialog_attent.png b/app/src/main/res/drawable-xhdpi/icon_dialog_attent.png
new file mode 100644
index 000000000..d14e5f1ed
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_dialog_attent.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_dialog_attent.webp b/app/src/main/res/drawable-xhdpi/icon_dialog_attent.webp
deleted file mode 100644
index 630669a6b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_dialog_attent.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_face_btn.webp b/app/src/main/res/drawable-xhdpi/icon_face_btn.webp
index 48787cd22..87cdacb6a 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_face_btn.webp and b/app/src/main/res/drawable-xhdpi/icon_face_btn.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_open_gift_value.webp b/app/src/main/res/drawable-xhdpi/icon_open_gift_value.webp
index c12e59f12..eab0d7157 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_open_gift_value.webp and b/app/src/main/res/drawable-xhdpi/icon_open_gift_value.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_open_my_effect.webp b/app/src/main/res/drawable-xhdpi/icon_open_my_effect.webp
index ffbdf26ce..527bd4afe 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_open_my_effect.webp and b/app/src/main/res/drawable-xhdpi/icon_open_my_effect.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_open_public_screen.webp b/app/src/main/res/drawable-xhdpi/icon_open_public_screen.webp
index 3ed4dae86..fd6843bf4 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_open_public_screen.webp and b/app/src/main/res/drawable-xhdpi/icon_open_public_screen.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.webp b/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.webp
index a19afeec0..fce14c222 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.webp and b/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.webp b/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.webp
index 219dc7fdf..3c40a6840 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.webp and b/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_close_mic.webp b/app/src/main/res/drawable-xhdpi/icon_room_close_mic.webp
index f16937945..aa930568d 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_room_close_mic.webp and b/app/src/main/res/drawable-xhdpi/icon_room_close_mic.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.png b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.png
new file mode 100644
index 000000000..2f2799db7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.webp b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.webp
deleted file mode 100644
index f9fa496d8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.png b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.png
new file mode 100644
index 000000000..6db57b550
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.webp b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.webp
deleted file mode 100644
index a06811bac..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_open_mic.webp b/app/src/main/res/drawable-xhdpi/icon_room_open_mic.webp
index 4c7b0df5e..26f3029a4 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_room_open_mic.webp and b/app/src/main/res/drawable-xhdpi/icon_room_open_mic.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_send_msg.png b/app/src/main/res/drawable-xhdpi/icon_room_send_msg.png
new file mode 100644
index 000000000..fd000ee6a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_room_send_msg.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_send_msg.webp b/app/src/main/res/drawable-xhdpi/icon_room_send_msg.webp
deleted file mode 100644
index 85ebe0319..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_room_send_msg.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_room_setting.webp b/app/src/main/res/drawable-xhdpi/icon_room_setting.webp
index 003211a1b..b1649f496 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_room_setting.webp and b/app/src/main/res/drawable-xhdpi/icon_room_setting.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_send_gift_ture.png b/app/src/main/res/drawable-xhdpi/icon_send_gift_ture.png
new file mode 100644
index 000000000..7a0faddb5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_send_gift_ture.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_send_gift_ture.webp b/app/src/main/res/drawable-xhdpi/icon_send_gift_ture.webp
deleted file mode 100644
index 411b7d020..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_send_gift_ture.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_send_magic.webp b/app/src/main/res/drawable-xhdpi/icon_send_magic.webp
index 94b508dc6..4286911c4 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_send_magic.webp and b/app/src/main/res/drawable-xhdpi/icon_send_magic.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_list_room_ownner.png b/app/src/main/res/drawable-xhdpi/icon_user_list_room_ownner.png
new file mode 100644
index 000000000..80279820e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_user_list_room_ownner.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_list_room_ownner.webp b/app/src/main/res/drawable-xhdpi/icon_user_list_room_ownner.webp
deleted file mode 100644
index 6aa92c8ef..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_user_list_room_ownner.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_list_up_mic.png b/app/src/main/res/drawable-xhdpi/icon_user_list_up_mic.png
new file mode 100644
index 000000000..85a1e1fb0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_user_list_up_mic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_user_list_up_mic.webp b/app/src/main/res/drawable-xhdpi/icon_user_list_up_mic.webp
deleted file mode 100644
index 3d3b07923..000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_user_list_up_mic.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_room_mic_queue.webp b/app/src/main/res/drawable-xxhdpi/icon_room_mic_queue.webp
deleted file mode 100644
index 796ae7c1b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_room_mic_queue.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_room_mic_queue_not_empty.webp b/app/src/main/res/drawable-xxhdpi/icon_room_mic_queue_not_empty.webp
deleted file mode 100644
index 7e52b8685..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_room_mic_queue_not_empty.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/bg_contribute_entrance.xml b/app/src/main/res/drawable/bg_contribute_entrance.xml
index 82fc361d2..3dceb5567 100644
--- a/app/src/main/res/drawable/bg_contribute_entrance.xml
+++ b/app/src/main/res/drawable/bg_contribute_entrance.xml
@@ -3,9 +3,9 @@
 
     <solid android:color="@color/black_transparent_20"/>
 
-    <corners android:bottomRightRadius="13dp"
-        android:topRightRadius="13dp"
-        android:bottomLeftRadius="0dp"
-        android:topLeftRadius="0dp"/>
+    <corners android:bottomRightRadius="0dp"
+        android:topRightRadius="0dp"
+        android:bottomLeftRadius="13dp"
+        android:topLeftRadius="13dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_bottom_gift.xml b/app/src/main/res/layout/dialog_bottom_gift.xml
index c408cfba2..69ae2cef1 100644
--- a/app/src/main/res/layout/dialog_bottom_gift.xml
+++ b/app/src/main/res/layout/dialog_bottom_gift.xml
@@ -82,6 +82,7 @@
             <ImageView
                 android:id="@+id/iv_open_noble"
                 android:layout_width="88dp"
+                android:visibility="gone"
                 android:layout_height="31dp"
                 android:layout_gravity="center_vertical|end"
                 android:scaleType="fitCenter"
@@ -95,7 +96,7 @@
                 android:scaleType="fitCenter"
                 android:src="@drawable/icon_oneyuan_gift"
                 android:visibility="gone"
-                tools:visibility="visible" />
+                />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_room_operation.xml b/app/src/main/res/layout/dialog_room_operation.xml
index 78b1159ab..206eb36f3 100644
--- a/app/src/main/res/layout/dialog_room_operation.xml
+++ b/app/src/main/res/layout/dialog_room_operation.xml
@@ -4,8 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_dialog_room_operation"
-    android:paddingBottom="18dp"
-    android:paddingTop="14dp"
     android:orientation="horizontal">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml
index 3e53f5bb1..78b552fbc 100644
--- a/app/src/main/res/layout/dialog_user_info.xml
+++ b/app/src/main/res/layout/dialog_user_info.xml
@@ -87,9 +87,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="3dp"
                     android:ellipsize="end"
+                    android:maxWidth="111dp"
                     android:maxLength="10"
                     android:maxLines="1"
-                    android:maxWidth="111dp"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_14"
                     tools:text="南方菇凉男男女男男女" />
@@ -121,18 +121,19 @@
 
                 <include
                     android:id="@+id/in_official_mask"
+                    layout="@layout/layout_official_mask"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/dp_15"
-                    android:layout_marginEnd="5.5dp"
                     android:layout_gravity="center"
-                    android:visibility="visible"
-                    layout="@layout/layout_official_mask" />
+                    android:layout_marginEnd="5.5dp"
+                    android:visibility="visible" />
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/iv_user_level"
-                    android:layout_width="38dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="@dimen/dp_15"
                     android:layout_marginEnd="@dimen/dp_5"
+                    android:adjustViewBounds="true"
                     android:scaleType="fitXY"
                     android:visibility="gone"
                     tools:src="@mipmap/ic_user_level"
@@ -140,21 +141,33 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/iv_user_charm"
-                    android:layout_width="38dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="@dimen/dp_15"
-                    android:layout_marginEnd="3dp"
+                    android:layout_marginEnd="5dp"
+                    android:adjustViewBounds="true"
                     android:scaleType="fitXY"
                     android:visibility="gone"
                     tools:src="@mipmap/ic_user_level"
                     tools:visibility="visible" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/iv_user_nameplate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dp_15"
+                    android:layout_marginEnd="3dp"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitXY"
+                    android:visibility="gone"
+                    tools:src="@mipmap/ic_user_level"
+                    tools:visibility="visible" />
+
             </LinearLayout>
 
             <LinearLayout
-                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_5"
                 android:gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:orientation="horizontal">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/iv_user_official"
@@ -194,10 +207,11 @@
 
             <LinearLayout
                 android:id="@+id/ll_family"
-                android:layout_marginTop="5dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_marginTop="5dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tv_family_name_label"
diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml
index 964bdd377..f41efca08 100644
--- a/app/src/main/res/layout/item_boss_micro.xml
+++ b/app/src/main/res/layout/item_boss_micro.xml
@@ -166,6 +166,7 @@
             android:layout_height="wrap_content"
             android:background="@drawable/shape_bg_room_tag"
             android:gravity="center"
+            android:visibility="gone"
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
             android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/list_item_online_user.xml b/app/src/main/res/layout/list_item_online_user.xml
index 7c6737078..7f4ea0822 100644
--- a/app/src/main/res/layout/list_item_online_user.xml
+++ b/app/src/main/res/layout/list_item_online_user.xml
@@ -2,131 +2,132 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:background="#000">
+    android:layout_height="60dp">
 
-    <RelativeLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
+    <com.yizhuan.erban.ui.widget.NobleAvatarView
+        android:id="@+id/noble_avatar_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        tools:layout_width="60dp" />
 
+    <include
+        android:id="@+id/in_official_mask"
+        layout="@layout/layout_official_mask"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_15"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="5.5dp"
+        android:layout_toEndOf="@id/noble_avatar_view"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-        <com.yizhuan.erban.ui.widget.NobleAvatarView
-            android:id="@+id/noble_avatar_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp" />
+    <TextView
+        android:id="@+id/nick"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_toEndOf="@id/in_official_mask"
+        android:ellipsize="end"
+        android:maxWidth="80dp"
+        android:maxLines="1"
+        android:textColor="@color/white"
+        android:textSize="13sp"
+        tools:text="难返风格as打算kj阿达是可敬的阿萨德看见爱上阿萨德" />
 
-        <include
-            android:id="@+id/in_official_mask"
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/nick"
+        android:layout_alignBottom="@+id/nick"
+        android:layout_marginStart="3dp"
+        android:layout_toStartOf="@+id/iv_more"
+        android:layout_toEndOf="@+id/nick"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/sex"
+            android:layout_width="13dp"
+            android:layout_height="13dp"
+            android:layout_marginEnd="5dp"
+            android:src="@drawable/icon_mic_female" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_user_official"
+            android:layout_width="@dimen/dp_13"
+            android:layout_height="@dimen/dp_13"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:src="@mipmap/ic_user_official_13dp"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_noble_level"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_marginEnd="5dp"
+            android:visibility="visible"
+            tools:src="@mipmap/ic_user_level_king"
+            tools:visibility="visible" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/nick"
+        android:layout_marginTop="4dp"
+        android:layout_toRightOf="@id/noble_avatar_view"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/manager_logo"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp_15"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="5.5dp"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:layout_toEndOf="@id/noble_avatar_view"
-            layout="@layout/layout_official_mask" />
+            android:layout_marginEnd="@dimen/dp_5"
+            android:src="@drawable/icon_admin_logo" />
 
-        <TextView
-            android:id="@+id/nick"
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_user_exper"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_toEndOf="@id/in_official_mask"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:maxWidth="80dp"
-            android:textColor="@color/white"
-            android:textSize="13sp"
-            tools:text="难返风格as打算kj阿达是可敬的阿萨德看见爱上阿萨德" />
+            android:layout_height="@dimen/dp_15"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:adjustViewBounds="true"
+            android:visibility="visible"
+            tools:src="@mipmap/ic_user_level"
+            tools:visibility="visible" />
 
-        <LinearLayout
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_user_charm"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/nick"
-            android:layout_alignTop="@+id/nick"
-            android:layout_marginStart="3dp"
-            android:layout_toEndOf="@+id/nick"
-            android:layout_toStartOf="@+id/iv_more"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_height="@dimen/dp_17"
+            android:adjustViewBounds="true"
+            android:visibility="visible"
+            tools:visibility="visible" />
 
-            <ImageView
-                android:id="@+id/sex"
-                android:layout_width="13dp"
-                android:layout_height="13dp"
-                android:layout_marginEnd="5dp"
-                android:src="@drawable/icon_mic_female" />
+    </LinearLayout>
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_user_official"
-                android:layout_width="@dimen/dp_13"
-                android:layout_height="@dimen/dp_13"
-                android:layout_marginEnd="@dimen/dp_5"
-                android:visibility="gone"
-                android:src="@mipmap/ic_user_official_13dp"
-                tools:visibility="visible" />
+    <ImageView
+        android:id="@+id/room_online_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_15"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="15dp"
+        android:adjustViewBounds="true"
+        android:src="@drawable/icon_user_list_up_mic" />
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_noble_level"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
-                android:layout_marginEnd="5dp"
-                android:visibility="visible"
-                tools:src="@mipmap/ic_user_level_king"
-                tools:visibility="visible" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/nick"
-            android:layout_marginTop="4dp"
-            android:layout_toRightOf="@id/noble_avatar_view"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/room_owner_logo"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_15"
-                android:layout_marginEnd="5dp"
-                android:src="@drawable/icon_user_list_room_ownner" />
-
-            <ImageView
-                android:id="@+id/manager_logo"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_15"
-                android:layout_marginEnd="@dimen/dp_5"
-                android:src="@drawable/icon_admin_logo" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_user_exper"
-                android:layout_width="@dimen/dp_22"
-                android:layout_height="@dimen/dp_17"
-                android:layout_marginEnd="@dimen/dp_5"
-                android:visibility="visible"
-                tools:src="@mipmap/ic_user_level"
-                tools:visibility="visible" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_user_charm"
-                android:layout_width="@dimen/dp_22"
-                android:layout_height="@dimen/dp_17"
-                android:visibility="visible"
-                tools:visibility="visible" />
-
-        </LinearLayout>
-    </RelativeLayout>
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:layout_below="@id/container"
+        android:layout_alignParentBottom="true"
         android:layout_marginEnd="@dimen/dp_15"
-        android:layout_marginStart="@dimen/dp_15"
+        android:layout_toRightOf="@id/noble_avatar_view"
         android:background="@color/white_tran_10" />
-</RelativeLayout>
\ No newline at end of file
+
+</RelativeLayout>
+
diff --git a/app/src/main/res/layout/noble_avatar_layout.xml b/app/src/main/res/layout/noble_avatar_layout.xml
index f8039c5d0..249e54211 100644
--- a/app/src/main/res/layout/noble_avatar_layout.xml
+++ b/app/src/main/res/layout/noble_avatar_layout.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:visibility="visible"
-        tools:src="@mipmap/ic_user_avatar_level_king" />
+        />
 
     <ImageView
         android:id="@+id/iv_user_noble_level"
@@ -25,5 +25,5 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/iv_avatar"
         android:layout_alignEnd="@+id/iv_avatar"
-        tools:src="@mipmap/ic_user_level_king" />
+         />
 </merge>
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
index 1a53f3605..b2e92e4b1 100644
--- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
+++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
@@ -23,8 +23,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
 
         <!-- ktv模式下的房间排行榜入口 -->
         <LinearLayout
@@ -161,10 +160,11 @@
             android:layout_width="65dp"
             android:layout_height="75dp"
             android:layout_below="@id/activity_img"
-            android:layout_marginTop="@dimen/dp_30"
             android:layout_alignEnd="@+id/activity_img"
+            android:layout_marginTop="@dimen/dp_30"
             android:visibility="gone"
             tools:visibility="visible">
+
             <com.jude.rollviewpager.RollPagerView
                 android:id="@+id/activity_img_left_cp"
                 android:layout_width="match_parent"
@@ -191,6 +191,7 @@
             android:layout_width="wrap_content"
             android:layout_height="24dp"
             android:layout_alignTop="@id/micro_view"
+            android:layout_alignParentEnd="true"
             android:layout_marginTop="6dp"
             android:background="@drawable/bg_contribute_entrance"
             android:gravity="center"
@@ -235,6 +236,7 @@
             android:layout_marginTop="@dimen/dp_8"
             android:visibility="gone"
             tools:visibility="visible">
+
             <com.jude.rollviewpager.RollPagerView
                 android:id="@+id/activity_img_left"
                 android:layout_width="match_parent"
diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java b/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java
index 8814f9f07..aef37c9a1 100644
--- a/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java
+++ b/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java
@@ -117,7 +117,7 @@ public class MusicPlayerView extends FrameLayout implements View.OnClickListener
         ObjectAnimator objectAnimatorFlag = ObjectAnimator.ofFloat(
                 musicFlagLayout,
                 "translationX",
-                UIUtil.dip2px(getContext(), 59 + 20),
+                UIUtil.dip2px(getContext(), -59 - 20),
                 0)
                 .setDuration(150);
         objectAnimatorFlag.setInterpolator(new AccelerateDecelerateInterpolator());
@@ -137,7 +137,7 @@ public class MusicPlayerView extends FrameLayout implements View.OnClickListener
                 musicFlagLayout,
                 "translationX",
                 0,
-                UIUtil.dip2px(getContext(), 59 + 20))
+                UIUtil.dip2px(getContext(), -59-20))
                 .setDuration(150);
         objectAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
         objectAnimator.start();
diff --git a/app/src/module_music/res/drawable-xhdpi/icon_music_flag.png b/app/src/module_music/res/drawable-xhdpi/icon_music_flag.png
index 368e040ec..1c1bb3cb1 100644
Binary files a/app/src/module_music/res/drawable-xhdpi/icon_music_flag.png and b/app/src/module_music/res/drawable-xhdpi/icon_music_flag.png differ
diff --git a/app/src/module_music/res/drawable-xxhdpi/icon_music_flag.png b/app/src/module_music/res/drawable-xxhdpi/icon_music_flag.png
deleted file mode 100644
index 8032bcaef..000000000
Binary files a/app/src/module_music/res/drawable-xxhdpi/icon_music_flag.png and /dev/null differ
diff --git a/app/src/module_music/res/drawable/bg_room_music_player.xml b/app/src/module_music/res/drawable/bg_room_music_player.xml
index c53060446..817f5f08f 100644
--- a/app/src/module_music/res/drawable/bg_room_music_player.xml
+++ b/app/src/module_music/res/drawable/bg_room_music_player.xml
@@ -4,6 +4,6 @@
 
     <solid android:color="@color/black_transparent_20" />
     <corners
-        android:topLeftRadius="12dp"
-        android:bottomLeftRadius="12dp" />
+        android:topRightRadius="12dp"
+        android:bottomRightRadius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/module_music/res/layout/layout_music_player_view.xml b/app/src/module_music/res/layout/layout_music_player_view.xml
index b7f9d1a4b..ee00af954 100644
--- a/app/src/module_music/res/layout/layout_music_player_view.xml
+++ b/app/src/module_music/res/layout/layout_music_player_view.xml
@@ -6,30 +6,31 @@
 
     <FrameLayout
         android:id="@+id/music_flag_layout"
-        android:layout_width="65dp"
+        android:layout_width="70dp"
         android:layout_height="25dp"
-        android:layout_gravity="end"
         android:layout_marginTop="6dp"
         android:background="@drawable/bg_room_music_player"
         tools:visibility="visible">
 
-        <ImageView
-            android:id="@+id/music_flag"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:layout_gravity="start|center_vertical"
-            android:layout_marginStart="3dp"
-            android:src="@drawable/icon_music_flag" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|center_vertical"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="5dp"
             android:layout_marginEnd="14dp"
             android:lines="1"
-            android:text="音乐"
+            android:text="播放音乐"
             android:textColor="@color/white"
-            android:textSize="12dp" />
+            android:textSize="10sp" />
+
+        <ImageView
+            android:id="@+id/music_flag"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginEnd="2dp"
+            android:src="@drawable/icon_music_flag" />
+
 
     </FrameLayout>
 
diff --git a/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message.webp b/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message.webp
index 7e86295e6..8de73ee94 100644
Binary files a/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message.webp and b/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message.webp differ
diff --git a/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message_income.webp b/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message_income.webp
index cb8a47fa2..00543d45b 100644
Binary files a/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message_income.webp and b/app/src/module_room_chat/res/drawable-xhdpi/ic_room_message_income.webp differ
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
index 002759d5c..0bdc27d88 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
@@ -156,7 +156,7 @@ public class XChatConstants {
     /**
      * 分享房间 URL
      */
-    public static final String SHARE_ROOM_URL = "/modules/share/share_room.html?shareUid=";
+    public static final String SHARE_ROOM_URL = "/accompany/index.html#/share?shareUid=";
 
     /**
      * 分享家族文本
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
index 12993a77c..e5c560b9f 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
@@ -285,5 +285,12 @@ public class UriProvider {
         return JAVA_WEB_URL.concat("/modules/certification/index.html");
     }
 
+    /**
+     * 个人魅力榜
+     *
+     */
+    public static String getPersonalCharismaRank() {
+        return JAVA_WEB_URL.concat("/accompany/modules/charm/index.html");
+    }
 
 }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java
index f076b672a..85133d481 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java
@@ -17,9 +17,7 @@ public interface IShareModel extends IBaseCore {
 
     Single<String> shareH5(WebJsBeanInfo.DataBean webViewInfo, Platform platform, boolean httpsUrl);
 
-    Single<String> shareRoom(Platform platform, long roomUid, String title);
-
-    Single<String> shareRoom(Platform platform, long roomUid, String title, boolean httpsAvatar);
+    Single<String> shareRoom(Platform platform, long roomUid, long roomId, String title, String roomAvatar);
 
     Single<String> shareFamily(Platform platform,
                                String familyId,
@@ -32,6 +30,9 @@ public interface IShareModel extends IBaseCore {
                                    String title);
 
     Single<String> shareText(Platform platform, String text);
-    /**写一个通用的分享方法*/
+
+    /**
+     * 写一个通用的分享方法
+     */
     Single<String> shareCommon(Platform platform, ShareCommonInfo info, boolean toast);
 }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
index b8e4a5a3d..899cb7eab 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
@@ -1,7 +1,10 @@
 package com.yizhuan.xchat_android_core.share;
 
 import android.annotation.SuppressLint;
+import android.net.Uri;
+import android.text.Html;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -22,6 +25,8 @@ import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo;
 import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.HashMap;
 
 import cn.sharesdk.framework.Platform;
@@ -79,7 +84,7 @@ public class ShareModel extends BaseModel implements IShareModel {
                     sp.setText(webViewInfo.getDesc());
                     sp.setTitle(webViewInfo.getTitle());
                     if (httpsUrl) {
-                        sp.setImageUrl(webViewInfo.getImgUrl().replace("http:","https:"));
+                        sp.setImageUrl(webViewInfo.getImgUrl().replace("http:", "https:"));
                     } else {
                         sp.setImageUrl(webViewInfo.getImgUrl());
                     }
@@ -140,14 +145,8 @@ public class ShareModel extends BaseModel implements IShareModel {
     @Override
     public Single<String> shareRoom(Platform platform,
                                     final long roomUid,
-                                    String title) {
-        return shareRoom(platform, roomUid, title, false);
-    }
-
-    @Override
-    public Single<String> shareRoom(Platform platform,
-                                    final long roomUid,
-                                    String title, boolean httpsAvatar) {
+                                    long roomId,
+                                    String title, String room_avatar) {
         return Single.create(new SingleOnSubscribe<String>() {
             @SuppressLint("CheckResult")
             @Override
@@ -158,15 +157,14 @@ public class ShareModel extends BaseModel implements IShareModel {
                         Platform.ShareParams sp = new Platform.ShareParams();
                         sp.setText(userInfo.getNick() + XChatConstants.SHARE_ROOM_TEXT + title);
                         sp.setTitle(XChatConstants.SHARE_ROOM_TITLE);
-                        if (httpsAvatar) {
-                            sp.setImageUrl(userInfo.getAvatar().replace("http:", "https:"));
-                        } else {
-                            sp.setImageUrl(userInfo.getAvatar());
-                        }
-
-
-                        final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL + String.valueOf(AuthModel.get().getCurrentUid()) + "&uid=" + String.valueOf(roomUid);
+                        sp.setImageUrl(userInfo.getAvatar());
+                        final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL +
+                                AuthModel.get().getCurrentUid() + "&uid=" + roomUid + "&room_name=" +
+                                URLEncoder.encode(title, "utf8") + "&room_id=" + roomId + "&room_avatar=" +
+                                URLEncoder.encode(room_avatar, "utf8") + "&share_name=" +
+                                URLEncoder.encode( UserModel.get().getCacheLoginUserInfo().getNick(), "utf8");
                         //QQ空间分享
+
                         sp.setSite(userInfo.getNick() + XChatConstants.SHARE_ROOM_TEXT + title);
                         sp.setSiteUrl(siteUrl);
                         //QQ分享
@@ -204,6 +202,7 @@ public class ShareModel extends BaseModel implements IShareModel {
 
     /**
      * 向我们服务器报告分享
+     *
      * @param roomUid
      * @param sharePageId
      * @param platform
@@ -508,8 +507,9 @@ public class ShareModel extends BaseModel implements IShareModel {
 
         /**
          * 报告服务器分享
+         *
          * @param uid
-         * @param targetUid //分享房间的时候传房主uid
+         * @param targetUid   //分享房间的时候传房主uid
          * @param shareType
          * @param sharePageId
          * @param shareUrl
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java
index 3f65e6bca..5236ec36d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java
@@ -89,6 +89,15 @@ public class UserInfo implements Serializable {
      * 等级信息
      */
     private UserLevelVo userLevelVo;
+
+    /**
+     * 铭牌地址
+     */
+    @Getter
+    @Setter
+    private String nameplatePic;
+
+    private String nameplateWord;
     /**
      * 头饰信息
      */