diff --git a/common/src/main/res/drawable/bg_gift_progressbar.xml b/common/src/main/res/drawable/bg_gift_progressbar.xml index f91038a92..2e2ace398 100644 --- a/common/src/main/res/drawable/bg_gift_progressbar.xml +++ b/common/src/main/res/drawable/bg_gift_progressbar.xml @@ -5,7 +5,7 @@ - + diff --git a/common/src/main/res/mipmap-hdpi/icon_red_packet_open.png b/common/src/main/res/mipmap-hdpi/icon_red_packet_open.png new file mode 100644 index 000000000..3898394ed Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/icon_red_packet_open.png differ diff --git a/common/src/main/res/mipmap-mdpi/icon_red_packet_open.png b/common/src/main/res/mipmap-mdpi/icon_red_packet_open.png new file mode 100644 index 000000000..cb0d8242e Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/icon_red_packet_open.png differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_red_packet_open.png b/common/src/main/res/mipmap-xhdpi/icon_red_packet_open.png new file mode 100644 index 000000000..e69982a34 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_red_packet_open.png differ diff --git a/common/src/main/res/mipmap-xxxhdpi/icon_red_packet_open.png b/common/src/main/res/mipmap-xxxhdpi/icon_red_packet_open.png new file mode 100644 index 000000000..778143449 Binary files /dev/null and b/common/src/main/res/mipmap-xxxhdpi/icon_red_packet_open.png differ 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 bebcf0281..dc7d8c1f2 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -10,6 +10,7 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.graphics.Color; import android.graphics.Outline; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -19,7 +20,10 @@ import android.os.Looper; import android.os.Message; import android.os.SystemClock; import android.text.Html; +import android.text.SpannableString; +import android.text.Spanned; import android.text.TextUtils; +import android.text.style.ForegroundColorSpan; import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; @@ -45,6 +49,8 @@ import android.widget.ViewFlipper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.Group; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -382,7 +388,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private TextView mHourRank, mHotText; private LinearLayout msg; //默认悬浮窗布局 private View mAnchorLayout; - private LinearLayout liveRankPk2; + private LinearLayout liveRankPk2; private ImageView mGoodNumberIcon; private View msg2; //悬浮窗来私信的布局 private ConstraintLayout msgLayout; //悬浮窗 @@ -450,21 +456,20 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public static SVGAVideoEntity drawableTitleEn; public static SVGAVideoEntity drawableBg; - private LinearLayout giftLayout; - private TextView gift_number; - private TextView gift_total; - private ProgressBar gift_progressbar; - - private LinearLayout wishlistLayout; - private ImageView wish_icon; - private TextView wish_number; - private TextView wish_total; - private ProgressBar wish_progressbar; - - private LinearLayout anTask; +// private LinearLayout giftLayout; +// private TextView gift_number; +// private TextView gift_total; +// private ProgressBar gift_progressbar; +// +// private LinearLayout wishlistLayout; +// private ImageView wish_icon; +// private TextView wish_number; +// private TextView wish_total; +// private ProgressBar wish_progressbar; +// +// private LinearLayout anTask; private boolean isComAll; private int mDp500; - //首次进入该直播间 关注弹窗 private RelativeLayout notify_follow_layout; private ImageView notify_follow_coin; @@ -487,6 +492,39 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private TextView new_task_send_gift_details; private ImageView close_task_send_gift_close; + + // 新手任务相关控件 + private ImageView newTaskBg; + private Group newTaskGroup; + + // 红包任务相关控件 + private ImageView newRedPacketImg; + private TextView newRedPacketTv; + private Group newRedPacketGroup; + + // 神龙任务相关控件 + private ImageView newDragonImg; + private TextView newDragonTv; + private Group newDragonGroup; + + // 心愿任务相关控件 + private View newWishBgView; + private ImageView newWishImg; + private TextView newWishNowTv; + private TextView newWishTotalTv; + private ProgressBar wish_progressbar; + private Group newWishGroup; + + // 周星榜相关控件 + private View newWeekBgView; +// private ImageView newWeekImg; +// private TextView newWeekTitleTv; + private TextView newWeekNowTv; + private TextView newWeekTotalTv; + private ProgressBar weekProgressbar; + private Group newWeekGroup; + + public LiveRoomViewHolder setGuardType(int guardType) { this.guardType = guardType; return this; @@ -1802,6 +1840,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis fans_btn = (LinearLayout) findViewById(R.id.fans_btn); mAnchorLayout = findViewById(R.id.group_1); liveRankPk2 = (LinearLayout) findViewById(R.id.live_rank_pk2); + findViewById(R.id.topLayout1_line).setVisibility(isAnchorLive()?View.GONE:View.VISIBLE); mGoodNumberIcon = (ImageView) findViewById(R.id.good_nub_ico); pkRankLayout = (FrameLayout) findViewById(R.id.live_rank_pk); pkRankVf = (ViewFlipper) findViewById(R.id.rank_pk_vf); @@ -2070,11 +2109,33 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis avatar_r1 = (RoundedImageView) findViewById(R.id.avatar_r1); avatar_r2 = (RoundedImageView) findViewById(R.id.avatar_r2); avatar_r3 = (RoundedImageView) findViewById(R.id.avatar_r3); - redPacket = findViewById(R.id.red_packet); - redPacketCountdown = (TextView) findViewById(R.id.red_packet_countdown); - redSchedule = (TextView) findViewById(R.id.red_schedule); - redPacketQueue = (LinearLayout) findViewById(R.id.red_packet_queue); - openRedPacket = (TextView) findViewById(R.id.open_red_packet); + + + // 初始化红包任务相关控件 + newRedPacketImg = findViewById(R.id.newRedPacketImg); + newRedPacketTv = findViewById(R.id.newRedPacketTv); + newRedPacketGroup = findViewById(R.id.newRedPacketGroup); + + // 初始化神龙任务相关控件 + newDragonImg = findViewById(R.id.newDragonImg); + newDragonTv = findViewById(R.id.newDragonTv); + newDragonGroup = findViewById(R.id.newDragonGroup); + ViewClicksAntiShake.clicksAntiShake(newDragonImg, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + new DragonSendMoneyListPopup(mContext, mLiveUid, isDragonTime, isAttention != 0).showDialog(); + } + }); + + + + + //redPacket = findViewById(R.id.red_packet); +// redPacketCountdown = (TextView) findViewById(R.id.red_packet_countdown); +// redSchedule = (TextView) findViewById(R.id.red_schedule); +// redPacketQueue = (LinearLayout) findViewById(R.id.red_packet_queue); +// openRedPacket = (TextView) findViewById(R.id.open_red_packet); + lt_pk_line = (RelativeLayout) findViewById(R.id.lt_pk_line); clickAvatar(); @@ -2172,35 +2233,38 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis pa_pao_layout.setVisibility(View.GONE); combo_layout.setVisibility(View.GONE); - dragonImmediateParticipation = (RelativeLayout) findViewById(R.id.dragon_immediate_participation); - dragonImmediateParticipationTime = (RelativeLayout) findViewById(R.id.dragon_immediate_participation_time); - participation_time = (TextView) findViewById(R.id.participation_time); - ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipation, new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - new DragonSendMoneyListPopup(mContext, mLiveUid, false, isAttention != 0).showDialog(); -// new XPopup.Builder(mContext) -// .asCustom(new GuardUpgradePopup(mContext, mLiveUid)) -// .show(); -// ttttttype = ttttttype + 1; -// buyGuardNew(new NewAllServerNotifyGuardEvent() -// .setAction("90") -// .setGuardType(String.valueOf(ttttttype)) -// .setMsgCn("周末暴打小朋友在接化发直播間開通【星之守護】") -// .setMsgEn("周末暴打小朋友opened 【星之守護】 in 接化发 live broadcast room") -// .setLiveuid("98915")); - } - }); - ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipationTime, new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - new DragonSendMoneyListPopup(mContext, mLiveUid, true, isAttention != 0).showDialog(); -// new XPopup.Builder(mContext) -// .asCustom(new GuardUpgradePopup(mContext, mLiveUid)) -// .show(); - } - }); + + + +// dragonImmediateParticipation = (RelativeLayout) findViewById(R.id.dragon_immediate_participation); +// dragonImmediateParticipationTime = (RelativeLayout) findViewById(R.id.dragon_immediate_participation_time); +// participation_time = (TextView) findViewById(R.id.participation_time); +// ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipation, new ViewClicksAntiShake.ViewClicksCallBack() { +// @Override +// public void onViewClicks() { +// new DragonSendMoneyListPopup(mContext, mLiveUid, false, isAttention != 0).showDialog(); +//// new XPopup.Builder(mContext) +//// .asCustom(new GuardUpgradePopup(mContext, mLiveUid)) +//// .show(); +//// ttttttype = ttttttype + 1; +//// buyGuardNew(new NewAllServerNotifyGuardEvent() +//// .setAction("90") +//// .setGuardType(String.valueOf(ttttttype)) +//// .setMsgCn("周末暴打小朋友在接化发直播間開通【星之守護】") +//// .setMsgEn("周末暴打小朋友opened 【星之守護】 in 接化发 live broadcast room") +//// .setLiveuid("98915")); +// } +// }); +// ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipationTime, new ViewClicksAntiShake.ViewClicksCallBack() { +// @Override +// public void onViewClicks() { +// new DragonSendMoneyListPopup(mContext, mLiveUid, true, isAttention != 0).showDialog(); +//// new XPopup.Builder(mContext) +//// .asCustom(new GuardUpgradePopup(mContext, mLiveUid)) +//// .show(); +// } +// }); // dragonImmediateParticipation.setVisibility(View.GONE); //整蛊转盘优化更新 @@ -2595,21 +2659,71 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis Log.i("红包", "run: 红包倒计时 " + redTimeCountdown); if (redTimeCountdown > 1) { timeHandler.postDelayed(timeRunnable, 1000); - redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown)); +// redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown)); + newRedPacketTv.setText(TimeUtils.getTime(redTimeCountdown)); redTimeCountdown = redTimeCountdown - 1; } else { redTimeCountdown = 0; timeHandler.removeCallbacks(timeRunnable); - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity()); - redSchedule.setText(stringBuffer.toString()); - openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + "")); - redPacketCountdown.setVisibility(View.GONE); - redPacketQueue.setVisibility(View.VISIBLE); +// StringBuffer stringBuffer = new StringBuffer(); +// stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity()); + //newRedPacketTv.setText(stringBuffer.toString()); + newRedPacketImg.setImageResource(R.mipmap.icon_red_packet_open); + setRedPacketText(mRedPacketModel.getRedPacketRemain(), mRedPacketModel.getRedPacketQuantity(), newRedPacketTv); +// redSchedule.setText(stringBuffer.toString()); +// openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + "")); +// redPacketCountdown.setVisibility(View.GONE); +// redPacketQueue.setVisibility(View.VISIBLE); } } }; + + + private void setRedPacketText(int now, int total, TextView tv) { + String redPacketRemain = String.valueOf(now); + String redPacketQuantity = String.valueOf(total); + + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(redPacketRemain).append("/").append(redPacketQuantity); + + SpannableString spannableString = new SpannableString(stringBuffer.toString()); + + // 设置剩余数量为黄色 + int startIndex = 0; // 剩余数量的起始位置 + int endIndex = redPacketRemain.length(); // 剩余数量的结束位置 + spannableString.setSpan(new ForegroundColorSpan(Color.YELLOW), startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + tv.setText(spannableString); + } + + //是否是主播 + private boolean isAnchorLive() { + return mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity; + } + + //这个是设置神龙的状态的 + private boolean isDragonTime = false; + + private void setDragonTime(boolean isTime) { + newDragonGroup.setVisibility(View.VISIBLE); + isDragonTime = isTime; + if (isTime) { + newDragonTv.setTextColor(Color.parseColor("#F9BA03")); + newDragonTv.setText(R.string.dragon_immediate_participation); + } else { + newDragonTv.setTextColor(ContextCompat.getColor(mContext, R.color.white)); + } + } + + private boolean isShowDragonTime() { + return newDragonGroup.getVisibility() == View.VISIBLE && isDragonTime; + } + + private boolean isShowDragonParticipation() { + return newDragonGroup.getVisibility() == View.VISIBLE && !isDragonTime; + } + + //主播倒计时调用接口 private Handler anchorTimeHandler = new Handler(); private int mCountdown; @@ -2635,17 +2749,18 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }); } } else { - redPacket.setVisibility(View.GONE); - if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - dragonImmediateParticipation.setLayoutParams(layoutParams); - } - if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - dragonImmediateParticipationTime.setLayoutParams(layoutParams); - } + //redPacket.setVisibility(View.GONE); + newRedPacketGroup.setVisibility(View.GONE); +// if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// dragonImmediateParticipation.setLayoutParams(layoutParams); +// } +// if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// dragonImmediateParticipationTime.setLayoutParams(layoutParams); +// } anchorTimeHandler.removeCallbacks(anchorTimeRunnable); LiveNetManager.get(mContext).endRedPacket(mLiveUid, mRedPacketModel.getRedPacketId(), new com.yunbao.common.http.base.HttpCallback() { @Override @@ -2670,43 +2785,50 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis timeHandler.removeCallbacks(timeRunnable); mRedPacketModel = redPacketModel; if (redPacketModel.getIsShow() == 1) { - redPacket.setVisibility(View.VISIBLE); - if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(240); - dragonImmediateParticipation.setLayoutParams(layoutParams); - } - if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE && mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) { - RelativeLayout.LayoutParams layoutParamsredPacket = (RelativeLayout.LayoutParams) redPacket.getLayoutParams(); - layoutParamsredPacket.topMargin = DpUtil.dp2px(160); - redPacket.setLayoutParams(layoutParamsredPacket); + //redPacket.setVisibility(View.VISIBLE); + newRedPacketImg.setImageResource(R.mipmap.icon_red_packet_new); + newRedPacketGroup.setVisibility(View.VISIBLE); - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(240); - dragonImmediateParticipationTime.setLayoutParams(layoutParams); - } - if (mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) { - if (dragonImmediateParticipationTime.getVisibility() == View.GONE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) redPacket.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - redPacket.setLayoutParams(layoutParams); - } - } +// if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(240); +// dragonImmediateParticipation.setLayoutParams(layoutParams); +// } +// if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE && mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) { +// RelativeLayout.LayoutParams layoutParamsredPacket = (RelativeLayout.LayoutParams) redPacket.getLayoutParams(); +// layoutParamsredPacket.topMargin = DpUtil.dp2px(160); +// redPacket.setLayoutParams(layoutParamsredPacket); +// +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(240); +// dragonImmediateParticipationTime.setLayoutParams(layoutParams); +// } +// if (mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) { +// if (dragonImmediateParticipationTime.getVisibility() == View.GONE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) redPacket.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// redPacket.setLayoutParams(layoutParams); +// } +// } if (redPacketModel.getCountdown() > 180) { - redPacketQueue.setVisibility(View.GONE); - redPacketCountdown.setVisibility(View.VISIBLE); +// redPacketQueue.setVisibility(View.GONE); +// redPacketCountdown.setVisibility(View.VISIBLE); +// redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown)); + mCountdown = redPacketModel.getCountdown(); redTimeCountdown = mCountdown - 180; - redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown)); + newRedPacketTv.setText(TimeUtils.getTime(redTimeCountdown)); timeHandler.post(timeRunnable); } else { redTimeCountdown = 0; - redPacketQueue.setVisibility(View.VISIBLE); - redPacketCountdown.setVisibility(View.GONE); - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity()); - redSchedule.setText(stringBuffer.toString()); - openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + "")); +// redPacketQueue.setVisibility(View.VISIBLE); +// redPacketCountdown.setVisibility(View.GONE); + newRedPacketImg.setImageResource(R.mipmap.icon_red_packet_open); + setRedPacketText(mRedPacketModel.getRedPacketRemain(), mRedPacketModel.getRedPacketQuantity(), newRedPacketTv); +// StringBuffer stringBuffer = new StringBuffer(); +// stringBuffer.append(mRedPacketModel.getRedPacketRemain()).append("/").append(mRedPacketModel.getRedPacketQuantity()); +// redSchedule.setText(stringBuffer.toString()); +// openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount() + "")); } if (IMLoginManager.get(mContext).getUserInfo().anchorUserType() && (mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)) { anchorTimeHandler.removeCallbacks(anchorTimeRunnable); @@ -2716,7 +2838,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis hindeRedPacket(); } //测试点开红包 - ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.red_packet), new ViewClicksAntiShake.ViewClicksCallBack() { + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.newRedPacketImg), new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { @@ -2751,17 +2873,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public void hindeRedPacket() { - redPacket.setVisibility(View.GONE); - if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - dragonImmediateParticipation.setLayoutParams(layoutParams); - } - if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - dragonImmediateParticipationTime.setLayoutParams(layoutParams); - } + // redPacket.setVisibility(View.GONE); + newRedPacketGroup.setVisibility(View.GONE); + +// if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// dragonImmediateParticipation.setLayoutParams(layoutParams); +// } +// if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// dragonImmediateParticipationTime.setLayoutParams(layoutParams); +// } } public void setRedPacketInfoModel(RedPacketInfoModel redPacket) { @@ -3236,9 +3360,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void initWishList(List wishlist) { if (wishlist.size() > 0) { this.wishlist = wishlist; - wishlistLayout.setVisibility(View.VISIBLE); + //wishlistLayout.setVisibility(View.VISIBLE); + Log.i("nwq","initWishList VISIBLE"); + newWishGroup.setVisibility(View.VISIBLE); } else { - wishlistLayout.setVisibility(View.GONE); + //wishlistLayout.setVisibility(View.GONE); + Log.i("nwq","initWishList GONE"); + newWishGroup.setVisibility(View.GONE); } } @@ -4072,51 +4200,56 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) { mSendMoneyLongModel = sendMoneyLongModel; sendMoneyTime = Long.parseLong(sendMoneyLongModel.getCountdown()); - participation_time.removeCallbacks(sendMoneyRunnable); - dragonImmediateParticipationTime.setVisibility(View.VISIBLE); - if (redPacket.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(240); - dragonImmediateParticipationTime.setLayoutParams(layoutParams); - } else { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - dragonImmediateParticipationTime.setLayoutParams(layoutParams); - } + // participation_time.removeCallbacks(sendMoneyRunnable); + newDragonTv.removeCallbacks(sendMoneyRunnable); + // dragonImmediateParticipationTime.setVisibility(View.VISIBLE); + setDragonTime(true); +// if (redPacket.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(240); +// dragonImmediateParticipationTime.setLayoutParams(layoutParams); +// } else { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// dragonImmediateParticipationTime.setLayoutParams(layoutParams); +// } String s1 = StringUtil.getDurationText(sendMoneyTime * 1000); - participation_time.setText(s1); - participation_time.post(sendMoneyRunnable); + newDragonTv.setText(s1); +// participation_time.setText(s1); +// participation_time.post(sendMoneyRunnable); + newDragonTv.post(sendMoneyRunnable); } else { - dragonImmediateParticipation.setVisibility(View.VISIBLE); - if (redPacket.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(240); - dragonImmediateParticipation.setLayoutParams(layoutParams); - } else { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - dragonImmediateParticipation.setLayoutParams(layoutParams); - } + setDragonTime(false); +// dragonImmediateParticipation.setVisibility(View.VISIBLE); +// if (redPacket.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(240); +// dragonImmediateParticipation.setLayoutParams(layoutParams); +// } else { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// dragonImmediateParticipation.setLayoutParams(layoutParams); +// } } } public void onSendMoneyLongEndEvent(SendMoneyLongEndEvent moneyLongEndEvent) { - if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) { - dragonImmediateParticipationTime.setVisibility(View.GONE); - if (redPacket.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(190); - dragonImmediateParticipationTime.setLayoutParams(layoutParams); - } else { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(160); - dragonImmediateParticipationTime.setLayoutParams(layoutParams); - } - } else { - dragonImmediateParticipation.setVisibility(View.GONE); - - } + newDragonGroup.setVisibility(View.GONE); +// if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) { +// dragonImmediateParticipationTime.setVisibility(View.GONE); +// if (redPacket.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(190); +// dragonImmediateParticipationTime.setLayoutParams(layoutParams); +// } else { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(160); +// dragonImmediateParticipationTime.setLayoutParams(layoutParams); +// } +// } else { +// dragonImmediateParticipation.setVisibility(View.GONE); +// } } private long sendMoneyTime; @@ -4126,10 +4259,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis sendMoneyTime--; if (sendMoneyTime > 0) { String s1 = StringUtil.getDurationText(sendMoneyTime * 1000); - participation_time.setText(s1); - participation_time.postDelayed(sendMoneyRunnable, 1000); + newDragonTv.setText(s1); + newDragonTv.postDelayed(sendMoneyRunnable, 1000); } else { - participation_time.removeCallbacks(sendMoneyRunnable); + newDragonTv.removeCallbacks(sendMoneyRunnable); LiveNetManager.get(mContext).endSendMoneyLong(mLiveUid, mSendMoneyLongModel.getSendMoneyLongKey(), new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(SendMoneyLongModel data) { @@ -4146,41 +4279,54 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }; public void onSendMoneyLong() { - dragonImmediateParticipation.setVisibility(View.VISIBLE); - if (redPacket.getVisibility() == View.VISIBLE) { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(240); - dragonImmediateParticipation.setLayoutParams(layoutParams); - } else { - RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); - layoutParams.topMargin = DpUtil.dp2px(110); - dragonImmediateParticipation.setLayoutParams(layoutParams); - } + setDragonTime(false); +// dragonImmediateParticipation.setVisibility(View.VISIBLE); +// if (redPacket.getVisibility() == View.VISIBLE) { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(240); +// dragonImmediateParticipation.setLayoutParams(layoutParams); +// } else { +// RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams(); +// layoutParams.topMargin = DpUtil.dp2px(110); +// dragonImmediateParticipation.setLayoutParams(layoutParams); +// } } /** * 设置礼物墙和周星榜 */ public void setGiftWall(String giftWallLightenNumber, String giftWallLightenTotal) { - giftLayout = findViewById(R.id.giftLayout); - if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) { - giftLayout.setVisibility(View.VISIBLE); - gift_number = findViewById(R.id.gift_number); - gift_total = findViewById(R.id.gift_total); - gift_progressbar = findViewById(R.id.gift_progressbar); + newWeekGroup = findViewById(R.id.newWeekGroup); - gift_number.setText(giftWallLightenNumber); - gift_total.setText("/" + giftWallLightenTotal); - gift_progressbar.setMax(Integer.parseInt(giftWallLightenTotal)); - gift_progressbar.setProgress(Integer.parseInt(giftWallLightenNumber)); - ViewClicksAntiShake.clicksAntiShake(giftLayout, new ViewClicksAntiShake.ViewClicksCallBack() { + if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) { + // 初始化周星榜相关控件 + newWeekGroup.setVisibility(View.VISIBLE); + newWeekBgView = findViewById(R.id.newWeekBgView); + newWeekNowTv = findViewById(R.id.newWeekNowTv); + newWeekTotalTv = findViewById(R.id.newWeekTotalTv); + weekProgressbar = findViewById(R.id.week_progressbar); + + newWeekNowTv.setText(giftWallLightenNumber); + newWeekTotalTv.setText("/" + giftWallLightenTotal); + weekProgressbar.setMax(Integer.parseInt(giftWallLightenTotal)); + weekProgressbar.setProgress(Integer.parseInt(giftWallLightenNumber)); + +// +// gift_number = findViewById(R.id.gift_number); +// gift_total = findViewById(R.id.gift_total); +// gift_progressbar = findViewById(R.id.gift_progressbar); +// gift_number.setText(giftWallLightenNumber); +// gift_total.setText("/" + giftWallLightenTotal); +// gift_progressbar.setMax(Integer.parseInt(giftWallLightenTotal)); +// gift_progressbar.setProgress(Integer.parseInt(giftWallLightenNumber)); + ViewClicksAntiShake.clicksAntiShake(newWeekBgView, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid, mAnchorName, mLiveUid, true).setFullWindows(false).showDialog(); } }); } else { - giftLayout.setVisibility(View.GONE); + newWeekGroup.setVisibility(View.GONE); } } @@ -5297,14 +5443,26 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public void setShowTask(String url, boolean isShow) { - anTask = findViewById(R.id.anTask); - anTask.setOnClickListener(new View.OnClickListener() { + newTaskGroup = findViewById(R.id.newTaskGroup); + newTaskBg = findViewById(R.id.newTaskBg); + newTaskBg.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { ZhuangBanActivity.forward(mContext, url, false, 1); } }); - anTask.setVisibility(isShow ? View.VISIBLE : View.GONE); + newTaskGroup.setVisibility(isShow ? View.VISIBLE : View.GONE); + +// anTask = findViewById(R.id.anTask); +// anTask.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// ZhuangBanActivity.forward(mContext, url, false, 1); +// } +// }); +// anTask.setVisibility(isShow ? View.VISIBLE : View.GONE); + + } /** @@ -5518,7 +5676,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis RouteUtil.forwardBattlePass(); return; } - if(mBannerList4.get(p).getLink().equals("NewUser") || mBannerList4.get(p).getType() == 999){ + if (mBannerList4.get(p).getLink().equals("NewUser") || mBannerList4.get(p).getType() == 999) { showH5Dialog(); return; } @@ -6014,13 +6172,21 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public void initWishListData(WishModel model) { - ImgLoader.display(mContext, model.getWishlistIcon(), wish_icon); - wish_number.setText(model.getWishlistProgress()); - wish_total.setText("/" + model.getWishlistNum()); +// ImgLoader.display(mContext, model.getWishlistIcon(), wish_icon); +// wish_number.setText(model.getWishlistProgress()); +// wish_total.setText("/" + model.getWishlistNum()); +// wish_progressbar.setMax(Integer.parseInt(model.getWishlistNum())); +// wish_progressbar.setProgress(Integer.parseInt(model.getWishlistProgress())); +// wishlistLayout.setVisibility(View.VISIBLE); + + ImgLoader.display(mContext, model.getWishlistIcon(), newWishImg); + newWishNowTv.setText(model.getWishlistProgress()); + newWishTotalTv.setText("/" + model.getWishlistNum()); wish_progressbar.setMax(Integer.parseInt(model.getWishlistNum())); wish_progressbar.setProgress(Integer.parseInt(model.getWishlistProgress())); - wishlistLayout.setVisibility(View.VISIBLE); - ViewClicksAntiShake.clicksAntiShake(wishlistLayout, new ViewClicksAntiShake.ViewClicksCallBack() { + newWishGroup.setVisibility(View.VISIBLE); + Log.i("nwq","initWishListData"); + ViewClicksAntiShake.clicksAntiShake(newWeekBgView, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { MobclickAgent.onEvent(mContext, "live_room_wish", "心愿单按钮"); @@ -6052,7 +6218,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } wishListProgress = null; WishModel model = wishModel; - if (wishlistLayout != null) { + if (newWishGroup != null) { initWishListData(model); new Handler().postDelayed(new Runnable() { @Override @@ -6742,18 +6908,28 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (wishListProgress == null) return; if (!TextUtils.isEmpty(wishListProgress.getWishlistName()) || !TextUtils.isEmpty(wishListProgress.getWishlistProgress())) { initWishListData(wishListProgress); - wishlistLayout.setVisibility(View.VISIBLE); + //wishlistLayout.setVisibility(View.VISIBLE); + Log.i("nwq","updateTopBanner VISIBLE"); + newWishGroup.setVisibility(View.VISIBLE); } else { - wishlistLayout.setVisibility(View.GONE); + //wishlistLayout.setVisibility(View.GONE); + Log.i("nwq","updateTopBanner GONE"); + newWishGroup.setVisibility(View.GONE); } } public void initWishListView() { - wishlistLayout = findViewById(R.id.wishlistLayout); - wish_icon = findViewById(R.id.wish_icon); - wish_number = findViewById(R.id.wish_number); - wish_total = findViewById(R.id.wish_total); - wish_progressbar = findViewById(R.id.wishlist_progressbar); + newWishBgView = findViewById(R.id.newWishBgView); + newWishImg = findViewById(R.id.newWishImg); + newWishNowTv = findViewById(R.id.newWishNowTv); + newWishTotalTv = findViewById(R.id.newWishTotalTv); + wish_progressbar = findViewById(R.id.wish_progressbar); + newWishGroup = findViewById(R.id.newWishGroup); +// wishlistLayout = findViewById(R.id.wishlistLayout); +// wish_icon = findViewById(R.id.wish_icon); +// wish_number = findViewById(R.id.wish_number); +// wish_total = findViewById(R.id.wish_total); +// wish_progressbar = findViewById(R.id.wishlist_progressbar); } private synchronized void checkNewLetter() { diff --git a/live/src/main/res/drawable/bg_live_item.xml b/live/src/main/res/drawable/bg_live_item.xml index ea074f6b6..2831c1458 100644 --- a/live/src/main/res/drawable/bg_live_item.xml +++ b/live/src/main/res/drawable/bg_live_item.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_live_item_rank.xml b/live/src/main/res/drawable/bg_live_item_rank.xml new file mode 100644 index 000000000..6167d2d24 --- /dev/null +++ b/live/src/main/res/drawable/bg_live_item_rank.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/item_live_user1.xml b/live/src/main/res/layout/item_live_user1.xml index 1e2900005..87273f85e 100644 --- a/live/src/main/res/layout/item_live_user1.xml +++ b/live/src/main/res/layout/item_live_user1.xml @@ -3,16 +3,18 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="40dp" - android:layout_height="34dp"> + android:layout_height="40dp"> + app:layout_constraintBottom_toBottomOf="@+id/avatar" + app:layout_constraintEnd_toEndOf="@+id/avatar" + app:layout_constraintStart_toStartOf="@+id/avatar" + app:layout_constraintTop_toTopOf="@+id/avatar" /> - + + - + android:layout_marginTop="5dp" /> + + + + + + + + - - + + + + + + + + + + - + + + + + + + - + + + + - + - - + + + + + + + + - + + + + - + + + + + + + + + + + + - + + + + + + + + + - + + + + + + + + + - - + + + + + + + + + - - - + + + + + + + + + + + - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - + + + + - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + - + + + + + + - + + + + + + - + + + + + - + + + + + + + - + + + + + + + - + - + + + + + + + - + - + + + + + + - - - + + + + + + + + + + + + - + + + + + + - + + + + + + + - + + + + + - + + + + + + + - + + + + + + + - + - + + + + + + + - + - + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/live/src/main/res/layout/view_live_room_part2.xml b/live/src/main/res/layout/view_live_room_part2.xml new file mode 100644 index 000000000..eb3996920 --- /dev/null +++ b/live/src/main/res/layout/view_live_room_part2.xml @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/mipmap-hdpi/bg_new_task.png b/live/src/main/res/mipmap-hdpi/bg_new_task.png new file mode 100644 index 000000000..696fe7710 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/bg_new_task.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_gift_wall.png b/live/src/main/res/mipmap-hdpi/ic_gift_wall.png new file mode 100644 index 000000000..d903cf237 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_gift_wall.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_close_mic.png b/live/src/main/res/mipmap-hdpi/ic_live_close_mic.png new file mode 100644 index 000000000..28e9288b7 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_close_mic.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_hour_rank.png b/live/src/main/res/mipmap-hdpi/ic_live_hour_rank.png new file mode 100644 index 000000000..184cf7d50 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_hour_rank.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_menu_gift.png b/live/src/main/res/mipmap-hdpi/ic_live_menu_gift.png new file mode 100644 index 000000000..58d01f3cf Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_menu_gift.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_menu_menu.png b/live/src/main/res/mipmap-hdpi/ic_live_menu_menu.png new file mode 100644 index 000000000..69b934cc1 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_menu_menu.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_menu_msg.png b/live/src/main/res/mipmap-hdpi/ic_live_menu_msg.png new file mode 100644 index 000000000..2530ac9b3 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_menu_msg.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_menu_panda.png b/live/src/main/res/mipmap-hdpi/ic_live_menu_panda.png new file mode 100644 index 000000000..8e7070790 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_menu_panda.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_open_mic.png b/live/src/main/res/mipmap-hdpi/ic_live_open_mic.png new file mode 100644 index 000000000..94cdb3dad Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_open_mic.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_shen_long.png b/live/src/main/res/mipmap-hdpi/ic_live_shen_long.png new file mode 100644 index 000000000..0f19b07e4 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_shen_long.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_vs_new.png b/live/src/main/res/mipmap-hdpi/ic_live_vs_new.png new file mode 100644 index 000000000..183dfac37 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_vs_new.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_live_week_rank.png b/live/src/main/res/mipmap-hdpi/ic_live_week_rank.png new file mode 100644 index 000000000..373368959 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_week_rank.png differ diff --git a/live/src/main/res/mipmap-hdpi/ic_new_task.png b/live/src/main/res/mipmap-hdpi/ic_new_task.png new file mode 100644 index 000000000..27c9daae7 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_new_task.png differ diff --git a/live/src/main/res/mipmap-mdpi/bg_new_task.png b/live/src/main/res/mipmap-mdpi/bg_new_task.png new file mode 100644 index 000000000..3d2a38b31 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/bg_new_task.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_gift_wall.png b/live/src/main/res/mipmap-mdpi/ic_gift_wall.png new file mode 100644 index 000000000..195a2e5ca Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_gift_wall.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_close_mic.png b/live/src/main/res/mipmap-mdpi/ic_live_close_mic.png new file mode 100644 index 000000000..8ebf716e9 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_close_mic.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_hour_rank.png b/live/src/main/res/mipmap-mdpi/ic_live_hour_rank.png new file mode 100644 index 000000000..2e272ecc1 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_hour_rank.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_menu_gift.png b/live/src/main/res/mipmap-mdpi/ic_live_menu_gift.png new file mode 100644 index 000000000..c62b34a07 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_menu_gift.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_menu_menu.png b/live/src/main/res/mipmap-mdpi/ic_live_menu_menu.png new file mode 100644 index 000000000..b84bc1fec Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_menu_menu.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_menu_msg.png b/live/src/main/res/mipmap-mdpi/ic_live_menu_msg.png new file mode 100644 index 000000000..f8adb68dc Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_menu_msg.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_menu_panda.png b/live/src/main/res/mipmap-mdpi/ic_live_menu_panda.png new file mode 100644 index 000000000..174ca4d01 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_menu_panda.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_open_mic.png b/live/src/main/res/mipmap-mdpi/ic_live_open_mic.png new file mode 100644 index 000000000..6c59a7093 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_open_mic.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_shen_long.png b/live/src/main/res/mipmap-mdpi/ic_live_shen_long.png new file mode 100644 index 000000000..4d95f6572 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_shen_long.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_vs_new.png b/live/src/main/res/mipmap-mdpi/ic_live_vs_new.png new file mode 100644 index 000000000..205086e50 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_vs_new.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_week_rank.png b/live/src/main/res/mipmap-mdpi/ic_live_week_rank.png new file mode 100644 index 000000000..9648f6c0f Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_week_rank.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_new_task.png b/live/src/main/res/mipmap-mdpi/ic_new_task.png new file mode 100644 index 000000000..bfc8fa264 Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_new_task.png differ diff --git a/live/src/main/res/mipmap-xhdpi/bg_new_task.png b/live/src/main/res/mipmap-xhdpi/bg_new_task.png new file mode 100644 index 000000000..06f1fb961 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/bg_new_task.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_gift_wall.png b/live/src/main/res/mipmap-xhdpi/ic_gift_wall.png new file mode 100644 index 000000000..aeec64429 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_gift_wall.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_close_mic.png b/live/src/main/res/mipmap-xhdpi/ic_live_close_mic.png new file mode 100644 index 000000000..6df56addf Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_close_mic.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_hour_rank.png b/live/src/main/res/mipmap-xhdpi/ic_live_hour_rank.png new file mode 100644 index 000000000..a0ac1856f Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_hour_rank.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_menu_gift.png b/live/src/main/res/mipmap-xhdpi/ic_live_menu_gift.png new file mode 100644 index 000000000..c0fe92d1c Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_menu_gift.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_menu_menu.png b/live/src/main/res/mipmap-xhdpi/ic_live_menu_menu.png new file mode 100644 index 000000000..197406847 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_menu_menu.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_menu_msg.png b/live/src/main/res/mipmap-xhdpi/ic_live_menu_msg.png new file mode 100644 index 000000000..6413f50a2 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_menu_msg.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_menu_panda.png b/live/src/main/res/mipmap-xhdpi/ic_live_menu_panda.png new file mode 100644 index 000000000..7c0e4b4b7 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_menu_panda.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_open_mic.png b/live/src/main/res/mipmap-xhdpi/ic_live_open_mic.png new file mode 100644 index 000000000..9256e1c4c Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_open_mic.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_shen_long.png b/live/src/main/res/mipmap-xhdpi/ic_live_shen_long.png new file mode 100644 index 000000000..f57193744 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_shen_long.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_vs_new.png b/live/src/main/res/mipmap-xhdpi/ic_live_vs_new.png new file mode 100644 index 000000000..486117ca9 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_vs_new.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_week_rank.png b/live/src/main/res/mipmap-xhdpi/ic_live_week_rank.png new file mode 100644 index 000000000..349cf4bd6 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_week_rank.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_new_task.png b/live/src/main/res/mipmap-xhdpi/ic_new_task.png new file mode 100644 index 000000000..ef11be2d4 Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_new_task.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/bg_new_task.png b/live/src/main/res/mipmap-xxxhdpi/bg_new_task.png new file mode 100644 index 000000000..3faa8d067 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/bg_new_task.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_gift_wall.png b/live/src/main/res/mipmap-xxxhdpi/ic_gift_wall.png new file mode 100644 index 000000000..a8909414c Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_gift_wall.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_close_mic.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_close_mic.png new file mode 100644 index 000000000..4c8e2b981 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_close_mic.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_hour_rank.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_hour_rank.png new file mode 100644 index 000000000..cfc5e3fe5 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_hour_rank.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_gift.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_gift.png new file mode 100644 index 000000000..d8a04db5d Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_gift.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_menu.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_menu.png new file mode 100644 index 000000000..e6bb10d62 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_menu.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_msg.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_msg.png new file mode 100644 index 000000000..46aae28bc Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_msg.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_panda.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_panda.png new file mode 100644 index 000000000..d073682ed Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_menu_panda.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_open_mic.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_open_mic.png new file mode 100644 index 000000000..a501fc9a6 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_open_mic.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_shen_long.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_shen_long.png new file mode 100644 index 000000000..20329dd86 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_shen_long.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_vs_new.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_vs_new.png new file mode 100644 index 000000000..1efda9af9 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_vs_new.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_week_rank.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_week_rank.png new file mode 100644 index 000000000..1724185d1 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_week_rank.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_new_task.png b/live/src/main/res/mipmap-xxxhdpi/ic_new_task.png new file mode 100644 index 000000000..1995ea3a6 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_new_task.png differ