diff --git a/config.gradle b/config.gradle
index d73f7bbfa..9b9ac5933 100644
--- a/config.gradle
+++ b/config.gradle
@@ -10,9 +10,9 @@ ext {
     manifestPlaceholders = [
             //正式
 
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
index f24723467..4b7acd53c 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
@@ -148,7 +148,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
         window.setWindowAnimations(R.style.bottomToTopAnim);
         WindowManager.LayoutParams params = window.getAttributes();
         params.width = WindowManager.LayoutParams.MATCH_PARENT;
-        params.height = DpUtil.dp2px(350);
+        params.height = DpUtil.dp2px(355);
         params.gravity = Gravity.BOTTOM;
         window.setAttributes(params);
     }
@@ -251,7 +251,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
         mVipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle);
         mVipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc);
         mVipGold.setOnClickListener(this);
-        mGiftPackage= mRootView.findViewById(R.id.btn_gift_package);
+        mGiftPackage = mRootView.findViewById(R.id.btn_gift_package);
         mGiftPackage.setOnClickListener(this);
         mRootView.findViewById(R.id.live_gift_download_all).setOnClickListener(this);
         mHandler = new Handler() {
@@ -295,7 +295,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
                             JSONObject user = JSONObject.parseObject(info[0]);
                             int nobleId = user.getIntValue("noble_id");
                             int resId = NobleUtil.nobleIdToImageResId(nobleId);
-                            if(resId!=-1){
+                            if (resId != -1) {
                                 mVipGoldIcon.setImageResource(resId);
                                 mVipGoldTitle.setText(user.getString("noble_name"));
                                 mVipGoldDesc.setText(R.string.live_gift_buy_gold_desc_to);
@@ -385,7 +385,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
                     String giftJson = obj.getString("giftlist");
                     List<LiveGiftBean> list = JSON.parseArray(giftJson, LiveGiftBean.class);
                     GiftCacheUtil.getInstance().addDownloadList(list);
-                    if(!GiftCacheUtil.getInstance().isDownloading()){
+                    if (!GiftCacheUtil.getInstance().isDownloading()) {
                         GiftCacheUtil.getInstance().downloadAllGift();
                     }
                     if (list.size() == 0) {
@@ -405,7 +405,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
     }
 
     private void showGiftList(List<LiveGiftBean> list) {
-        if (bean1!=null&&IMLoginManager.get(mContext).isNewUserGif() && (type_name.equals("熱門") || type_name.equals("Hot"))) {
+        if (bean1 != null && IMLoginManager.get(mContext).isNewUserGif() && (type_name.equals("熱門") || type_name.equals("Hot"))) {
             list.add(0, bean1);
             if (mWishGiftId == null) {
                 mWishGiftId = "" + bean1.getId();
@@ -503,11 +503,11 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
         } else if (i == R.id.btn_choose) {
             showGiftCount();
         } else if (i == R.id.coin) {
-            forwardMyCoin();
+            forwardMyCoin(0);
         } else if (i == R.id.goldCoin) {
-            forwardMyCoin();
+            forwardMyCoin(2);
         } else if (i == R.id.go_charge) {
-            forwardMyCoin();
+            forwardMyCoin(0);
         } else if (i == R.id.btn_luck_gift_tip) {
             dismiss();
             ((LiveActivity) mContext).openLuckGiftTip();
@@ -556,10 +556,10 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
     /**
      * 跳转到我的钻石
      */
-    private void forwardMyCoin() {
+    private void forwardMyCoin(int page) {
         dismiss();
         //我们的
-        ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation();
+        ARouter.getInstance().build(PATH_COIN).withInt("p", page).navigation();
     }
 
     /**
@@ -709,6 +709,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
 
     /**
      * 收到礼物下载完成的通知
+     *
      * @param status
      */
     @Subscribe(threadMode = ThreadMode.MAIN)
diff --git a/live/src/main/res/layout/dialog_live_gift_wrap.xml b/live/src/main/res/layout/dialog_live_gift_wrap.xml
index 05570e3d2..bfb498451 100644
--- a/live/src/main/res/layout/dialog_live_gift_wrap.xml
+++ b/live/src/main/res/layout/dialog_live_gift_wrap.xml
@@ -2,181 +2,196 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="350dp"
     android:orientation="vertical">
+
     <RelativeLayout
         android:layout_width="match_parent"
-        android:orientation="horizontal"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/live_gift_download_all"
-        android:layout_width="155dp"
-        android:layout_height="32dp"
-        android:layout_marginStart="12dp"
-        android:layout_alignParentStart="true"
-        android:background="@drawable/bg_live_gift_download_all"
-        android:gravity="center"
-        android:visibility="invisible"
         android:orientation="horizontal">
 
-        <ImageView
-            android:layout_width="19dp"
-            android:layout_height="19dp"
-            android:layout_marginEnd="7dp"
-            android:src="@mipmap/icon_small_download" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:visibility="visible"
-            android:text="一鍵下載所有禮物動畫"
-            android:textSize="10sp" />
-
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/btn_luck_gift_tip"
-        android:layout_width="105.27dp"
-        android:layout_alignParentEnd="true"
-        android:layout_height="32dp"
-        android:layout_marginEnd="12dp"
-        android:background="@drawable/bg_live_vip_blue"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/vipGoldIcon"
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:layout_marginEnd="7dp"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/icon_vip_gold" />
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:gravity="start"
-            android:layout_height="wrap_content">
+            android:id="@+id/live_gift_download_all"
+            android:layout_width="155dp"
+            android:layout_height="32dp"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="12dp"
+            android:background="@drawable/bg_live_gift_download_all"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="invisible">
+
+            <ImageView
+                android:layout_width="19dp"
+                android:layout_height="19dp"
+                android:layout_marginEnd="7dp"
+                android:src="@mipmap/icon_small_download" />
+
             <TextView
-                android:id="@+id/vipGoldTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_gravity="start"
-                android:textColor="#FFFFFF"
-                android:text="@string/live_gift_buy_gold"
-                android:textSize="11.52sp" />
-            <TextView
-                android:id="@+id/vipGoldDesc"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:textColor="#999999"
-                android:text="@string/live_gift_buy_gold_desc"
-                android:textSize="7.68sp" />
+                android:gravity="center"
+                android:text="一鍵下載所有禮物動畫"
+                android:textSize="10sp"
+                android:visibility="visible" />
+
         </LinearLayout>
 
-    </LinearLayout>
+        <LinearLayout
+            android:id="@+id/btn_luck_gift_tip"
+            android:layout_width="105.27dp"
+            android:layout_height="32dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="12dp"
+            android:background="@drawable/bg_live_vip_blue"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/vipGoldIcon"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_marginEnd="7dp"
+                android:scaleType="centerCrop"
+                android:src="@mipmap/icon_vip_gold" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/vipGoldTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="start"
+                    android:text="@string/live_gift_buy_gold"
+                    android:textColor="#FFFFFF"
+                    android:textSize="11.52sp" />
+
+                <TextView
+                    android:id="@+id/vipGoldDesc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:text="@string/live_gift_buy_gold_desc"
+                    android:textColor="#999999"
+                    android:textSize="7.68sp" />
+            </LinearLayout>
+
+        </LinearLayout>
 
     </RelativeLayout>
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_live_gift">
+
         <LinearLayout
             android:id="@+id/gift_tab_layout"
-            android:orientation="horizontal"
             android:layout_width="match_parent"
+            android:layout_height="40dp"
             android:gravity="center"
-            android:layout_height="50dp">
+            android:orientation="horizontal">
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/items"
-                android:layout_weight="1"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginEnd="5dp" />
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1" />
 
-        <ImageView
-            android:layout_marginEnd="15dp"
-            android:layout_width="wrap_content"
-            android:src="@drawable/bg_live_gift_package_line"
-            android:layout_gravity="center"
-            android:layout_height="23dp"/>
-        <com.yunbao.common.custom.DrawableTextView
-            android:id="@+id/btn_gift_package"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginEnd="10dp"
-            android:drawablePadding="2dp"
-            android:gravity="center_vertical"
-            android:text="@string/live_wrap"
-            android:textColor="#FFFFFF"
-            android:textSize="12sp"
-            app:dt_left_height="23dp"
-            app:dt_left_width="1.3dp" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="23dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="15dp"
+                android:src="@drawable/bg_live_gift_package_line" />
+
+            <com.yunbao.common.custom.DrawableTextView
+                android:id="@+id/btn_gift_package"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_marginEnd="10dp"
+                android:drawablePadding="2dp"
+                android:gravity="center_vertical"
+                android:text="@string/live_wrap"
+                android:textColor="#FFFFFF"
+                android:textSize="12sp"
+                app:dt_left_height="23dp"
+                app:dt_left_width="1.3dp" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/group"
             android:layout_width="match_parent"
             android:layout_height="300dp"
-            android:gravity="bottom"
             android:layout_below="@id/gift_tab_layout"
+            android:gravity="bottom"
             android:orientation="vertical">
 
             <androidx.viewpager.widget.ViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"
                 android:layout_marginTop="5dp"
-                android:layout_marginBottom="1dp"/>
+                android:layout_weight="1" />
 
             <androidx.viewpager.widget.ViewPager
                 android:id="@+id/vpWrapList"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"
                 android:layout_marginTop="5dp"
-                android:layout_marginBottom="1dp"
+                android:layout_marginBottom="3dp"
+                android:layout_weight="1"
                 android:visibility="gone" />
 
-            <RadioGroup
-                android:id="@+id/radio_group"
-                android:layout_width="wrap_content"
-                android:layout_height="6dp"
-                android:layout_marginEnd="30dp"
-                android:layout_gravity="end"
-                android:orientation="horizontal" />
-
-            <RadioGroup
-                android:id="@+id/radio_group_wrap"
-                android:layout_width="wrap_content"
-                android:layout_height="6dp"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone" />
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="55dp"
-                android:layout_weight="0"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp">
+                android:layout_height="66dp"
+                android:layout_weight="0">
+                <RadioGroup
+                    android:id="@+id/radio_group"
+                    android:layout_width="wrap_content"
+                    android:layout_height="6dp"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="3.5dp"
+                    android:layout_marginEnd="20dp"
+                    android:gravity="end"
+                    android:orientation="horizontal" />
+
+                <RadioGroup
+                    android:id="@+id/radio_group_wrap"
+                    android:layout_width="wrap_content"
+                    android:layout_marginEnd="20dp"
+                    android:layout_height="6dp"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="3.5dp"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:visibility="visible" />
 
                 <RelativeLayout
                     android:id="@+id/btn_send_group"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp">
+
 
                     <TextView
                         android:id="@+id/btn_send"
                         android:layout_width="60dp"
                         android:layout_height="30dp"
                         android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
+                        android:layout_alignParentBottom="true"
                         android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="10dp"
                         android:background="@drawable/bg_live_gift_send_2"
                         android:enabled="false"
                         android:gravity="center"
@@ -188,7 +203,8 @@
                         android:id="@+id/btn_choose"
                         android:layout_width="60dp"
                         android:layout_height="30dp"
-                        android:layout_centerVertical="true"
+                        android:layout_alignParentBottom="true"
+                        android:layout_marginBottom="10dp"
                         android:layout_toLeftOf="@id/btn_send"
                         android:background="@drawable/bg_live_gift_choose"
                         android:gravity="center"
@@ -202,31 +218,35 @@
                         android:id="@+id/arrow"
                         android:layout_width="13dp"
                         android:layout_height="7dp"
-                        android:layout_centerVertical="true"
+                        android:layout_alignParentBottom="true"
                         android:layout_marginRight="5dp"
+                        android:layout_marginBottom="22dp"
                         android:layout_toLeftOf="@id/btn_send"
                         android:src="@mipmap/icon_live_gift_2"
-                        app:tint="@color/global"
-                        android:visibility="invisible" />
+                        android:visibility="invisible"
+                        app:tint="@color/global" />
+
 
                 </RelativeLayout>
 
                 <LinearLayout
-                    android:orientation="horizontal"
-                    android:gravity="bottom"
-                    android:layout_marginBottom="5dp"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="5dp"
+                    android:gravity="bottom"
+                    android:layout_marginStart="20dp"
+                    android:orientation="horizontal">
+
                     <LinearLayout
-                        android:orientation="vertical"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent">
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
 
                         <com.yunbao.common.custom.DrawableTextView
                             android:id="@+id/goldCoin"
                             android:layout_width="wrap_content"
-                            android:layout_weight="1"
                             android:layout_height="wrap_content"
+                            android:layout_weight="1"
                             android:drawablePadding="4dp"
                             android:gravity="center_vertical"
                             android:textColor="@color/white"
@@ -253,16 +273,17 @@
                             app:dt_right_width="14dp" />
 
                     </LinearLayout>
+
                     <com.yunbao.common.custom.DrawableTextView
                         android:id="@+id/go_charge"
                         android:layout_width="42dp"
                         android:layout_height="22dp"
                         android:layout_marginStart="10dp"
                         android:layout_marginBottom="3dp"
+                        android:background="@drawable/bg_live_gift_buy"
                         android:drawablePadding="4dp"
                         android:gravity="center"
                         android:text="@string/charge"
-                        android:background="@drawable/bg_live_gift_buy"
                         android:textColor="@color/yellow5"
                         android:textSize="12sp"
                         app:dt_left_height="20dp"
diff --git a/live/src/main/res/layout/item_live_gift.xml b/live/src/main/res/layout/item_live_gift.xml
index 8090becbb..eff7e9d70 100644
--- a/live/src/main/res/layout/item_live_gift.xml
+++ b/live/src/main/res/layout/item_live_gift.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.yunbao.common.custom.MyFrameLayout2
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:mfl_ratio="1"
+    android:layout_height="92dp"
     android:background="@drawable/bg_live_gift_items"
-    >
+    app:mfl_ratio="1">
 
     <com.yunbao.common.custom.MyRadioButton
         android:id="@+id/radioButton"
@@ -14,15 +12,14 @@
         android:layout_height="match_parent"
         android:background="@drawable/bg_live_gift_item"
         android:button="@null"
-        android:checked="true"
-        />
+        android:checked="true" />
 
     <com.yunbao.live.custom.GiftMarkView
         android:id="@+id/mark"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginRight="1dp"
-        android:layout_marginTop="1dp"/>
+        android:layout_marginTop="1dp"
+        android:layout_marginRight="1dp" />
 
     <RelativeLayout
         android:layout_width="45dp"
@@ -34,20 +31,21 @@
             android:id="@+id/icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true"/>
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true" />
 
-        <TextView android:id="@+id/expire"
+        <TextView
+            android:id="@+id/expire"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:textColor="@color/color_white"
-            android:gravity="center"
-            android:background="#D996cff0"
-            android:visibility="gone"
             android:layout_centerVertical="true"
             android:layout_marginBottom="2dp"
-            android:textSize="8sp"/>
+            android:background="#D996cff0"
+            android:gravity="center"
+            android:textColor="@color/color_white"
+            android:textSize="8sp"
+            android:visibility="gone" />
 
     </RelativeLayout>
 
@@ -56,21 +54,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center"
-        android:gravity="center"
         android:layout_marginBottom="8dp"
+        android:gravity="center"
         android:orientation="horizontal">
 
-        <ImageView android:id="@+id/pay_ico"
+        <ImageView
+            android:id="@+id/pay_ico"
             android:layout_width="10dp"
-            android:layout_height="10dp"/>
+            android:layout_height="10dp" />
 
         <TextView
             android:id="@+id/price"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/gray3"
             android:layout_marginLeft="5dp"
-            android:textSize="11sp"/>
+            android:textColor="@color/gray3"
+            android:textSize="11sp" />
 
     </LinearLayout>
 
@@ -78,18 +77,17 @@
         android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
         android:layout_marginBottom="23dp"
         android:gravity="center"
         android:textColor="@color/white"
-        android:textSize="12sp"
-        android:layout_gravity="bottom"
-        />
+        android:textSize="12sp" />
+
     <TextView
-        android:visibility="gone"
-        android:layout_gravity="right"
         android:id="@+id/tvRedpoint"
         android:layout_width="wrap_content"
         android:layout_height="14dp"
+        android:layout_gravity="right"
         android:layout_marginRight="10dp"
         android:background="@drawable/bg_red_point"
         android:gravity="center"
@@ -98,7 +96,8 @@
         android:paddingLeft="3dp"
         android:paddingRight="3dp"
         android:textColor="@color/white"
-        android:textSize="10sp" />
+        android:textSize="10sp"
+        android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/gift_loading_layout"
@@ -117,4 +116,4 @@
     </LinearLayout>
 
 
-</com.yunbao.common.custom.MyFrameLayout2>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file