diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
index 8f2ace015..696929027 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
@@ -34,6 +34,15 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
      */
     override fun bindToRecyclerView(recyclerView: RecyclerView) {
         val layoutManager = GridLayoutManager(context, 4)
+        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+            override fun getSpanSize(position: Int): Int {
+                return if (position == 0) {
+                    4
+                } else {
+                    1
+                }
+            }
+        }
         layoutManager.orientation = LinearLayoutManager.VERTICAL
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = this
@@ -55,12 +64,12 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
     override fun microType() = MICRO_TYPE_DATING
 
 
-    private inner class DatingMicroViewHolder constructor(itemView: View) :GiftValueViewHolder(itemView) {
+    private inner class DatingMicroViewHolder constructor(itemView: View) : GiftValueViewHolder(itemView) {
 
         private val viewGenderBg: View = itemView.findViewById(R.id.view_gender_bg)
         private val tvSelectedStatus: TextView = itemView.findViewById(R.id.tv_selected_status)
         private val ivCap: ImageView = itemView.findViewById(R.id.iv_cap)
-        private val ivValue: ImageView = itemView.findViewById(R.id.iv_value_icon)
+        //private val ivValue: ImageView = itemView.findViewById(R.id.iv_value_icon)
 
         @SuppressLint("SetTextI18n")
         public override fun bind(info: RoomQueueInfo, position: Int) {
@@ -72,7 +81,7 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
             if (roomMicInfo != null) {
                 viewGenderBg.setBackgroundResource(if (manMicro) R.drawable.shape_circle_micro_man_bg else R.drawable.shape_circle_micro_woman_bg)
                 tvSelectedStatus.setBackgroundResource(if (manMicro) R.drawable.selector_dating_select_man_bg else R.drawable.selector_dating_select_woman_bg)
-                ivValue.setImageResource(if (manMicro) R.drawable.icon_gift_value_man else R.drawable.icon_gift_value)
+                //ivValue.setImageResource(if (manMicro) R.drawable.icon_gift_value_man else R.drawable.icon_gift_value)
             }
             info.mChatRoomMember?.let {
 
@@ -109,9 +118,10 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
 
     }
 
-    inner class DatingBossMicroViewHolder internal constructor(itemView: View) :BossMicroViewHolder(itemView) {
+    inner class DatingBossMicroViewHolder internal constructor(itemView: View) : BossMicroViewHolder(itemView) {
 
         private val radioGroup: RadioGroup = itemView.findViewById(R.id.radio_group)
+
         public override fun bind(info: RoomQueueInfo, position: Int) {
             super.bind(info, position)
             val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo ?: return
diff --git a/app/src/main/res/layout/include_mic_charm_layout.xml b/app/src/main/res/layout/include_mic_charm_layout.xml
index 07ff1ce41..8c19d51b0 100644
--- a/app/src/main/res/layout/include_mic_charm_layout.xml
+++ b/app/src/main/res/layout/include_mic_charm_layout.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_50"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cl_parent_gift_value"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -42,6 +43,7 @@
             android:orientation="horizontal">
 
             <ImageView
+                android:id="@+id/iv_value_icon"
                 android:layout_width="8dp"
                 android:layout_height="8dp"
                 android:layout_gravity="center_vertical"
@@ -57,9 +59,11 @@
                 android:layout_marginStart="3dp"
                 android:layout_marginEnd="5dp"
                 android:gravity="center"
-                android:text="9999万+"
+                tools:text="9999万+"
                 android:textColor="@color/white"
                 android:textSize="9dp" />
         </LinearLayout>
+
     </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_micro_dating.xml b/app/src/main/res/layout/item_micro_dating.xml
index 249aa2f3b..fd6a1a4be 100644
--- a/app/src/main/res/layout/item_micro_dating.xml
+++ b/app/src/main/res/layout/item_micro_dating.xml
@@ -1,5 +1,4 @@
 <?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"
@@ -46,7 +45,7 @@
             android:layout_gravity="center"
             android:background="@drawable/shape_circle_micro_man_bg" />
 
-        <ImageView
+        <com.yizhuan.erban.common.widget.CircleImageView
             android:id="@+id/avatar"
             android:layout_width="55dp"
             android:layout_height="55dp"
@@ -88,11 +87,14 @@
 
         <ImageView
             android:id="@+id/mute_image"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:layout_gravity="center"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:scaleType="fitCenter"
             android:src="@drawable/icon_room_mute_micro"
-            android:visibility="invisible"
+            android:visibility="visible"
             tools:visibility="visible" />
 
 
@@ -110,7 +112,7 @@
         app:layout_constraintTop_toBottomOf="@id/micro_layout">
 
         <TextView
-            android:id="@+id/tv_position"
+            android:id="@+id/tv_number"
             android:layout_width="13dp"
             android:layout_height="13dp"
             android:layout_marginRight="2dp"
@@ -151,44 +153,10 @@
         app:layout_constraintTop_toBottomOf="@id/ll_nick"
         app:solid="#33ffffff" />
 
-    <LinearLayout
-        android:id="@+id/ll_charm_click"
-        android:layout_width="wrap_content"
+    <include
+        layout="@layout/include_mic_charm_layout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:background="@drawable/shape_bg_of_mic_charm"
-        android:minWidth="30dp"
-        android:orientation="horizontal"
-        android:paddingTop="1dp"
-        android:paddingBottom="1dp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@id/micro_layout"
-        app:layout_constraintTop_toTopOf="@id/micro_layout"
-        tools:visibility="visible">
-
-
-        <ImageView
-            android:id="@+id/iv_value_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
-            android:src="@drawable/icon_gift_value" />
-
-        <TextView
-            android:id="@+id/tv_charm_value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="3dp"
-            android:layout_marginEnd="5dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:minWidth="10dp"
-            android:text="0"
-            android:textColor="@color/white"
-            android:textSize="9dp"
-            tools:text="9999万+" />
-    </LinearLayout>
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_micro_dating_boss.xml b/app/src/main/res/layout/item_micro_dating_boss.xml
index 6b0786601..da9ac0aed 100644
--- a/app/src/main/res/layout/item_micro_dating_boss.xml
+++ b/app/src/main/res/layout/item_micro_dating_boss.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center" />
 
-        <ImageView
+        <com.yizhuan.erban.common.widget.CircleImageView
             android:id="@+id/avatar"
             android:layout_width="60dp"
             android:layout_height="60dp"
@@ -77,9 +77,12 @@
 
         <ImageView
             android:id="@+id/mute_image"
-            android:layout_width="65dp"
-            android:layout_height="65dp"
-            android:layout_gravity="center"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_gravity="bottom|end"
+            android:scaleType="fitCenter"
+            android:layout_marginBottom="10dp"
+            android:layout_marginEnd="10dp"
             android:src="@drawable/icon_room_mute_micro"
             android:visibility="invisible"
             tools:visibility="visible" />
@@ -96,7 +99,7 @@
     </FrameLayout>
 
     <TextView
-        android:id="@+id/tv_position"
+        android:id="@+id/tv_number"
         android:layout_width="13dp"
         android:layout_height="13dp"
         android:layout_marginRight="5dp"
@@ -111,56 +114,103 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:textColor="#000" />
 
-    <TextView
-        android:id="@+id/nick"
+    <LinearLayout
+        android:id="@+id/rl_nick"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawablePadding="@dimen/dp_3"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/white"
-        android:textSize="11sp"
-        android:visibility="visible"
+        android:layout_centerHorizontal="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/micro_layout"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="我是名字" />
+        app:layout_constraintTop_toBottomOf="@id/micro_layout">
 
-    <LinearLayout
-        android:id="@+id/desc_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="17.5dp"
-        android:layout_marginTop="10dp"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="@id/micro_layout"
-        app:layout_constraintStart_toEndOf="@id/micro_layout"
-        app:layout_constraintTop_toBottomOf="@id/nick">
+        <include
+            android:id="@+id/in_official_mask"
+            layout="@layout/layout_official_mask"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="center"
+            android:layout_marginEnd="5.5dp"
+            android:visibility="visible" />
+
+        <LinearLayout
+            android:id="@+id/ll_nick"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/iv_tag"
+                android:layout_width="wrap_content"
+                android:layout_height="15dp"
+                android:layout_marginRight="5dp" />
+
+            <TextView
+                android:id="@+id/nick"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxWidth="120dp"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:text=""
+                android:textColor="@color/white"
+                android:textSize="13sp"
+                tools:text="我是名字" />
+        </LinearLayout>
 
     </LinearLayout>
 
-    <com.coorchice.library.SuperTextView
-        android:id="@+id/stv_clock"
-        android:layout_width="50dp"
-        android:layout_height="@dimen/dp_14"
-        android:layout_below="@id/nick"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="2dp"
+    <LinearLayout
+        android:id="@+id/desc_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="@dimen/dp_10"
         android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingRight="@dimen/dp_10"
-        android:textColor="@color/white"
-        android:textSize="10sp"
-        android:visibility="gone"
-        app:corner="@dimen/dp_10"
-        app:layout_constraintEnd_toEndOf="@id/micro_layout"
-        app:layout_constraintStart_toStartOf="@id/micro_layout"
-        app:layout_constraintTop_toBottomOf="@id/nick"
-        app:solid="#33ffffff"
-        tools:visibility="visible" />
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/rl_nick">
+
+        <TextView
+            android:id="@+id/tv_room_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_bg_room_tag"
+            android:gravity="center"
+            android:paddingStart="6dp"
+            android:paddingTop="2dp"
+            android:paddingEnd="6dp"
+            android:paddingBottom="2dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_9"
+            android:visibility="gone"
+            tools:text="交友" />
+
+        <TextView
+            android:id="@+id/tv_room_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginBottom="1px"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLength="15"
+            android:maxLines="1"
+            android:text="@string/room_manager_edit_desc"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/sp_11"
+            tools:text="请点击设置编辑房间话题设置编辑房间话题设置编辑房间话题设置编辑房间话题" />
+
+        <ImageView
+            android:id="@+id/iv_room_can_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="4.5dp"
+            android:src="@drawable/icon_room_desc_edit" />
+    </LinearLayout>
 
     <RadioGroup
         android:id="@+id/radio_group"
@@ -173,7 +223,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/stv_clock">
+        app:layout_constraintTop_toBottomOf="@id/desc_layout">
 
         <RadioButton
             android:id="@+id/rb_step_free"
@@ -227,40 +277,73 @@
 
     </RadioGroup>
 
-    <LinearLayout
-        android:id="@+id/ll_charm_click"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:background="@drawable/shape_bg_of_mic_charm"
-        android:minWidth="30dp"
-        android:paddingTop="1dp"
-        android:paddingBottom="1dp"
-        app:layout_constraintEnd_toEndOf="@id/micro_layout"
-        app:layout_constraintTop_toTopOf="@id/micro_layout">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_parent_gift_value"
+        android:layout_width="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_height="@dimen/dp_50">
 
-        <ImageView
+        <View
+            android:id="@+id/view_center"
+            android:layout_width="1dp"
+            android:layout_height="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/view_center_of_charm"
+            android:layout_width="1dp"
+            android:layout_height="1dp"
+            android:layout_marginStart="18dp"
+            android:layout_marginTop="18.25dp"
+            app:layout_constraintStart_toEndOf="@id/view_center"
+            app:layout_constraintTop_toBottomOf="@id/view_center"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/ll_charm_click"
+            android:paddingTop="@dimen/dp_5"
+            android:paddingBottom="@dimen/dp_5"
+            app:layout_constraintBottom_toBottomOf="@id/view_center_of_charm"
+            app:layout_constraintEnd_toEndOf="@id/view_center_of_charm"
+            app:layout_constraintStart_toStartOf="@id/view_center_of_charm"
+            app:layout_constraintTop_toTopOf="@id/view_center_of_charm"
+            android:orientation="horizontal"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
-            android:src="@drawable/icon_gift_value" />
+            android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/tv_charm_value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="3dp"
-            android:layout_marginEnd="5dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:minWidth="10dp"
-            android:textColor="@color/white"
-            android:textSize="9dp"
-            tools:text="0" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="15dp"
+                android:background="@drawable/shape_bg_of_mic_charm"
+                android:orientation="horizontal">
 
-    </LinearLayout>
+                <ImageView
+                    android:id="@+id/iv_value_icon"
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="4dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/icon_gift_value" />
+
+                <TextView
+                    android:id="@+id/tv_charm_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center"
+                    android:text="9999万+"
+                    android:textColor="@color/white"
+                    android:textSize="9dp" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ImageView
         android:id="@+id/iv_red_package"
diff --git a/app/src/main/res/layout/layout_micro_view.xml b/app/src/main/res/layout/layout_micro_view.xml
index 8bbee33da..0f1f1c46a 100644
--- a/app/src/main/res/layout/layout_micro_view.xml
+++ b/app/src/main/res/layout/layout_micro_view.xml
@@ -29,7 +29,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/view_ktv"
             android:layout_centerHorizontal="true"
diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
index cd7ca5000..f8100f158 100644
--- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
+++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
@@ -133,24 +133,6 @@
                 android:src="@mipmap/ic_speedymsg_close" />
         </FrameLayout>
 
-        <com.coorchice.library.SuperTextView
-            android:id="@+id/tv_dating_next"
-            android:layout_width="65dp"
-            android:layout_height="30dp"
-            android:layout_below="@id/micro_view"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="心动选人"
-            android:textColor="@color/white"
-            android:visibility="gone"
-            app:corner="15dp"
-            app:shaderEnable="true"
-            app:shaderEndColor="#FA7187"
-            app:shaderMode="rightToLeft"
-            app:shaderStartColor="#FA4771" />
-
-
         <com.yizhuan.erban.avroom.widget.BottomView
             android:id="@+id/bottom_view"
             android:layout_width="wrap_content"
@@ -169,6 +151,22 @@
             android:layout_marginEnd="90dp"
             android:layout_marginBottom="@dimen/dp_10" />
 
+        <com.coorchice.library.SuperTextView
+            android:id="@+id/tv_dating_next"
+            android:layout_width="65dp"
+            android:layout_height="30dp"
+            android:layout_below="@id/micro_view"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="心动选人"
+            android:textColor="@color/white"
+            android:visibility="gone"
+            app:corner="15dp"
+            app:shaderEnable="true"
+            app:shaderEndColor="#FA7187"
+            app:shaderMode="rightToLeft"
+            app:shaderStartColor="#FA4771" />
 
         <ViewStub
             android:id="@+id/vs_avroom_mentoring_count_down_timer"
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
index 04c5a5b6d..45abc9282 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
@@ -28,7 +28,7 @@ import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo;
 import com.yizhuan.xchat_android_core.room.game.GameModel;
 import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
 import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent;
-import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RoomModeType;
+import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
 import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg;
 import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
 import com.yizhuan.xchat_android_library.rxbus.RxBus;
@@ -1051,7 +1051,7 @@ public final class AvRoomDataManager {
      * @return true 相亲模式
      */
     public boolean isDatingMode() {
-        return mCurrentRoomInfo != null && mCurrentRoomInfo.getPlayType() == RoomInfo.PLAY_TYPE_DATING;
+        return mCurrentRoomInfo != null && mCurrentRoomInfo.getRoomModeType() == RoomModeType.OPEN_DATING_MODE;
     }
 
     /**
@@ -1060,9 +1060,7 @@ public final class AvRoomDataManager {
     public boolean isSelectUser(long uid) {
         RoomQueueInfo roomQueueInfo = getRoomQueueMemberInfoByAccount(String.valueOf(uid));
         if (roomQueueInfo == null || roomQueueInfo.mChatRoomMember == null) return false;
-        return mCurrentRoomInfo != null &&
-                mCurrentRoomInfo.getPlayType() == RoomInfo.PLAY_TYPE_DATING &&
-                roomQueueInfo.mChatRoomMember.isHasSelectUser();
+        return isDatingMode() && roomQueueInfo.mChatRoomMember.isHasSelectUser();
     }
 
 }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
index 66e37274d..b71b0e9a9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
@@ -23,9 +23,6 @@ public class RoomInfo implements Parcelable,Serializable {
     public static final int ROOMTYPE_HOME_PARTY = 3;//轰趴房
     public static final int ROOMTYPE_CP = 5;//陪伴房
 
-    public static final int PLAY_TYPE_NORMAL = 1;//普通模式
-    public static final int PLAY_TYPE_DATING = 2;//相亲模式
-
     public static final String DATING_STATE_FLOW = "1";//自由交流
     public static final String DATING_STATE_SELECT = "2";//心动选人
     public static final String DATING_STATE_PUBLISH = "3";//公布心动
@@ -117,6 +114,10 @@ public class RoomInfo implements Parcelable,Serializable {
     private String limitType;
 
     private String introduction;
+
+    /**
+     * {@link RoomModeType}
+     */
     private int roomModeType;
     private int isPermitRoom; // 1:牌照房, 3:新秀房，其他：普通房
 
@@ -168,8 +169,6 @@ public class RoomInfo implements Parcelable,Serializable {
 
     private boolean redEnvelopeOpen;
 
-    //房间玩法:1普通玩法，2相亲
-    private int playType;
     /**
      * COMMUNICATING(1, "交谈"),
      * PICK(2, "心动选人"),
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java
new file mode 100644
index 000000000..5f81ffe3d
--- /dev/null
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java
@@ -0,0 +1,12 @@
+package com.yizhuan.xchat_android_core.room.bean;
+
+/**
+ * 房间各种模式的设定
+ */
+public interface RoomModeType {
+   int NORMAL_MODE = 0; //普通模式
+   int OPEN_MICRO_MODE = 1; //开启排麦模式
+   int CLOSE_MICRO_MODE = 2; //关闭排麦模式
+   int OPEN_PK_MODE = 3;//开启PK模式
+   int OPEN_DATING_MODE = 5;//开启相亲模式
+}
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RoomModeType.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RoomModeType.java
deleted file mode 100644
index 369a5f20f..000000000
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RoomModeType.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.yizhuan.xchat_android_core.room.queuing_mic.bean;
-
-/**
- * 房间各种模式的设定
- */
-public class RoomModeType {
-
-    public static final Integer NORMAL_MODE = 0; //普通模式
-    public static final Integer OPEN_MICRO_MODE = 1; //开启排麦模式
-    public static final Integer CLOSE_MICRO_MODE = 2; //关闭排麦模式
-    public static final Integer OPEN_PK_MODE = 3;//开启PK模式
-}