diff --git a/live/src/main/java/com/yunbao/live/http/LiveHttpUtil.java b/live/src/main/java/com/yunbao/live/http/LiveHttpUtil.java
index be47f5942..13b68c9f1 100644
--- a/live/src/main/java/com/yunbao/live/http/LiveHttpUtil.java
+++ b/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);
}
diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
index 2ea107897..85237fae8 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
+++ b/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
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 546b41a8d..35009cae9 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/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;
}
diff --git a/live/src/main/res/drawable/background_gift.xml b/live/src/main/res/drawable/background_gift.xml
new file mode 100644
index 000000000..a22bc2b0d
--- /dev/null
+++ b/live/src/main/res/drawable/background_gift.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index 11fd54115..17d450886 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -385,10 +385,10 @@
+ android:background="@drawable/background_gift" />
@@ -2281,12 +2278,12 @@
@@ -2307,7 +2303,8 @@
+
+ android:visibility="gone" />