修改礼物图标

live/src/main/java/com/yunbao/live/http/LiveHttpUtil.java

@@ -612,6 +612,7 @@ public class LiveHttpUtil {
                 .params("giftid", giftId)
                 .params("giftcount", giftCount)
                 .params("isprank", by)
+                .params("appVersion", CommonAppConfig.getInstance().getVersion())
                 .execute(callback);
     }
 

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -290,7 +290,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
             }
         });
 //        //底部礼物弹窗
-//        ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
+        ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
 
         ViewClicksAntiShake.clicksAntiShake(giftImage, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -6,7 +6,6 @@ import static com.yunbao.live.views.LivePushRyViewHolder.btn_close;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Color;
 import android.graphics.Outline;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -1184,7 +1183,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         }
         customFullServiceNotify = (ImageView) findViewById(R.id.custom_full_service_notify);
         reloadIM();
-        initStarChallengeStatus();
+//        initStarChallengeStatus();
 
         new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1);
         new LoadDian9TuUtil().loadDian9TuAssets2(mContext, wishListLayout2, "rectangle_new.png", 1);
@@ -1249,7 +1248,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mBannerList3.clear();
         mBannerList4.clear();
         updataCleanMic();
-        initStarChallengeStatus();
+//        initStarChallengeStatus();
         enterRoomLeave.setVisibility(View.GONE);
     }
 
@@ -3445,7 +3444,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      * 展示新人任务 Banner
      */
     private void showBanner3(LiveGiftBean bean1) {
-        btn_event3.setVisibility(View.VISIBLE);
+        btn_event3.setVisibility(View.GONE);
         if (mBannerList3 == null || mBannerList3.size() == 0 || mBanner3 == null || bean1 == null) {
             return;
         }
@@ -3478,7 +3477,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      * 新版UI隐藏活动轮播入口
      */
     private void showBanner4() {
-        btn_event4.setVisibility(View.GONE);
+        btn_event4.setVisibility(View.VISIBLE);
         if (mBannerList4 == null || mBannerList4.size() == 0 || mBanner4 == null) {
             return;
         }

live/src/main/res/drawable/background_gift.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="52dp" />
+            <solid android:color="#30000000" />
+        </shape>
+    </item>
+</selector>

live/src/main/res/layout/view_live_audience.xml

@@ -385,10 +385,10 @@
             <!--礼物-->
             <ImageView
                 android:id="@+id/gift_image"
-                android:layout_width="35dp"
+                android:layout_width="36dp"
-                android:layout_height="35dp"
+                android:layout_height="36dp"
                 android:layout_marginEnd="8dp"
-                android:src="@mipmap/icon_gift" />
+                android:background="@drawable/background_gift" />
             <!--特权-->
             <ImageView
                 android:id="@+id/live_privilege"

live/src/main/res/layout/view_live_room.xml

@@ -2163,10 +2163,10 @@
 
         <LinearLayout
             android:id="@+id/lt_trickery"
-            android:layout_width="75dp"
+            android:layout_width="50dp"
-            android:layout_height="75dp"
+            android:layout_height="50dp"
             android:layout_gravity="right"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="5dp"
             android:background="@mipmap/img_buoy"
             android:gravity="center"
@@ -2177,22 +2177,22 @@
                 android:id="@+id/tv_trickery_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="9dp"
+                android:layout_marginBottom="10dp"
                 android:text="60"
-                android:textColor="@color/white"
+                android:textColor="#FD8229"
-                android:textSize="18sp"
+                android:textSize="12sp"
                 android:textStyle="bold" />
 
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/btn_event4"
-            android:layout_width="67dp"
+            android:layout_width="50dp"
-            android:layout_height="90dp"
+            android:layout_height="50dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:layout_gravity="right"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="5dp"
             android:gravity="center_horizontal"
             android:orientation="vertical"
@@ -2202,9 +2202,6 @@
                 android:id="@+id/banner4"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="5dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginRight="5dp"
                 app:delay_time="5000"
                 app:indicator_height="8dp"
                 app:indicator_width="8dp" />
@@ -2281,12 +2278,12 @@
 
         <LinearLayout
             android:id="@+id/btn_event2"
-            android:layout_width="78dp"
+            android:layout_width="50dp"
-            android:layout_height="106dp"
+            android:layout_height="50dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:layout_gravity="right"
-            android:layout_marginEnd="5dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="5dp"
             android:gravity="center_horizontal"
             android:orientation="vertical"
@@ -2294,9 +2291,8 @@
 
             <com.ms.banner.Banner
                 android:id="@+id/banner2"
-                android:layout_width="78dp"
+                android:layout_width="50dp"
-                android:layout_height="106dp"
+                android:layout_height="50dp"
-                android:layout_marginBottom="5dp"
                 app:delay_time="5000"
                 app:indicator_height="8dp"
                 app:indicator_width="8dp" />
@@ -2307,7 +2303,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="30dp"
-            android:visibility="visible" />
+
+            android:visibility="gone" />
     </LinearLayout>
 
     <pl.droidsonroids.gif.GifImageView