From e9e50c1b65565b5ca6dd247a9ed53e1c3f2f3b3b Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Thu, 20 Nov 2025 09:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8Dxml.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/base/CommonAppContext.java     |   2 +-
 .../widget/RoomSingSongWheatView.java         |   1 -
 .../main/res/layout/index_image_banner.xml    |   7 -
 .../res/layout/me_item_user_photo_wall.xml    |  34 --
 .../main/res/layout/room_view_sing_wheat.xml  |  24 +-
 .../plaza/activity/ReleaseActivity.java       |  12 +-
 .../user/activity/AlbumDetailActivity.java    |  12 +-
 .../user/fragment/VocalRangeFragment.java     |   2 +-
 .../modulemain/adapter/ShareWallAdapter.java  |   8 +-
 .../adapter/UserPhotoWallAdapter.java         |   4 +-
 .../dialog/RoomGiftDialogFragment.java        |   9 +-
 .../res/layout/bottom_album_recyclerview.xml  |   0
 .../layout/dialog_gift_lottery_fragment.xml   |  99 ----
 .../src/main/res/layout/item_gift_room.xml    | 101 ----
 .../res/layout/room_view_default_wheat.xml    | 528 ------------------
 .../res/layout/room_view_friendship_wheat.xml | 275 ---------
 .../main/res/layout/room_view_ktv_wheat.xml   | 288 ----------
 .../main/res/layout/room_view_make_wheat.xml  | 231 --------
 .../main/res/layout/room_view_sing_wheat.xml  | 273 ---------
 19 files changed, 40 insertions(+), 1870 deletions(-)
 delete mode 100644 BaseModule/src/main/res/layout/index_image_banner.xml
 delete mode 100644 BaseModule/src/main/res/layout/me_item_user_photo_wall.xml
 rename BaseModule/src/main/java/com/xscm/moduleutil/adapter/UserPhotoWallAdapter.java => MainModule/src/main/java/com/xscm/modulemain/adapter/ShareWallAdapter.java (91%)
 rename BaseModule/src/main/res/layout/bottom_sheet_recyclerview.xml => MainModule/src/main/res/layout/bottom_album_recyclerview.xml (100%)
 delete mode 100644 MainModule/src/main/res/layout/dialog_gift_lottery_fragment.xml
 delete mode 100644 MainModule/src/main/res/layout/item_gift_room.xml
 delete mode 100644 MainModule/src/main/res/layout/room_view_default_wheat.xml
 delete mode 100644 MainModule/src/main/res/layout/room_view_friendship_wheat.xml
 delete mode 100644 MainModule/src/main/res/layout/room_view_ktv_wheat.xml
 delete mode 100644 MainModule/src/main/res/layout/room_view_make_wheat.xml
 delete mode 100644 MainModule/src/main/res/layout/room_view_sing_wheat.xml

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 5505fc02..170922cb 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         //设置mqtt环境 false 测试环境 true 正式环境
 //        ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
         //设置http环境 false 测试环境 true 正式环境
-        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
         currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
 
 
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
index 651efa20..feb75ffb 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
@@ -12,7 +12,6 @@ import com.xscm.moduleutil.R;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.room.RoomPitBean;
 import com.xscm.moduleutil.utils.ImageUtils;
-import com.xscm.moduleutil.utils.SpUtil;
 
 /**
  * @Author lxj$
diff --git a/BaseModule/src/main/res/layout/index_image_banner.xml b/BaseModule/src/main/res/layout/index_image_banner.xml
deleted file mode 100644
index c69b616a..00000000
--- a/BaseModule/src/main/res/layout/index_image_banner.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.makeramen.roundedimageview.RoundedImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/image"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:riv_corner_radius="@dimen/dp_14" />
\ No newline at end of file
diff --git a/BaseModule/src/main/res/layout/me_item_user_photo_wall.xml b/BaseModule/src/main/res/layout/me_item_user_photo_wall.xml
deleted file mode 100644
index 70e1d729..00000000
--- a/BaseModule/src/main/res/layout/me_item_user_photo_wall.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/dp_5"
-    android:layout_marginBottom="@dimen/dp_5"
-    android:paddingLeft="@dimen/dp_6"
-    android:paddingRight="@dimen/dp_6">
-
-    <com.makeramen.roundedimageview.RoundedImageView
-        android:id="@+id/riv_user_head"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:scaleType="fitXY"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintTop_toTopOf="parent"
-        app:riv_corner_radius="@dimen/dp_5"
-        tools:src="@mipmap/add_img" />
-
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="@dimen/dp_13"
-        android:layout_height="@dimen/dp_13"
-        android:layout_marginTop="@dimen/dp_2"
-        android:layout_marginEnd="@dimen/dp_2"
-        android:src="@mipmap/icon_closes"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@+id/riv_user_head"
-        app:layout_constraintTop_toTopOf="@+id/riv_user_head"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/BaseModule/src/main/res/layout/room_view_sing_wheat.xml b/BaseModule/src/main/res/layout/room_view_sing_wheat.xml
index 0bcfd75d..5305f211 100644
--- a/BaseModule/src/main/res/layout/room_view_sing_wheat.xml
+++ b/BaseModule/src/main/res/layout/room_view_sing_wheat.xml
@@ -21,9 +21,9 @@
             android:layout_marginTop="@dimen/dp_12"
             android:layout_marginEnd="@dimen/dp_12"
             android:adjustViewBounds="true"
-            android:scaleType="center"
-            app:layout_constraintDimensionRatio="1:1"
+            android:scaleType="fitCenter"
             android:src="@mipmap/room_ic_wheat_default"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -58,7 +58,8 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:loopCount="0" />
+            app:loopCount="0"
+            app:source="mic.svga" />
 
         <ImageView
             android:id="@+id/iv_sex"
@@ -204,14 +205,17 @@
             android:id="@+id/iv_online"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
+            android:background="@mipmap/room_ic_owner_offline"
             android:visibility="gone"
-            android:src="@mipmap/room_ic_owner_offline"
-            app:layout_constraintBottom_toBottomOf="@+id/riv"
-            app:layout_constraintEnd_toEndOf="@+id/riv"
-            app:layout_constraintStart_toStartOf="@+id/riv"
-            app:layout_constraintTop_toTopOf="@+id/riv"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_percent="0.82"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="@dimen/dp_10"
+            app:loopCount="0"
+            tools:visibility="visible" />
 
         <com.xscm.moduleutil.widget.ExpressionImgView
             android:id="@+id/iv_face"
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
index 8a10f20d..f9f807ef 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
@@ -33,7 +33,7 @@ import com.luck.picture.lib.entity.LocalMedia;
 import com.xscm.modulemain.activity.plaza.contacts.ReleaseContract;
 import com.xscm.modulemain.activity.plaza.presenter.ReleasePresenter;
 import com.xscm.modulemain.BaseMvpActivity;
-import com.xscm.moduleutil.adapter.UserPhotoWallAdapter;
+import com.xscm.modulemain.adapter.ShareWallAdapter;
 import com.xscm.moduleutil.bean.HeatedBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ColorManager;
@@ -54,7 +54,7 @@ import java.util.List;
  * @description: 发布动态
  */
 public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityReleaseBinding> implements ReleaseContract.View {
-    UserPhotoWallAdapter mUserPhotoWallAdapter;
+    ShareWallAdapter mUserPhotoWallAdapter;
     List<String> list=new ArrayList<>();
     private List<String> uploadedUrls = new ArrayList<>();//真实图片地址
     final int maxNum = 1200;
@@ -88,7 +88,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
         });
 
         mBinding.rvPhotoWall.setLayoutManager(new GridLayoutManager(this, 3));
-        mBinding.rvPhotoWall.setAdapter(mUserPhotoWallAdapter = new UserPhotoWallAdapter());
+        mBinding.rvPhotoWall.setAdapter(mUserPhotoWallAdapter = new ShareWallAdapter());
         mUserPhotoWallAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
@@ -98,7 +98,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
                     uploadedUrls.remove(item);
                     updateAdapterData();
                 } else {
-                    if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) {
+                    if (item.equals(ShareWallAdapter.ADD_PHOTO)) {
                         int maxSelectable = 9 - uploadedUrls.size();
                         if (maxSelectable > 0) {
                             // 点击的是"+"'号，启动图片选择
@@ -176,7 +176,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
     private void updateAdapterData() {
         list.clear();
         list.addAll(uploadedUrls);            // 添加真实图片
-        list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO
+        list.add(ShareWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO
         mUserPhotoWallAdapter.setNewData(list);
     }
     private void onClick(View view) {
@@ -281,7 +281,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
 
 
         BottomSheetDialog dialog = new BottomSheetDialog(this);
-        dialog.setContentView(R.layout.bottom_sheet_recyclerview);
+        dialog.setContentView(R.layout.bottom_album_recyclerview);
         View bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             bottomSheet.setBackgroundResource(android.R.color.transparent); // 设置为透明
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java
index 88c31235..6023cf29 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java
@@ -31,6 +31,7 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.xscm.modulemain.activity.user.conacts.AlbumDetailConacts;
 import com.xscm.modulemain.activity.user.presenter.AlbumDetailPresenter;
 import com.xscm.modulemain.BaseMvpActivity;
+import com.xscm.modulemain.dialog.ShareDialog;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.GlideEngine;
@@ -38,7 +39,6 @@ import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.PermissionDescriptionHelper;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.Constants;
-import com.xscm.modulemain.dialog.ShareDialog;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -259,12 +259,12 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
     @Override
     public void getAlbumList(List<AlbumBean> data) {
         BottomSheetDialog dialog = new BottomSheetDialog(this);
-        dialog.setContentView(com.xscm.moduleutil.R.layout.bottom_sheet_recyclerview);
+        dialog.setContentView(R.layout.bottom_album_recyclerview);
 
-        RecyclerView recyclerView = dialog.findViewById(com.xscm.moduleutil.R.id.rv_options);
-        View btnCancel = dialog.findViewById(com.xscm.moduleutil.R.id.btn_cancel);
-        View btnConfirm = dialog.findViewById(com.xscm.moduleutil.R.id.btn_confirm);
-        TextView tvTitle = dialog.findViewById(com.xscm.moduleutil.R.id.tv_title);
+        RecyclerView recyclerView = dialog.findViewById(R.id.rv_options);
+        View btnCancel = dialog.findViewById(R.id.btn_cancel);
+        View btnConfirm = dialog.findViewById(R.id.btn_confirm);
+        TextView tvTitle = dialog.findViewById(R.id.tv_title);
         tvTitle.setText("选择相册");
         assert recyclerView != null;
         recyclerView.setLayoutManager(new GridLayoutManager(this, 4));
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
index 1394a3f7..b7458086 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
@@ -392,7 +392,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 
     @Override
     public void setBanners(List<BannerModel> bannerModels) {
-        mBinding.banner.setBannerData(com.xscm.moduleutil.R.layout.index_image_banner, bannerModels);
+        mBinding.banner.setBannerData(R.layout.index_image_banner, bannerModels);
     }
 
 
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/UserPhotoWallAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/ShareWallAdapter.java
similarity index 91%
rename from BaseModule/src/main/java/com/xscm/moduleutil/adapter/UserPhotoWallAdapter.java
rename to MainModule/src/main/java/com/xscm/modulemain/adapter/ShareWallAdapter.java
index b71201b7..e8dac3a2 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/UserPhotoWallAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/ShareWallAdapter.java
@@ -1,16 +1,16 @@
-package com.xscm.moduleutil.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.xscm.moduleutil.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.utils.ImageUtils;
 
-public class UserPhotoWallAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
+public class ShareWallAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
     private boolean b = false;
     public static final String ADD_PHOTO = "ADD_PHOTO";
     private int longClickPos = -1;
 
-    public UserPhotoWallAdapter() {
+    public ShareWallAdapter() {
         super(R.layout.me_item_user_photo_wall);
     }
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java
index 1f97adc1..ef2a0e39 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java
@@ -21,10 +21,10 @@ public class UserPhotoWallAdapter extends BaseQuickAdapter<String, BaseViewHolde
         if (item.equals(ADD_PHOTO)) {
             helper.setVisible(R.id.iv_close, false);
             // 显示加号图片
-            helper.setImageResource(com.xscm.moduleutil.R.id.riv_user_head, com.xscm.moduleutil.R.mipmap.add_img);
+            helper.setImageResource(R.id.riv_user_head, com.xscm.moduleutil.R.mipmap.add_img);
         } else {
             helper.setVisible(R.id.iv_close, true);
-            ImageUtils.loadCenterCrop(item, helper.getView(com.xscm.moduleutil.R.id.riv_user_head));
+            ImageUtils.loadCenterCrop(item, helper.getView(R.id.riv_user_head));
         }
 //        if (helper.getAdapterPosition() == 5) {
 //            helper.setVisible(R.id.riv_user_head, false);
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
index 057624da..06607bc3 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
@@ -21,6 +21,7 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.viewpager.widget.ViewPager;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.hjq.toast.ToastUtils;
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.adapter.GiftUserAdapter;
@@ -116,6 +117,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         roomId = getArguments().getString("roomId");
         jingp = getArguments().getInt("jingp");
         heart_id = getArguments().getString("heart_id");
+        LogUtils.e("RoomGiftDialogFragment_roomInfoResp",roomInfoResp.toString());
+        LogUtils.e("RoomGiftDialogFragment_userInfo",userInfo.toString());
+
     }
 
     @Override
@@ -156,8 +160,8 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         }
 
         // 清理其他引用
-        roomInfoResp = null;
-        userInfo = null;
+//        roomInfoResp = null;
+//        userInfo = null;
         rewardUserBeanList = null;
         giftLabelBeanList = null;
         roonGiftModel = null;
@@ -202,7 +206,6 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
             rewardUserBean.setSelect(true);
             rewardUserBeanList.add(rewardUserBean);
         } else {
-
             rewardUserBeanList = getSortedRewardUserList(roomInfoResp.getRoom_info().getPit_list(), "9", "10");
         }
         mBinding.rvGiftUser.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
diff --git a/BaseModule/src/main/res/layout/bottom_sheet_recyclerview.xml b/MainModule/src/main/res/layout/bottom_album_recyclerview.xml
similarity index 100%
rename from BaseModule/src/main/res/layout/bottom_sheet_recyclerview.xml
rename to MainModule/src/main/res/layout/bottom_album_recyclerview.xml
diff --git a/MainModule/src/main/res/layout/dialog_gift_lottery_fragment.xml b/MainModule/src/main/res/layout/dialog_gift_lottery_fragment.xml
deleted file mode 100644
index 552697f0..00000000
--- a/MainModule/src/main/res/layout/dialog_gift_lottery_fragment.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@mipmap/tkzj"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/im_jc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_36"
-            android:src="@mipmap/jilu"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <LinearLayout
-            android:id="@+id/custom_tab_layout"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginEnd="@dimen/dp_16"
-            android:background="#80000000"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/im_jc">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:id="@+id/textView1"
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/dp_24"
-                    android:layout_marginStart="@dimen/sp_12"
-                    android:layout_marginTop="@dimen/dp_16"
-                    android:background="@mipmap/tab_dy"
-                    android:gravity="center"
-                    android:text="我的记录"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintWidth_default="percent"
-                    app:layout_constraintWidth_percent="0.2" />
-
-                <TextView
-                    android:id="@+id/textView2"
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/dp_24"
-                    android:layout_marginStart="@dimen/dp_16"
-                    android:gravity="center"
-                    android:text="全服记录"
-                    android:textColor="#5B5B5B"
-                    android:textSize="@dimen/sp_14"
-                    app:layout_constraintStart_toEndOf="@+id/textView1"
-                    app:layout_constraintTop_toTopOf="@+id/textView1"
-                    app:layout_constraintWidth_default="percent"
-                    app:layout_constraintWidth_percent="0.2" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <com.scwang.smartrefresh.layout.SmartRefreshLayout
-                android:id="@+id/smart_refresh_layout"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_marginTop="@dimen/dp_16"
-                app:srlEnableLoadMore="true"
-                app:srlEnableRefresh="true">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recyclerView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:nestedScrollingEnabled="false"
-                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                    app:spanCount="3"
-                    tools:listitem="@layout/item_prize_pool" />
-
-            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
diff --git a/MainModule/src/main/res/layout/item_gift_room.xml b/MainModule/src/main/res/layout/item_gift_room.xml
deleted file mode 100644
index f23f6fe6..00000000
--- a/MainModule/src/main/res/layout/item_gift_room.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/cl_gift"
-    android:layout_width="@dimen/dp_77"
-    android:layout_height="@dimen/dp_119"
-    android:background="@mipmap/gift_bj"
-    >
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_iv_down_on"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:ignore="MissingConstraints"
-       >
-
-
-        <ImageView
-            android:id="@+id/iv_gift_pic"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginLeft="9dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginRight="9dp"
-            android:src="@mipmap/default_image"
-            app:layout_constraintDimensionRatio="1:1.2"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_down_on"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginLeft="9dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginRight="9dp"
-            android:scaleType="fitXY"
-            android:src="@mipmap/room_gift_select_bg"
-            android:visibility="gone"
-            app:layout_constraintDimensionRatio="1:1.2"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <TextView
-            android:id="@+id/tv_gift_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:text="甜蜜奶酪"
-            android:textColor="@color/color_FFA9A9A9"
-            android:textSize="11sp"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_gift_pic"
-            app:layout_constraintRight_toRightOf="@+id/iv_gift_pic"
-            app:layout_constraintTop_toBottomOf="@+id/iv_gift_pic" />
-
-        <TextView
-            android:id="@+id/tv_gift_price"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1"
-            android:drawableLeft="@mipmap/jinb"
-            android:drawablePadding="@dimen/dp_3"
-            android:layout_marginBottom="@dimen/dp_5"
-            android:textColor="@color/color_FFFFBC00"
-            android:textSize="11sp"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_gift_pic"
-            app:layout_constraintRight_toRightOf="@+id/iv_gift_pic"
-            app:layout_constraintTop_toBottomOf="@+id/tv_gift_name" />
-
-        <TextView
-            android:id="@+id/integral"
-            android:layout_width="@dimen/dp_35"
-            android:layout_height="@dimen/dp_13"
-            android:layout_gravity="center_horizontal"
-            android:background="@mipmap/text_bj"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:gravity="center"
-            android:text="x30"
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/sp_10"
-            android:visibility="gone"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@mipmap/noble_is_lock"
-            android:visibility="gone"
-            android:scaleType="fitCenter"
-            android:id="@+id/iv_gift_select"
-            tools:visibility="visible"
-            />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MainModule/src/main/res/layout/room_view_default_wheat.xml b/MainModule/src/main/res/layout/room_view_default_wheat.xml
deleted file mode 100644
index c4581290..00000000
--- a/MainModule/src/main/res/layout/room_view_default_wheat.xml
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipChildren="false"
-            android:clipToPadding="false">
-        <!--说话动态图-->
-        <com.xscm.moduleutil.widget.GifAvatarOvalView
-                android:id="@+id/riv"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginEnd="@dimen/dp_12"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                android:src="@mipmap/room_ic_wheat_default"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        <com.opensource.svgaplayer.SVGAImageView
-                android:id="@+id/iv_ripple"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="@dimen/dp_8"
-                app:autoPlay="false"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1.05"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:loopCount="0"
-                app:source="mic.svga"/>
-
-        <!--        <com.xscm.moduleutil.widget.AvatarFrameView-->
-        <!--            android:id="@+id/iv_ripple"-->
-        <!--            android:layout_width="0dp"-->
-        <!--            android:layout_height="0dp"-->
-        <!--            android:layout_marginTop="@dimen/dp_8"-->
-        <!--            app:autoPlay="false"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintDimensionRatio="1:1.05"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toTopOf="parent"-->
-        <!--            />-->
-
-        <ImageView
-                android:id="@+id/iv_sex"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="@mipmap/common_ic_headportriat_base"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toTopOf="@id/riv"
-                tools:visibility="visible"/>
-
-        <View
-                android:id="@+id/view2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toTopOf="@id/riv"/>
-
-        <ImageView
-                android:id="@+id/iv_tag_boos"
-                android:layout_width="32dp"
-                android:layout_height="14dp"
-                android:src="@mipmap/room_ic_wheat_tag_boss"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@id/view2"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                tools:visibility="visible"/>
-
-        <ImageView
-                android:id="@+id/iv_tag_type"
-                android:layout_width="@dimen/dp_30"
-                android:layout_height="@dimen/dp_20"
-                android:layout_marginTop="@dimen/dp_5"
-                android:src="@mipmap/zc"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"/>
-
-        <!--            <TextView-->
-        <!--                android:id="@+id/tv_time"-->
-        <!--                android:layout_width="@dimen/dp_35"-->
-        <!--                android:layout_height="17.5dp"-->
-        <!--                android:background="@drawable/room_bg_wheat_time"-->
-        <!--                android:gravity="center"-->
-        <!--                android:text="00:00"-->
-        <!--                android:textColor="@color/white"-->
-        <!--                android:textSize="@dimen/sp_9"-->
-        <!--                android:visibility="gone"-->
-        <!--                android:layout_marginBottom="@dimen/dp_6"-->
-        <!--                app:layout_constraintBottom_toBottomOf="@id/riv"-->
-        <!--                app:layout_constraintEnd_toEndOf="@id/riv"-->
-        <!--                app:layout_constraintStart_toStartOf="@id/riv"-->
-        <!--                tools:visibility="visible" />-->
-
-        <TextView
-                android:id="@+id/tv_time"
-                android:layout_width="@dimen/dp_35"
-                android:layout_height="17.5dp"
-                android:background="@mipmap/za_s"
-                android:gravity="center"
-                android:text="00:00"
-                android:textColor="@color/white"
-                android:textSize="@dimen/sp_9"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                tools:visibility="visible"/>
-
-
-        <com.xscm.moduleutil.widget.AvatarFrameView
-                android:id="@+id/iv_frame"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginEnd="@dimen/dp_12"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        <View
-                android:id="@+id/view_riv_bottom"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="7dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"/>
-
-        <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/cl_guide1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.2"/>
-
-        <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingLeft="@dimen/dp_5"
-                android:paddingRight="@dimen/dp_5"
-                android:singleLine="true"
-                android:layout_marginTop="@dimen/dp_3"
-                android:textColor="@color/white"
-                android:textSize="@dimen/sp_10"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/riv"
-                tools:text="麦位1"
-                tools:textColor="@color/color_FF333333"/>
-
-        <com.xscm.moduleutil.widget.WheatCharmView
-                android:id="@+id/charm_view"
-                android:layout_width="@dimen/dp_52"
-                android:layout_height="@dimen/dp_12"
-                android:layout_marginBottom="@dimen/dp_5"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:visibility="visible"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toBottomOf="@id/tv_name"/>
-
-        <TextView
-                android:id="@+id/tv_time_pk"
-                android:layout_width="@dimen/dp_35"
-                android:layout_height="17.5dp"
-                android:background="@mipmap/za_s"
-                android:layout_marginBottom="@dimen/dp_5"
-                android:gravity="center"
-                android:text="00:00"
-                android:textColor="@color/white"
-                android:textSize="@dimen/sp_9"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toBottomOf="@id/tv_name"
-                tools:visibility="visible"/>
-
-        <ImageView
-                android:id="@+id/iv_shutup"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginBottom="4dp"
-                android:src="@mipmap/room_ic_wheat_shutup"
-                android:visibility="invisible"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintHeight_percent="0.05"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintWidth_percent="0.05"
-                tools:visibility="visible"/>
-
-        <ImageView
-                android:id="@+id/iv_online"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:scaleType="fitXY"
-                android:visibility="gone"
-                android:src="@mipmap/room_ic_owner_offline"
-                app:layout_constraintBottom_toBottomOf="@+id/riv"
-                app:layout_constraintEnd_toEndOf="@+id/riv"
-                app:layout_constraintStart_toStartOf="@+id/riv"
-                app:layout_constraintTop_toTopOf="@+id/riv"
-                tools:visibility="visible"/>
-
-        <com.xscm.moduleutil.widget.ExpressionImgView
-                android:id="@+id/iv_face"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toTopOf="@id/riv"
-                app:layout_constraintVertical_bias="0.0"/>
-
-        <ImageView
-                android:id="@+id/iv_gift"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:visibility="visible"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:0.6"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHeight_percent="0.7"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        <ImageView
-                android:id="@+id/iv_maozi"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_1"
-                android:scaleType="centerInside"
-                android:src="@mipmap/ic_room_huangguan"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="@id/iv_frame"
-                app:layout_constraintTop_toTopOf="@id/iv_frame"
-                tools:visibility="visible"/>
-
-        <TextView
-                android:id="@+id/tv_no"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@mipmap/ic_room_xq_wno_male"
-                android:gravity="center"
-                android:text="1"
-                android:textColor="#fff"
-                android:textSize="@dimen/sp_10"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/iv_frame"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                tools:visibility="visible"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <!--    <androidx.constraintlayout.widget.ConstraintLayout-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="match_parent"-->
-    <!--        android:clipChildren="false"-->
-    <!--        android:clipToPadding="false">-->
-
-
-    <!--        <com.qxcm.moduleutil.widget.GifAvatarOvalView-->
-    <!--            android:id="@+id/riv"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="0dp"-->
-    <!--            android:src="@mipmap/room_ic_wheat_default"-->
-    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--            app:layout_constraintDimensionRatio="1:1"-->
-    <!--            app:layout_constraintEnd_toEndOf="parent"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toTopOf="parent"-->
-    <!--            tools:visibility="visible" />-->
-    <!--        &lt;!&ndash;说话动态图&ndash;&gt;-->
-    <!--        <com.opensource.svgaplayer.SVGAImageView-->
-    <!--            android:id="@+id/iv_ripple"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="0dp"-->
-    <!--            app:autoPlay="false"-->
-    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--            app:layout_constraintDimensionRatio="1:1"-->
-    <!--            app:layout_constraintEnd_toEndOf="parent"-->
-    <!--            app:layout_constraintHeight_percent="0.8"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toTopOf="parent"-->
-    <!--            app:layout_constraintWidth_percent="0.8"-->
-    <!--            app:loopCount="0"-->
-    <!--            app:source="ripple3695.svga"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <ImageView-->
-    <!--            android:id="@+id/iv_sex"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="0dp"-->
-    <!--            android:background="@mipmap/common_ic_headportriat_base"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintBottom_toBottomOf="@id/riv"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            app:layout_constraintTop_toTopOf="@id/riv"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <View-->
-    <!--            android:id="@+id/view2"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            app:layout_constraintTop_toTopOf="@id/riv" />-->
-
-    <!--        <ImageView-->
-    <!--            android:id="@+id/iv_tag_boos"-->
-    <!--            android:layout_width="32dp"-->
-    <!--            android:layout_height="14dp"-->
-    <!--            android:src="@mipmap/room_ic_wheat_tag_boss"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintBottom_toTopOf="@id/view2"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <TextView-->
-    <!--            android:id="@+id/tv_time"-->
-    <!--            android:layout_width="@dimen/dp_35"-->
-    <!--            android:layout_height="17.5dp"-->
-    <!--            android:background="@mipmap/za_s"-->
-    <!--            android:gravity="center"-->
-    <!--            android:text="00:00"-->
-    <!--            android:textColor="@color/white"-->
-    <!--            android:textSize="@dimen/sp_9"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintBottom_toBottomOf="@id/riv"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <ImageView-->
-    <!--            android:id="@+id/iv_online"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:background="@mipmap/room_ic_owner_offline"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--            app:layout_constraintDimensionRatio="1:1"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            app:layout_constraintTop_toTopOf="parent"-->
-    <!--            app:loopCount="0"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <com.qxcm.moduleutil.widget.AvatarFrameView-->
-    <!--            android:id="@+id/iv_frame"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="0dp"-->
-    <!--            android:contentDescription="@null"-->
-    <!--            android:scaleType="fitXY"-->
-    <!--            app:autoPlay="true"-->
-    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--            app:layout_constraintDimensionRatio="1:1"-->
-    <!--            app:layout_constraintEnd_toEndOf="parent"-->
-    <!--            app:layout_constraintHeight_percent="0.1"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toTopOf="parent"-->
-    <!--            app:loopCount="0"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <View-->
-    <!--            android:id="@+id/view_riv_bottom"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            app:layout_constraintBottom_toBottomOf="@id/riv"-->
-    <!--            app:layout_constraintEnd_toEndOf="parent"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <ImageView-->
-    <!--            android:id="@+id/iv_tag_type"-->
-    <!--            android:layout_width="@dimen/dp_30"-->
-    <!--            android:layout_height="@dimen/dp_20"-->
-    <!--            android:src="@mipmap/zc"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintBottom_toBottomOf="@id/riv"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv" />-->
-
-    <!--        <TextView-->
-    <!--            android:id="@+id/tv_name"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:gravity="center"-->
-    <!--            android:paddingLeft="@dimen/dp_5"-->
-    <!--            android:paddingRight="@dimen/dp_5"-->
-    <!--            android:singleLine="true"-->
-    <!--            android:textColor="@color/white"-->
-    <!--            android:textSize="@dimen/sp_9"-->
-    <!--            app:layout_constraintEnd_toEndOf="parent"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toBottomOf="@id/riv"-->
-    <!--            tools:text="麦位1"-->
-    <!--            tools:textColor="@color/color_FF333333"-->
-    <!--            tools:visibility="visible" />-->
-    <!--        &lt;!&ndash;        心动&ndash;&gt;-->
-    <!--        <com.qxcm.moduleutil.widget.WheatCharmView-->
-    <!--            android:id="@+id/charm_view"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:clipChildren="false"-->
-    <!--            android:clipToPadding="false"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/tv_name"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/tv_name"-->
-    <!--            app:layout_constraintTop_toBottomOf="@id/tv_name"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <ImageView-->
-    <!--            android:id="@+id/iv_shutup"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="0dp"-->
-    <!--            android:layout_marginRight="5dp"-->
-    <!--            android:layout_marginBottom="4dp"-->
-    <!--            android:src="@mipmap/room_ic_wheat_shutup"-->
-    <!--            android:visibility="invisible"-->
-    <!--            app:layout_constraintBottom_toBottomOf="@id/riv"-->
-    <!--            app:layout_constraintHeight_percent="0.018"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            app:layout_constraintWidth_percent="0.018"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <com.qxcm.moduleutil.widget.ExpressionImgView-->
-    <!--            android:id="@+id/iv_face"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="0dp"-->
-    <!--            app:layout_constraintBottom_toBottomOf="@id/riv"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintHorizontal_bias="1.0"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            app:layout_constraintTop_toTopOf="@id/riv"-->
-    <!--            app:layout_constraintVertical_bias="0.0" />-->
-
-    <!--        <android.gesture.GestureOverlayView-->
-    <!--            android:id="@+id/game_imgview"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--            app:layout_constraintEnd_toEndOf="parent"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-    <!--        <ImageView-->
-    <!--            android:id="@+id/iv_gift"-->
-    <!--            android:layout_width="0dp"-->
-    <!--            android:layout_height="0dp"-->
-    <!--            android:visibility="visible"-->
-    <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--            app:layout_constraintDimensionRatio="1:1"-->
-    <!--            app:layout_constraintEnd_toEndOf="parent"-->
-    <!--            app:layout_constraintHeight_percent="0.2"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-    <!--        <ImageView-->
-    <!--            android:id="@+id/iv_maozi"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:layout_marginLeft="@dimen/dp_10"-->
-    <!--            android:layout_marginTop="@dimen/dp_1"-->
-    <!--            android:scaleType="centerInside"-->
-    <!--            android:src="@mipmap/ic_room_huangguan"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/iv_frame"-->
-    <!--            app:layout_constraintTop_toTopOf="@id/iv_frame"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--        <TextView-->
-    <!--            android:id="@+id/tv_no"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:background="@mipmap/ic_room_xq_wno_male"-->
-    <!--            android:gravity="center"-->
-    <!--            android:text="1"-->
-    <!--            android:textColor="#fff"-->
-    <!--            android:textSize="@dimen/sp_10"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:layout_constraintBottom_toBottomOf="@id/iv_frame"-->
-    <!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-    <!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-    <!--            tools:visibility="visible" />-->
-
-    <!--    </androidx.constraintlayout.widget.ConstraintLayout>-->
-</layout>
\ No newline at end of file
diff --git a/MainModule/src/main/res/layout/room_view_friendship_wheat.xml b/MainModule/src/main/res/layout/room_view_friendship_wheat.xml
deleted file mode 100644
index 0181a088..00000000
--- a/MainModule/src/main/res/layout/room_view_friendship_wheat.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-        <!-- 头像，圆形，占整个布局的一半 -->
-        <com.xscm.moduleutil.widget.GifAvatarOvalView
-            android:id="@+id/riv"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/dp_12"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.0"
-            android:src="@mipmap/jiaoy"/>
-
-        <!-- 头像框，与头像大小相同，覆盖在头像上 -->
-        <com.xscm.moduleutil.widget.AvatarFrameView
-            android:id="@+id/iv_frame"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="-4dp"
-            android:layout_marginEnd="-4dp"
-            android:layout_marginTop="-4dp"
-            android:layout_marginBottom="-4dp"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            app:layout_constraintBottom_toBottomOf="@id/riv"/>
-
-        <!-- 说话麦圈，与头像大小相同，覆盖在头像上 -->
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/iv_ripple"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:autoPlay="false"
-            app:layout_constraintHeight_percent="0.95"
-            app:layout_constraintWidth_percent="1"
-            app:layout_constraintBottom_toBottomOf="@id/iv_frame"
-            app:layout_constraintEnd_toEndOf="@id/iv_frame"
-            app:layout_constraintStart_toStartOf="@id/iv_frame"
-            app:layout_constraintTop_toTopOf="@id/iv_frame"
-            app:loopCount="0"
-            app:source="mic.svga" />
-
-<!--        <com.xscm.moduleutil.widget.AvatarFrameView-->
-<!--            android:id="@+id/iv_ripple"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="0dp"-->
-<!--            app:layout_constraintBottom_toBottomOf="@id/riv"-->
-<!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-<!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-<!--            app:layout_constraintTop_toTopOf="@id/riv"-->
-<!--            />-->
-
-
-
-        <ImageView
-            android:id="@+id/iv_online"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@mipmap/room_ic_owner_offline"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            app:loopCount="0"
-            tools:visibility="visible" />
-
-        <!-- 用户标记，在头像下方，覆盖一点头像 -->
-        <ImageView
-            android:id="@+id/iv_tag_type"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_12"
-            android:layout_marginTop="-15dp"
-            android:src="@mipmap/zc"
-            android:scaleType="fitCenter"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toBottomOf="@id/riv"
-            android:visibility="gone"/>
-
-        <!-- 用户名称，在标记下面 -->
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingLeft="@dimen/dp_5"
-            android:paddingRight="@dimen/dp_5"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toBottomOf="@id/iv_tag_type"
-            tools:text="麦位1"
-            tools:textColor="@color/color_FF333333" />
-
-        <!-- 火热值，在名称下面 -->
-        <com.xscm.moduleutil.widget.WheatCharmView
-            android:id="@+id/charm_view"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_12"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:visibility="visible"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toBottomOf="@id/tv_name" />
-
-        <!-- 助力按钮，在火热值下面 -->
-<!--        <Button-->
-<!--            android:id="@+id/btn_assist"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="助力"-->
-<!--            app:layout_constraintEnd_toEndOf="@id/riv"-->
-<!--            app:layout_constraintStart_toStartOf="@id/riv"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/charm_view"-->
-<!--            android:visibility="gone"/>-->
-
-        <TextView
-            android:id="@+id/tv_zhul"
-            android:layout_width="@dimen/dp_44"
-            android:layout_height="@dimen/dp_20"
-            android:visibility="invisible"
-            android:gravity="center"
-            android:text="助力"
-            android:textSize="@dimen/sp_12"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toBottomOf="@id/tv_name"
-            tools:visibility="visible"
-            />
-
-        <!-- 其他可选组件保持原样，但根据需要可能需要调整约束 -->
-        <ImageView
-            android:id="@+id/iv_sex"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@mipmap/common_ic_headportriat_base"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/iv_tag_boos"
-            android:layout_width="32dp"
-            android:layout_height="14dp"
-            android:src="@mipmap/room_ic_wheat_tag_boss"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toBottomOf="@id/iv_sex"
-            tools:visibility="gone" />
-
-        <TextView
-            android:id="@+id/tv_time"
-            android:layout_width="@dimen/dp_35"
-            android:layout_height="17.5dp"
-            android:background="@mipmap/za_s"
-            android:gravity="center"
-            android:text="00:00"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_9"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="gone" />
-
-        <TextView
-            android:id="@+id/tv_time_pk"
-            android:layout_width="@dimen/dp_35"
-            android:layout_height="17.5dp"
-            android:background="@mipmap/za_s"
-            android:layout_marginBottom="@dimen/dp_5"
-            android:gravity="center"
-            android:text="00:00"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_9"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toBottomOf="@id/tv_name"
-            tools:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/iv_shutup"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="4dp"
-            android:src="@mipmap/room_ic_wheat_shutup"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintHeight_percent="0.05"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintWidth_percent="0.05"
-            tools:visibility="visible" />
-
-
-
-        <com.xscm.moduleutil.widget.ExpressionImgView
-            android:id="@+id/iv_face"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            app:layout_constraintVertical_bias="0.0" />
-
-        <ImageView
-            android:id="@+id/iv_gift"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:0.6"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_percent="0.7"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_maozi"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_1"
-            android:scaleType="centerInside"
-            android:src="@mipmap/ic_room_huangguan"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="@id/iv_frame"
-            app:layout_constraintTop_toTopOf="@id/iv_frame"
-            tools:visibility="gone" />
-
-        <TextView
-            android:id="@+id/tv_no"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@mipmap/ic_room_xq_wno_male"
-            android:gravity="center"
-            android:text="1"
-            android:textColor="#fff"
-            android:textSize="@dimen/sp_10"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/iv_frame"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="gone" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/MainModule/src/main/res/layout/room_view_ktv_wheat.xml b/MainModule/src/main/res/layout/room_view_ktv_wheat.xml
deleted file mode 100644
index 435a835c..00000000
--- a/MainModule/src/main/res/layout/room_view_ktv_wheat.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-        <!--说话动态图 (麦圈) - 与头像大小相同-->
-
-<!--        <com.xscm.moduleutil.widget.AvatarFrameView-->
-<!--            android:id="@+id/iv_ripple"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="0dp"-->
-<!--            app:layout_constraintTop_toTopOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintDimensionRatio="1:1"-->
-<!--            app:layout_constraintHeight_default="percent"-->
-<!--            app:layout_constraintHeight_percent="0.5"-->
-<!--            />-->
-        <!--头像 - 占整体高度的一半-->
-
-
-
-
-        <!--头像框 - 比头像大2dp-->
-
-
-        <com.xscm.moduleutil.widget.GifAvatarOvalView
-            android:id="@+id/riv"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/dp_12"
-            android:layout_marginEnd="@dimen/dp_12"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
-            android:src="@mipmap/room_ic_wheat_default"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintHeight_default="percent"
-            app:layout_constraintHeight_percent="0.5" />
-
-        <com.xscm.moduleutil.widget.AvatarFrameView
-            android:id="@+id/iv_frame"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:scaleType="fitXY"
-            app:autoPlay="true"
-            app:layout_constraintBottom_toBottomOf="@+id/riv"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:loopCount="0"
-            tools:visibility="visible" />
-
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/iv_ripple"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:autoPlay="false"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintHeight_default="percent"
-            app:layout_constraintHeight_percent="0.52"
-            app:loopCount="0"
-            app:source="mic.svga" />
-
-
-        <!--离线状态 - 和头像框一样大，在标签下面-->
-        <ImageView
-            android:id="@+id/iv_online"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            android:src="@mipmap/room_ic_owner_offline"
-            android:scaleType="centerCrop"
-            app:layout_constraintTop_toTopOf="@id/iv_frame"
-            app:layout_constraintStart_toStartOf="@id/iv_frame"
-            app:layout_constraintEnd_toEndOf="@id/iv_frame"
-            app:layout_constraintBottom_toBottomOf="@id/iv_frame"
-            app:loopCount="0"
-            tools:visibility="visible" />
-
-        <!--标签位置 - 在头像底部，覆盖5dp头像-->
-        <ImageView
-            android:id="@+id/iv_tag_type"
-            android:layout_width="@dimen/dp_30"
-            android:layout_height="@dimen/dp_20"
-            android:src="@mipmap/zc"
-            app:layout_constraintTop_toBottomOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            android:layout_marginTop="-10dp" />
-
-        <!--名称 - 在标签下面-->
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingLeft="@dimen/dp_5"
-            android:paddingRight="@dimen/dp_5"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
-            app:layout_constraintTop_toBottomOf="@id/iv_tag_type"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:text="麦位1"
-            tools:textColor="@color/color_FF333333" />
-
-        <!--心动值 - 在名称下面-->
-        <com.xscm.moduleutil.widget.WheatCharmView
-            android:id="@+id/charm_view"
-            android:layout_width="@dimen/dp_52"
-            android:layout_height="@dimen/dp_12"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:visibility="visible"
-            app:layout_constraintTop_toBottomOf="@id/tv_name"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <!--其他辅助视图保持不变-->
-        <ImageView
-            android:id="@+id/iv_sex"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@mipmap/common_ic_headportriat_base"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            tools:visibility="visible" />
-
-        <View
-            android:id="@+id/view2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv" />
-
-        <ImageView
-            android:id="@+id/iv_tag_boos"
-            android:layout_width="32dp"
-            android:layout_height="14dp"
-            android:src="@mipmap/room_ic_wheat_tag_boss"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/view2"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/tv_time"
-            android:layout_width="@dimen/dp_35"
-            android:layout_height="17.5dp"
-            android:background="@mipmap/za_s"
-            android:gravity="center"
-            android:text="00:00"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_9"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="visible" />
-
-        <View
-            android:id="@+id/view_riv_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="7dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/cl_guide1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.2" />
-
-        <TextView
-            android:id="@+id/tv_time_pk"
-            android:layout_width="@dimen/dp_35"
-            android:layout_height="17.5dp"
-            android:background="@mipmap/za_s"
-            android:layout_marginBottom="@dimen/dp_5"
-            android:gravity="center"
-            android:text="00:00"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_9"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toBottomOf="@id/tv_name"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/iv_shutup"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="4dp"
-            android:src="@mipmap/room_ic_wheat_shutup"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintHeight_percent="0.05"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintWidth_percent="0.05"
-            tools:visibility="visible" />
-
-        <com.xscm.moduleutil.widget.ExpressionImgView
-            android:id="@+id/iv_face"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            app:layout_constraintVertical_bias="0.0" />
-
-        <ImageView
-            android:id="@+id/iv_gift"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_percent="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_maozi"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_1"
-            android:scaleType="centerInside"
-            android:src="@mipmap/ic_room_huangguan"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="@id/iv_frame"
-            app:layout_constraintTop_toTopOf="@id/iv_frame"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/tv_no"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@mipmap/ic_room_xq_wno_male"
-            android:gravity="center"
-            android:text="1"
-            android:textColor="#fff"
-            android:textSize="@dimen/sp_10"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/iv_frame"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="visible" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
diff --git a/MainModule/src/main/res/layout/room_view_make_wheat.xml b/MainModule/src/main/res/layout/room_view_make_wheat.xml
deleted file mode 100644
index 712cd0f7..00000000
--- a/MainModule/src/main/res/layout/room_view_make_wheat.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-
-        <com.xscm.moduleutil.widget.GifAvatarOvalView
-            android:id="@+id/riv"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_40"
-            android:src="@mipmap/room_ic_wheat_default"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-
-        <com.xscm.moduleutil.widget.AvatarFrameView
-            android:id="@+id/iv_frame"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:scaleType="fitXY"
-            app:autoPlay="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:loopCount="0"
-            tools:visibility="visible" />
-
-        <!--说话动态图-->
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/iv_ripple"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:autoPlay="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_percent="0.8"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_percent="0.8"
-            app:loopCount="0"
-            app:source="mic.svga"
-            tools:visibility="visible" />
-
-        <!--        <com.xscm.moduleutil.widget.AvatarFrameView-->
-        <!--            android:id="@+id/iv_ripple"-->
-        <!--            android:layout_width="0dp"-->
-        <!--            android:layout_height="0dp"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintDimensionRatio="1:1"-->
-        <!--            app:layout_constraintHeight_percent="0.8"-->
-        <!--            app:layout_constraintWidth_percent="0.8"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toTopOf="parent"-->
-        <!--            />-->
-
-        <ImageView
-            android:id="@+id/iv_sex"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@mipmap/common_ic_headportriat_base"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            tools:visibility="visible" />
-
-        <View
-            android:id="@+id/view2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv" />
-
-        <ImageView
-            android:id="@+id/iv_tag_boos"
-            android:layout_width="32dp"
-            android:layout_height="14dp"
-            android:src="@mipmap/room_ic_wheat_tag_boss"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/view2"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/tv_time"
-            android:layout_width="@dimen/dp_35"
-            android:layout_height="17.5dp"
-            android:background="@mipmap/za_s"
-            android:gravity="center"
-            android:text="00:00"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_9"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/iv_online"
-            android:layout_width="@dimen/dp_45"
-            android:layout_height="@dimen/dp_45"
-            android:background="@mipmap/room_ic_owner_offline"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="parent"
-            app:loopCount="0"
-            tools:visibility="visible" />
-
-
-        <View
-            android:id="@+id/view_riv_bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/iv_tag_type"
-            android:layout_width="@dimen/dp_30"
-            android:layout_height="@dimen/dp_20"
-            android:src="@mipmap/zc"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintStart_toStartOf="@id/riv" />
-
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingLeft="@dimen/dp_5"
-            android:paddingRight="@dimen/dp_5"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_9"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/riv"
-            tools:text="麦位1"
-            tools:textColor="@color/color_FF333333"
-            tools:visibility="visible" />
-        <!--        心动-->
-        <com.xscm.moduleutil.widget.WheatCharmView
-            android:id="@+id/charm_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/tv_name"
-            app:layout_constraintStart_toStartOf="@id/tv_name"
-            app:layout_constraintTop_toBottomOf="@id/tv_name"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/iv_shutup"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="4dp"
-            android:src="@mipmap/room_ic_wheat_shutup"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintHeight_percent="0.018"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintWidth_percent="0.018"
-            tools:visibility="visible" />
-
-        <com.xscm.moduleutil.widget.ExpressionImgView
-            android:id="@+id/iv_face"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="@id/riv"
-            app:layout_constraintEnd_toEndOf="@id/riv"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="@id/riv"
-            app:layout_constraintTop_toTopOf="@id/riv"
-            app:layout_constraintVertical_bias="0.0" />
-
-        <android.gesture.GestureOverlayView
-            android:id="@+id/game_imgview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_gift"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_percent="0.2"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/MainModule/src/main/res/layout/room_view_sing_wheat.xml b/MainModule/src/main/res/layout/room_view_sing_wheat.xml
deleted file mode 100644
index 32f6c81a..00000000
--- a/MainModule/src/main/res/layout/room_view_sing_wheat.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-        <!--说话动态图-->
-        <com.xscm.moduleutil.widget.CircularImage
-                android:id="@+id/riv"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginEnd="@dimen/dp_12"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                android:src="@mipmap/room_ic_wheat_default"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
-        <com.xscm.moduleutil.widget.AvatarFrameView
-                android:id="@+id/iv_frame"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:layout_marginTop="@dimen/dp_10"
-                app:layout_constraintHeight_percent="0.9"
-                app:layout_constraintWidth_percent="0.8"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/iv_ripple"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/dp_8"
-            app:autoPlay="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHeight_percent="1"
-            app:layout_constraintWidth_percent="1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:loopCount="0"
-            app:source="mic.svga" />
-
-        <ImageView
-                android:id="@+id/iv_sex"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="@mipmap/common_ic_headportriat_base"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toTopOf="@id/riv"
-                tools:visibility="visible" />
-
-        <View
-                android:id="@+id/view2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toTopOf="@id/riv" />
-
-        <ImageView
-                android:id="@+id/iv_tag_boos"
-                android:layout_width="32dp"
-                android:layout_height="14dp"
-                android:src="@mipmap/room_ic_wheat_tag_boss"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@id/view2"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                tools:visibility="visible" />
-
-        <ImageView
-                android:id="@+id/iv_tag_type"
-                android:layout_width="@dimen/dp_30"
-                android:layout_height="@dimen/dp_20"
-                android:layout_marginTop="@dimen/dp_5"
-                android:src="@mipmap/zc"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv" />
-
-
-        <TextView
-                android:id="@+id/tv_time"
-                android:layout_width="@dimen/dp_35"
-                android:layout_height="17.5dp"
-                android:background="@mipmap/za_s"
-                android:gravity="center"
-                android:text="00:00"
-                android:textColor="@color/white"
-                android:textSize="@dimen/sp_9"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                tools:visibility="visible" />
-
-
-
-
-        <View
-                android:id="@+id/view_riv_bottom"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="7dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/cl_guide1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.2" />
-
-        <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:paddingLeft="@dimen/dp_5"
-                android:paddingRight="@dimen/dp_5"
-                android:singleLine="true"
-                android:layout_marginTop="@dimen/dp_6"
-                android:textColor="@color/white"
-                android:translationZ="@dimen/dp_10"
-                android:textSize="@dimen/sp_10"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/riv"
-                tools:text="麦位1"
-                tools:textColor="@color/color_FF333333" />
-
-        <com.xscm.moduleutil.widget.WheatCharmView
-                android:id="@+id/charm_view"
-                android:layout_width="@dimen/dp_52"
-                android:layout_height="@dimen/dp_12"
-                android:layout_marginBottom="@dimen/dp_5"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:visibility="visible"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toBottomOf="@id/tv_name" />
-
-        <TextView
-                android:id="@+id/tv_time_pk"
-                android:layout_width="@dimen/dp_35"
-                android:layout_height="17.5dp"
-                android:background="@mipmap/za_s"
-                android:layout_marginBottom="@dimen/dp_5"
-                android:gravity="center"
-                android:text="00:00"
-                android:textColor="@color/white"
-                android:textSize="@dimen/sp_9"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toBottomOf="@id/tv_name"
-                tools:visibility="visible" />
-
-        <ImageView
-                android:id="@+id/iv_shutup"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginRight="5dp"
-                android:layout_marginBottom="4dp"
-                android:src="@mipmap/room_ic_wheat_shutup"
-                android:visibility="invisible"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintHeight_percent="0.05"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintWidth_percent="0.05"
-                tools:visibility="visible" />
-
-        <ImageView
-                android:id="@+id/iv_online"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="@mipmap/room_ic_owner_offline"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHeight_percent="0.82"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="@dimen/dp_10"
-                app:loopCount="0"
-                tools:visibility="visible" />
-
-        <com.xscm.moduleutil.widget.ExpressionImgView
-                android:id="@+id/iv_face"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/riv"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                app:layout_constraintTop_toTopOf="@id/riv"
-                app:layout_constraintVertical_bias="0.0" />
-
-        <ImageView
-                android:id="@+id/iv_gift"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:visibility="visible"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:0.6"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHeight_percent="0.7"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-                android:id="@+id/iv_maozi"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_1"
-                android:scaleType="centerInside"
-                android:src="@mipmap/ic_room_huangguan"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="@id/iv_frame"
-                app:layout_constraintTop_toTopOf="@id/iv_frame"
-                tools:visibility="visible" />
-
-        <TextView
-                android:id="@+id/tv_no"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@mipmap/ic_room_xq_wno_male"
-                android:gravity="center"
-                android:text="1"
-                android:textColor="#fff"
-                android:textSize="@dimen/sp_10"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@id/iv_frame"
-                app:layout_constraintEnd_toEndOf="@id/riv"
-                app:layout_constraintStart_toStartOf="@id/riv"
-                tools:visibility="visible" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file