diff --git a/app/src/main/res/drawable-xhdpi/bg_quick_match.png b/app/src/main/res/drawable-xhdpi/bg_quick_match.png
new file mode 100644
index 000000000..c0e09ca47
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_quick_match.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_quick_match_left.png b/app/src/main/res/drawable-xhdpi/ic_quick_match_left.png
new file mode 100644
index 000000000..f39220b0c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_quick_match_left.png differ
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4e38e6ab7..c3325c590 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -45,7 +45,7 @@
                 <TextView
                     android:id="@+id/tv_search_room"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/dp_30"
+                    android:layout_height="@dimen/dp_24"
                     android:layout_marginStart="12dp"
                     android:layout_marginEnd="11dp"
                     android:layout_weight="1"
diff --git a/app/src/main/res/layout/fragment_recommend.xml b/app/src/main/res/layout/fragment_recommend.xml
index df12e2501..1e733f4f4 100644
--- a/app/src/main/res/layout/fragment_recommend.xml
+++ b/app/src/main/res/layout/fragment_recommend.xml
@@ -52,19 +52,22 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/dp_15"
-                            android:layout_marginEnd="@dimen/dp_15"
-                            android:layout_marginBottom="15dp">
+                            android:layout_marginEnd="@dimen/dp_15">
 
                             <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
                                 android:id="@+id/roll_view"
-                                android:layout_width="match_parent"
+                                android:layout_width="0dp"
                                 android:layout_height="0dp"
+                                android:layout_marginBottom="15dp"
                                 android:visibility="gone"
-                                app:layout_constraintDimensionRatio="345:130"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintDimensionRatio="690:260"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent"
                                 app:rollviewpager_hint_gravity="left"
                                 app:rollviewpager_hint_paddingBottom="8dp"
-                                tools:visibility="visible" />
+                                tools:visibility="gone" />
 
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -160,6 +163,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingTop="@dimen/dp_5"
+                            android:paddingBottom="@dimen/dp_5"
                             android:visibility="visible"
                             tools:visibility="visible" />
 
@@ -171,7 +175,6 @@
                     android:id="@+id/fl_indicator"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="5dp"
                     android:paddingBottom="5dp">
 
                     <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
diff --git a/app/src/main/res/layout/fragment_room_game.xml b/app/src/main/res/layout/fragment_room_game.xml
index e8bfcf2b5..8192a8e84 100644
--- a/app/src/main/res/layout/fragment_room_game.xml
+++ b/app/src/main/res/layout/fragment_room_game.xml
@@ -16,24 +16,20 @@
             android:layout_height="match_parent"
             android:clipToPadding="false" />
 
-        <com.coorchice.library.SuperTextView
+        <com.yizhuan.xchat_android_library.widget.DrawableCenterTextView
             android:id="@+id/tv_match"
-            android:layout_width="wrap_content"
-            android:layout_height="40dp"
+            android:layout_width="118dp"
+            android:layout_height="48dp"
             android:layout_gravity="bottom|end"
             android:layout_marginEnd="24dp"
             android:layout_marginBottom="35dp"
+            android:background="@drawable/bg_quick_match"
+            android:drawableStart="@drawable/ic_quick_match_left"
             android:gravity="center"
-            android:paddingStart="9dp"
-            android:paddingEnd="16dp"
+            android:paddingBottom="2dp"
             android:text="快速匹配"
-            android:textColor="#ffffffff"
-            android:textSize="16sp"
-            app:corner="20dp"
-            app:shaderEnable="true"
-            app:shaderEndColor="#FFA936"
-            app:shaderMode="leftToRight"
-            app:shaderStartColor="#FFCB47" />
+            android:textColor="@color/white"
+            android:textSize="16dp" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_room_like.xml b/app/src/main/res/layout/fragment_room_like.xml
index 581b587d3..f7de4c14a 100644
--- a/app/src/main/res/layout/fragment_room_like.xml
+++ b/app/src/main/res/layout/fragment_room_like.xml
@@ -30,7 +30,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="68dp"
-                android:src="@drawable/empty_content_dark" />
+                android:src="@drawable/icon_common_failure" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_erban_grid_empty.xml b/app/src/main/res/layout/item_erban_grid_empty.xml
index b6c1d8825..c9bc9bede 100644
--- a/app/src/main/res/layout/item_erban_grid_empty.xml
+++ b/app/src/main/res/layout/item_erban_grid_empty.xml
@@ -1,36 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/ll_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:layout_width="108dp"
-    android:layout_marginStart="@dimen/dp_2"
-    android:layout_marginEnd="@dimen/dp_2"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:layout_width="120dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@drawable/bg_home_recommend_item"
+        app:layout_constraintDimensionRatio="236:276"
+        app:layout_constraintTop_toTopOf="parent" />
+
 
     <com.yizhuan.erban.ui.widget.SquareLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/dp_2"
-        android:layout_marginEnd="@dimen/dp_2"
-        android:layout_marginBottom="@dimen/dp_4">
+        android:id="@+id/square_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="5dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/iv_cover"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:riv_corner_radius="@dimen/dp_12"
-            android:scaleType="fitXY"
-            android:src="@drawable/default_cover" />
+            android:src="@drawable/default_cover"
+            app:riv_corner_radius_bottom_left="0dp"
+            app:riv_corner_radius_bottom_right="0dp"
+            app:riv_corner_radius_top_left="8dp"
+            app:riv_corner_radius_top_right="8dp" />
 
 
     </com.yizhuan.erban.ui.widget.SquareLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_25"
-      />
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_8"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="@dimen/dp_10"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:text="虚位以待"
+        android:textColor="@color/color_333333"
+        android:textSize="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/square_layout" />
 
-</LinearLayout>
\ No newline at end of file
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_tab_map.xml b/app/src/main/res/layout/item_home_tab_map.xml
index b70b8efe5..e7b642cf2 100644
--- a/app/src/main/res/layout/item_home_tab_map.xml
+++ b/app/src/main/res/layout/item_home_tab_map.xml
@@ -9,18 +9,20 @@
     tools:layout_width="120dp">
 
     <View
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@drawable/bg_home_recommend_item"
         app:layout_constraintDimensionRatio="236:276"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.yizhuan.erban.ui.widget.SquareLayout
         android:id="@+id/square_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="3dp"
-        android:layout_marginEnd="4dp"
+        android:layout_marginEnd="5dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -102,8 +104,8 @@
         android:layout_marginEnd="@dimen/dp_10"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:maxLines="1"
         android:includeFontPadding="false"
+        android:maxLines="1"
         android:textColor="@color/color_333333"
         android:textSize="12dp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_room_banner.xml b/app/src/main/res/layout/item_room_banner.xml
index ea9f9d0ca..ef7573455 100644
--- a/app/src/main/res/layout/item_room_banner.xml
+++ b/app/src/main/res/layout/item_room_banner.xml
@@ -10,10 +10,12 @@
 
     <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
         android:id="@+id/roll_view"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:visibility="gone"
-        app:layout_constraintDimensionRatio="345:80"
+        app:layout_constraintDimensionRatio="690:160"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:rollviewpager_hint_gravity="left"
         app:rollviewpager_hint_paddingBottom="8dp"
diff --git a/app/src/main/res/layout/item_room_common.xml b/app/src/main/res/layout/item_room_common.xml
index 7d3248d3a..286e87e9c 100644
--- a/app/src/main/res/layout/item_room_common.xml
+++ b/app/src/main/res/layout/item_room_common.xml
@@ -12,7 +12,7 @@
         android:id="@+id/view_bg"
         android:layout_width="0dp"
         android:layout_height="74dp"
-        android:layout_marginTop="7dp"
+        android:layout_marginTop="7.5dp"
         android:background="@drawable/bg_home_common_item"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"