diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
index a3ec7f58a..c1d33e63a 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
@@ -960,14 +960,6 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 AllServiceGiftProtocol.DataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocol.DataBean.class);
                 if (data == null || data.getGiftUrl() == null) return;
                 giftList.add(data);
-//                Comparator<AllServiceGiftProtocol.DataBean> comparator = new Comparator<AllServiceGiftProtocol.DataBean>() {
-//                    @Override
-//                    public int compare(AllServiceGiftProtocol.DataBean s1, AllServiceGiftProtocol.DataBean s2) {
-//                        return JavaUtil.str2int(s1.getLevelNum()) - JavaUtil.str2int(s2.getLevelNum());
-//                    }
-//                };
-//                //这里就会自动根据规则进行排序
-//                Collections.sort(giftList, comparator);
                 if (second2 == CUSTOM_MSG_ALL_SERVICE_GIFT) {
                     if (giftDialog != null && giftDialog.isShowing()) {
                         // 如果当前以及有礼物弹窗在展示，则需要等到他 dismiss 后再显示下一个
diff --git a/app/src/main/res/layout/dialog_all_play_effect.xml b/app/src/main/res/layout/dialog_all_play_effect.xml
index 8d71970eb..725a0ac9c 100644
--- a/app/src/main/res/layout/dialog_all_play_effect.xml
+++ b/app/src/main/res/layout/dialog_all_play_effect.xml
@@ -3,13 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/cl_notify"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="100dp">
+    android:layout_height="wrap_content">
 
     <FrameLayout
         android:id="@+id/fl_svga_notify"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginTop="20dp"
         app:layout_constraintDimensionRatio="75:11"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_gift_all_service_level_one.xml b/app/src/main/res/layout/dialog_gift_all_service_level_one.xml
index fa227ba5c..eaf21496f 100644
--- a/app/src/main/res/layout/dialog_gift_all_service_level_one.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_one.xml
@@ -11,166 +11,172 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        tools:background="@color/black">
+        android:layout_height="wrap_content">
 
-        <RelativeLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:background="@drawable/all_service_gift_level_one_background">
+            android:layout_marginTop="80dp"
+            tools:background="@color/black">
 
             <RelativeLayout
-                android:id="@+id/benefactor_container"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="37dp">
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="15dp"
+                android:background="@drawable/all_service_gift_level_one_background">
 
                 <RelativeLayout
-                    android:id="@+id/benefactor_avatar_layout"
+                    android:id="@+id/benefactor_container"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
+                    android:layout_gravity="center"
+                    android:layout_marginStart="13dp"
+                    android:layout_marginTop="37dp">
 
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
+                    <RelativeLayout
+                        android:id="@+id/benefactor_avatar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true">
 
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar"
-                        avatarUrl="@{giftBean.sendUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/benefactor_avatar_background"
+                            android:layout_width="51dp"
+                            android:layout_height="51dp"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/all_service_gift_avatar_level_one_background" />
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/benefactor_avatar"
+                            avatarUrl="@{giftBean.sendUserAvatar}"
+                            android:layout_width="44dp"
+                            android:layout_height="44dp"
+                            android:layout_centerInParent="true"
+                            android:layout_centerHorizontal="true"
+                            tools:src="@drawable/default_avatar" />
+                    </RelativeLayout>
+
+                    <TextView
+                        android:id="@+id/benefactor_nick"
+                        android:layout_width="66.5dp"
+                        android:layout_height="16.5dp"
+                        android:layout_below="@id/benefactor_avatar_layout"
                         android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
+                        android:layout_marginTop="-8dp"
+                        android:background="@drawable/all_service_gift_nick_one_background"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLength="6"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="@{giftBean.sendUserNick}"
+                        android:textColor="#FF2F0060"
+                        android:textSize="10dp"
+                        tools:ignore="SpUsage"
+                        tools:text="@string/layout_dialog_gift_all_service_level_one_01" />
+
                 </RelativeLayout>
 
+                <ImageView
+                    android:id="@+id/give_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="13dp"
+                    android:layout_marginTop="56dp"
+                    android:layout_marginEnd="13dp"
+                    android:layout_toEndOf="@id/benefactor_container"
+                    android:src="@drawable/all_service_gift_give_level_1" />
+
+                <RelativeLayout
+                    android:id="@+id/receiver_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="37dp"
+                    android:layout_toEndOf="@id/give_text">
+
+                    <RelativeLayout
+                        android:id="@+id/receiver_avatar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true">
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/receiver_avatar_background"
+                            android:layout_width="51dp"
+                            android:layout_height="51dp"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/all_service_gift_avatar_level_one_background" />
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/receiver_avatar"
+                            avatarUrl="@{giftBean.recvUserAvatar}"
+                            android:layout_width="44dp"
+                            android:layout_height="44dp"
+                            android:layout_centerInParent="true"
+                            android:layout_centerHorizontal="true"
+                            tools:src="@drawable/default_avatar" />
+                    </RelativeLayout>
+
+                    <TextView
+                        android:id="@+id/receiver_nick"
+                        android:layout_width="66.5dp"
+                        android:layout_height="16.5dp"
+                        android:layout_below="@id/receiver_avatar_layout"
+                        android:layout_centerHorizontal="true"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="-8dp"
+                        android:background="@drawable/all_service_gift_nick_one_background"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLength="6"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="@{giftBean.recvUserNick}"
+                        android:textColor="#FF2F0060"
+                        android:textSize="10dp"
+                        tools:text="@string/layout_dialog_gift_all_service_level_one_02" />
+
+                </RelativeLayout>
+
+                <ImageView
+                    android:id="@+id/gift_img"
+                    nomalUrl="@{giftBean.giftUrl}"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginTop="37dp"
+                    android:layout_toEndOf="@+id/receiver_container" />
+
                 <TextView
-                    android:id="@+id/benefactor_nick"
-                    android:layout_width="66.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/benefactor_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_one_background"
-                    android:ellipsize="end"
+                    android:id="@+id/gift_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_6"
+                    android:layout_marginTop="53dp"
+                    android:layout_toEndOf="@+id/gift_img"
                     android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.sendUserNick}"
-                    android:textColor="#FF2F0060"
-                    android:textSize="10dp"
+                    android:includeFontPadding="false"
+                    android:text="@{@string/x + giftBean.giftNum}"
+                    android:textColor="#FFFEF563"
+                    android:textSize="20dp"
                     tools:ignore="SpUsage"
-                    tools:text="@string/layout_dialog_gift_all_service_level_one_01" />
-
+                    tools:text="x1314" />
             </RelativeLayout>
 
             <ImageView
-                android:id="@+id/give_text"
+                android:id="@+id/iv_close_dialog_one"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="56dp"
-                android:layout_marginEnd="13dp"
-                android:layout_toEndOf="@id/benefactor_container"
-                android:src="@drawable/all_service_gift_give_level_1" />
+                android:layout_gravity="end"
+                android:layout_marginTop="13dp"
+                android:layout_marginEnd="10dp"
+                android:src="@drawable/ic_close_all_server_one" />
 
-            <RelativeLayout
-                android:id="@+id/receiver_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="37dp"
-                android:layout_toEndOf="@id/give_text">
-
-                <RelativeLayout
-                    android:id="@+id/receiver_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar"
-                        avatarUrl="@{giftBean.recvUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/receiver_nick"
-                    android:layout_width="66.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/receiver_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_one_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.recvUserNick}"
-                    android:textColor="#FF2F0060"
-                    android:textSize="10dp"
-                    tools:text="@string/layout_dialog_gift_all_service_level_one_02" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/gift_img"
-                nomalUrl="@{giftBean.giftUrl}"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginTop="37dp"
-                android:layout_toEndOf="@+id/receiver_container" />
-
-            <TextView
-                android:id="@+id/gift_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_6"
-                android:layout_marginTop="53dp"
-                android:layout_toEndOf="@+id/gift_img"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#FFFEF563"
-                android:textSize="20dp"
-                tools:ignore="SpUsage"
-                tools:text="x1314" />
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/iv_close_dialog_one"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="13dp"
-            android:layout_marginEnd="10dp"
-            android:src="@drawable/ic_close_all_server_one" />
+        </FrameLayout>
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/dialog_gift_all_service_level_three.xml b/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
index 27a3c305d..804d402f1 100644
--- a/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
@@ -11,181 +11,187 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        tools:background="@color/black">
+        android:layout_height="wrap_content">
 
-        <RelativeLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:background="@drawable/all_service_gift_level_three_background">
-
-            <TextView
-                android:id="@+id/tv_room_id"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="8dp"
-                android:gravity="center"
-                android:text="@{@string/click_go + giftBean.roomErbanNo}"
-                android:textColor="@color/white"
-                android:textSize="10dp"
-                tools:ignore="SpUsage"
-                tools:text="ID:1234567" />
+            android:layout_marginTop="80dp"
+            tools:background="@color/black">
 
             <RelativeLayout
-                android:id="@+id/benefactor_container"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="17dp"
-                android:layout_marginTop="56dp">
-
-                <RelativeLayout
-                    android:id="@+id/benefactor_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar"
-                        avatarUrl="@{giftBean.sendUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="15dp"
+                android:background="@drawable/all_service_gift_level_three_background">
 
                 <TextView
-                    android:id="@+id/benefactor_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/benefactor_avatar_layout"
+                    android:id="@+id/tv_room_id"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
+                    android:layout_marginTop="8dp"
                     android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.sendUserNick}"
+                    android:text="@{@string/click_go + giftBean.roomErbanNo}"
                     android:textColor="@color/white"
                     android:textSize="10dp"
                     tools:ignore="SpUsage"
-                    tools:text="@string/layout_dialog_gift_all_service_level_three_01" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/give_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="75dp"
-                android:layout_marginEnd="13dp"
-                android:layout_toEndOf="@id/benefactor_container"
-                android:src="@drawable/all_service_gift_give_level_1" />
-
-            <RelativeLayout
-                android:id="@+id/receiver_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="56dp"
-                android:layout_toEndOf="@id/give_text">
+                    tools:text="ID:1234567" />
 
                 <RelativeLayout
-                    android:id="@+id/receiver_avatar_layout"
+                    android:id="@+id/benefactor_container"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
+                    android:layout_gravity="center"
+                    android:layout_marginStart="17dp"
+                    android:layout_marginTop="56dp">
 
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
+                    <RelativeLayout
+                        android:id="@+id/benefactor_avatar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true">
 
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar"
-                        avatarUrl="@{giftBean.recvUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/benefactor_avatar_background"
+                            android:layout_width="51dp"
+                            android:layout_height="51dp"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/all_service_gift_avatar_level_one_background" />
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/benefactor_avatar"
+                            avatarUrl="@{giftBean.sendUserAvatar}"
+                            android:layout_width="44dp"
+                            android:layout_height="44dp"
+                            android:layout_centerInParent="true"
+                            android:layout_centerHorizontal="true"
+                            tools:src="@drawable/default_avatar" />
+                    </RelativeLayout>
+
+                    <TextView
+                        android:id="@+id/benefactor_nick"
+                        android:layout_width="67.5dp"
+                        android:layout_height="16.5dp"
+                        android:layout_below="@id/benefactor_avatar_layout"
                         android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="-8dp"
+                        android:background="@drawable/all_service_gift_nick_two_background"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLength="6"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="@{giftBean.sendUserNick}"
+                        android:textColor="@color/white"
+                        android:textSize="10dp"
+                        tools:ignore="SpUsage"
+                        tools:text="@string/layout_dialog_gift_all_service_level_three_01" />
+
                 </RelativeLayout>
 
+                <ImageView
+                    android:id="@+id/give_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="13dp"
+                    android:layout_marginTop="75dp"
+                    android:layout_marginEnd="13dp"
+                    android:layout_toEndOf="@id/benefactor_container"
+                    android:src="@drawable/all_service_gift_give_level_1" />
+
+                <RelativeLayout
+                    android:id="@+id/receiver_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="56dp"
+                    android:layout_toEndOf="@id/give_text">
+
+                    <RelativeLayout
+                        android:id="@+id/receiver_avatar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true">
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/receiver_avatar_background"
+                            android:layout_width="51dp"
+                            android:layout_height="51dp"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/all_service_gift_avatar_level_one_background" />
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/receiver_avatar"
+                            avatarUrl="@{giftBean.recvUserAvatar}"
+                            android:layout_width="44dp"
+                            android:layout_height="44dp"
+                            android:layout_centerInParent="true"
+                            android:layout_centerHorizontal="true"
+                            tools:src="@drawable/default_avatar" />
+                    </RelativeLayout>
+
+                    <TextView
+                        android:id="@+id/receiver_nick"
+                        android:layout_width="67.5dp"
+                        android:layout_height="16.5dp"
+                        android:layout_below="@id/receiver_avatar_layout"
+                        android:layout_centerHorizontal="true"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="-8dp"
+                        android:background="@drawable/all_service_gift_nick_two_background"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLength="6"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="@{giftBean.recvUserNick}"
+                        android:textColor="@color/white"
+                        android:textSize="10dp"
+                        tools:text="@string/layout_dialog_gift_all_service_level_three_02" />
+
+                </RelativeLayout>
+
+                <ImageView
+                    android:id="@+id/gift_img"
+                    nomalUrl="@{giftBean.giftUrl}"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="56dp"
+                    android:layout_toEndOf="@+id/receiver_container" />
+
                 <TextView
-                    android:id="@+id/receiver_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/receiver_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
+                    android:id="@+id/gift_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_6"
+                    android:layout_marginTop="75dp"
+                    android:layout_toEndOf="@+id/gift_img"
                     android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.recvUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp"
-                    tools:text="@string/layout_dialog_gift_all_service_level_three_02" />
+                    android:includeFontPadding="false"
+                    android:text="@{@string/x + giftBean.giftNum}"
+                    android:textColor="#FFFEF563"
+                    android:textSize="20dp"
+                    tools:ignore="SpUsage"
+                    tools:text="x1314" />
 
             </RelativeLayout>
 
             <ImageView
-                android:id="@+id/gift_img"
-                nomalUrl="@{giftBean.giftUrl}"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="56dp"
-                android:layout_toEndOf="@+id/receiver_container" />
-
-            <TextView
-                android:id="@+id/gift_number"
+                android:id="@+id/gift_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_6"
-                android:layout_marginTop="75dp"
-                android:layout_toEndOf="@+id/gift_img"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#FFFEF563"
-                android:textSize="20dp"
-                tools:ignore="SpUsage"
-                tools:text="x1314" />
+                android:layout_gravity="end"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:layout_marginTop="34dp"
+                android:src="@drawable/ic_close_all_server_one" />
 
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/gift_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:layout_marginTop="34dp"
-            android:src="@drawable/ic_close_all_server_one" />
+        </FrameLayout>
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/dialog_gift_all_service_level_two.xml b/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
index 5f23276a3..b61f79468 100644
--- a/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
@@ -11,168 +11,175 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        tools:background="@color/black">
+        android:layout_height="wrap_content">
 
-        <RelativeLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/all_service_gift_level_two_background">
+            android:layout_marginTop="80dp"
+            tools:background="@color/black">
 
             <RelativeLayout
-                android:id="@+id/benefactor_container"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="17dp"
-                android:layout_marginTop="34dp">
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:background="@drawable/all_service_gift_level_two_background">
 
                 <RelativeLayout
-                    android:id="@+id/benefactor_avatar_layout"
+                    android:id="@+id/benefactor_container"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
+                    android:layout_gravity="center"
+                    android:layout_marginStart="17dp"
+                    android:layout_marginTop="34dp">
 
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_one_background" />
+                    <RelativeLayout
+                        android:id="@+id/benefactor_avatar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true">
 
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/benefactor_avatar"
-                        avatarUrl="@{giftBean.sendUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/benefactor_avatar_background"
+                            android:layout_width="51dp"
+                            android:layout_height="51dp"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/all_service_gift_avatar_level_one_background" />
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/benefactor_avatar"
+                            avatarUrl="@{giftBean.sendUserAvatar}"
+                            android:layout_width="44dp"
+                            android:layout_height="44dp"
+                            android:layout_centerInParent="true"
+                            android:layout_centerHorizontal="true"
+                            tools:src="@drawable/default_avatar" />
+                    </RelativeLayout>
+
+                    <TextView
+                        android:id="@+id/benefactor_nick"
+                        android:layout_width="67.5dp"
+                        android:layout_height="16.5dp"
+                        android:layout_below="@id/benefactor_avatar_layout"
                         android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="-8dp"
+                        android:background="@drawable/all_service_gift_nick_two_background"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLength="6"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="@{giftBean.sendUserNick}"
+                        android:textColor="@color/white"
+                        android:textSize="10dp"
+                        tools:ignore="SpUsage"
+                        tools:text="@string/layout_dialog_gift_all_service_level_two_01" />
+
                 </RelativeLayout>
 
+                <ImageView
+                    android:id="@+id/give_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="13dp"
+                    android:layout_marginTop="53dp"
+                    android:layout_marginEnd="13dp"
+                    android:layout_toEndOf="@id/benefactor_container"
+                    android:src="@drawable/all_service_gift_give_level_1" />
+
+                <RelativeLayout
+                    android:id="@+id/receiver_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="34dp"
+                    android:layout_toEndOf="@id/give_text">
+
+                    <RelativeLayout
+                        android:id="@+id/receiver_avatar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true">
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/receiver_avatar_background"
+                            android:layout_width="51dp"
+                            android:layout_height="51dp"
+                            android:layout_centerInParent="true"
+                            android:src="@drawable/all_service_gift_avatar_level_two_background" />
+
+                        <com.yizhuan.erban.common.widget.CircleImageView
+                            android:id="@+id/receiver_avatar"
+                            avatarUrl="@{giftBean.recvUserAvatar}"
+                            android:layout_width="44dp"
+                            android:layout_height="44dp"
+                            android:layout_centerInParent="true"
+                            android:layout_centerHorizontal="true"
+                            tools:src="@drawable/default_avatar" />
+                    </RelativeLayout>
+
+                    <TextView
+                        android:id="@+id/receiver_nick"
+                        android:layout_width="67.5dp"
+                        android:layout_height="16.5dp"
+                        android:layout_below="@id/receiver_avatar_layout"
+                        android:layout_centerHorizontal="true"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="-8dp"
+                        android:background="@drawable/all_service_gift_nick_two_background"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxLength="6"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="@{giftBean.recvUserNick}"
+                        android:textColor="@color/white"
+                        android:textSize="10dp"
+                        tools:text="@string/layout_dialog_gift_all_service_level_two_02" />
+
+                </RelativeLayout>
+
+                <ImageView
+                    android:id="@+id/gift_img"
+                    nomalUrl="@{giftBean.giftUrl}"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="34dp"
+                    android:layout_toEndOf="@+id/receiver_container" />
+
                 <TextView
-                    android:id="@+id/benefactor_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/benefactor_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
+                    android:id="@+id/gift_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_6"
+                    android:layout_marginTop="53dp"
+                    android:layout_toEndOf="@+id/gift_img"
                     android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.sendUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp"
+                    android:includeFontPadding="false"
+                    android:text="@{@string/x + giftBean.giftNum}"
+                    android:textColor="#FFFEF563"
+                    android:textSize="20dp"
                     tools:ignore="SpUsage"
-                    tools:text="@string/layout_dialog_gift_all_service_level_two_01" />
+                    tools:text="x1314" />
 
             </RelativeLayout>
 
             <ImageView
-                android:id="@+id/give_text"
+                android:id="@+id/ivCloseDialogTwo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="13dp"
-                android:layout_marginTop="53dp"
-                android:layout_marginEnd="13dp"
-                android:layout_toEndOf="@id/benefactor_container"
-                android:src="@drawable/all_service_gift_give_level_1" />
+                android:layout_gravity="end"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="11dp"
+                android:src="@drawable/ic_close_all_server_one" />
 
-            <RelativeLayout
-                android:id="@+id/receiver_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="34dp"
-                android:layout_toEndOf="@id/give_text">
-
-                <RelativeLayout
-                    android:id="@+id/receiver_avatar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true">
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar_background"
-                        android:layout_width="51dp"
-                        android:layout_height="51dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/all_service_gift_avatar_level_two_background" />
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/receiver_avatar"
-                        avatarUrl="@{giftBean.recvUserAvatar}"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:layout_centerInParent="true"
-                        android:layout_centerHorizontal="true"
-                        tools:src="@drawable/default_avatar" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/receiver_nick"
-                    android:layout_width="67.5dp"
-                    android:layout_height="16.5dp"
-                    android:layout_below="@id/receiver_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="-8dp"
-                    android:background="@drawable/all_service_gift_nick_two_background"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLength="6"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="@{giftBean.recvUserNick}"
-                    android:textColor="@color/white"
-                    android:textSize="10dp"
-                    tools:text="@string/layout_dialog_gift_all_service_level_two_02" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/gift_img"
-                nomalUrl="@{giftBean.giftUrl}"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="34dp"
-                android:layout_toEndOf="@+id/receiver_container" />
-
-            <TextView
-                android:id="@+id/gift_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_6"
-                android:layout_marginTop="53dp"
-                android:layout_toEndOf="@+id/gift_img"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="@{@string/x + giftBean.giftNum}"
-                android:textColor="#FFFEF563"
-                android:textSize="20dp"
-                tools:ignore="SpUsage"
-                tools:text="x1314" />
-
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/ivCloseDialogTwo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="11dp"
-            android:src="@drawable/ic_close_all_server_one" />
+        </FrameLayout>
 
     </FrameLayout>
+
 </layout>
\ No newline at end of file