From c58b37d111b57c024f91f5814a0cbdddc18d5333 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Thu, 12 Sep 2024 16:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E8=A1=8C=E7=9A=84UI=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/bg_gift_progressbar.xml | 2 +- .../res/mipmap-hdpi/icon_red_packet_open.png | Bin 0 -> 3417 bytes .../res/mipmap-mdpi/icon_red_packet_open.png | Bin 0 -> 1778 bytes .../res/mipmap-xhdpi/icon_red_packet_open.png | Bin 0 -> 5102 bytes .../mipmap-xxxhdpi/icon_red_packet_open.png | Bin 0 -> 16488 bytes .../yunbao/live/views/LiveRoomViewHolder.java | 554 ++++++++++++------ live/src/main/res/drawable/bg_live_item.xml | 2 +- .../main/res/drawable/bg_live_item_rank.xml | 5 + live/src/main/res/layout/item_live_user1.xml | 18 +- live/src/main/res/layout/view_live_room.xml | 535 +++++++++-------- live/src/main/res/layout/view_live_room1.xml | 179 ------ .../main/res/layout/view_live_room_part2.xml | 281 +++++++++ live/src/main/res/mipmap-hdpi/bg_new_task.png | Bin 0 -> 5330 bytes .../src/main/res/mipmap-hdpi/ic_gift_wall.png | Bin 0 -> 1442 bytes .../res/mipmap-hdpi/ic_live_close_mic.png | Bin 0 -> 1069 bytes .../res/mipmap-hdpi/ic_live_hour_rank.png | Bin 0 -> 188 bytes .../res/mipmap-hdpi/ic_live_menu_gift.png | Bin 0 -> 6626 bytes .../res/mipmap-hdpi/ic_live_menu_menu.png | Bin 0 -> 2460 bytes .../main/res/mipmap-hdpi/ic_live_menu_msg.png | Bin 0 -> 2699 bytes .../res/mipmap-hdpi/ic_live_menu_panda.png | Bin 0 -> 4255 bytes .../main/res/mipmap-hdpi/ic_live_open_mic.png | Bin 0 -> 1013 bytes .../res/mipmap-hdpi/ic_live_shen_long.png | Bin 0 -> 5763 bytes .../main/res/mipmap-hdpi/ic_live_vs_new.png | Bin 0 -> 1164 bytes .../res/mipmap-hdpi/ic_live_week_rank.png | Bin 0 -> 1191 bytes live/src/main/res/mipmap-hdpi/ic_new_task.png | Bin 0 -> 3808 bytes live/src/main/res/mipmap-mdpi/bg_new_task.png | Bin 0 -> 2376 bytes .../src/main/res/mipmap-mdpi/ic_gift_wall.png | Bin 0 -> 848 bytes .../res/mipmap-mdpi/ic_live_close_mic.png | Bin 0 -> 555 bytes .../res/mipmap-mdpi/ic_live_hour_rank.png | Bin 0 -> 160 bytes .../res/mipmap-mdpi/ic_live_menu_gift.png | Bin 0 -> 3420 bytes .../res/mipmap-mdpi/ic_live_menu_menu.png | Bin 0 -> 1221 bytes .../main/res/mipmap-mdpi/ic_live_menu_msg.png | Bin 0 -> 1418 bytes .../res/mipmap-mdpi/ic_live_menu_panda.png | Bin 0 -> 2153 bytes .../main/res/mipmap-mdpi/ic_live_open_mic.png | Bin 0 -> 517 bytes .../res/mipmap-mdpi/ic_live_shen_long.png | Bin 0 -> 2814 bytes .../main/res/mipmap-mdpi/ic_live_vs_new.png | Bin 0 -> 651 bytes .../res/mipmap-mdpi/ic_live_week_rank.png | Bin 0 -> 612 bytes live/src/main/res/mipmap-mdpi/ic_new_task.png | Bin 0 -> 1862 bytes .../src/main/res/mipmap-xhdpi/bg_new_task.png | Bin 0 -> 8356 bytes .../main/res/mipmap-xhdpi/ic_gift_wall.png | Bin 0 -> 1987 bytes .../res/mipmap-xhdpi/ic_live_close_mic.png | Bin 0 -> 1265 bytes .../res/mipmap-xhdpi/ic_live_hour_rank.png | Bin 0 -> 187 bytes .../res/mipmap-xhdpi/ic_live_menu_gift.png | Bin 0 -> 10066 bytes .../res/mipmap-xhdpi/ic_live_menu_menu.png | Bin 0 -> 2471 bytes .../res/mipmap-xhdpi/ic_live_menu_msg.png | Bin 0 -> 3695 bytes .../res/mipmap-xhdpi/ic_live_menu_panda.png | Bin 0 -> 6249 bytes .../res/mipmap-xhdpi/ic_live_open_mic.png | Bin 0 -> 1104 bytes .../res/mipmap-xhdpi/ic_live_shen_long.png | Bin 0 -> 9305 bytes .../main/res/mipmap-xhdpi/ic_live_vs_new.png | Bin 0 -> 1559 bytes .../res/mipmap-xhdpi/ic_live_week_rank.png | Bin 0 -> 1503 bytes .../src/main/res/mipmap-xhdpi/ic_new_task.png | Bin 0 -> 5874 bytes .../main/res/mipmap-xxxhdpi/bg_new_task.png | Bin 0 -> 38509 bytes .../main/res/mipmap-xxxhdpi/ic_gift_wall.png | Bin 0 -> 5930 bytes .../res/mipmap-xxxhdpi/ic_live_close_mic.png | Bin 0 -> 2474 bytes .../res/mipmap-xxxhdpi/ic_live_hour_rank.png | Bin 0 -> 299 bytes .../res/mipmap-xxxhdpi/ic_live_menu_gift.png | Bin 0 -> 30964 bytes .../res/mipmap-xxxhdpi/ic_live_menu_menu.png | Bin 0 -> 3868 bytes .../res/mipmap-xxxhdpi/ic_live_menu_msg.png | Bin 0 -> 9311 bytes .../res/mipmap-xxxhdpi/ic_live_menu_panda.png | Bin 0 -> 17914 bytes .../res/mipmap-xxxhdpi/ic_live_open_mic.png | Bin 0 -> 2168 bytes .../res/mipmap-xxxhdpi/ic_live_shen_long.png | Bin 0 -> 30571 bytes .../res/mipmap-xxxhdpi/ic_live_vs_new.png | Bin 0 -> 3441 bytes .../res/mipmap-xxxhdpi/ic_live_week_rank.png | Bin 0 -> 4961 bytes .../main/res/mipmap-xxxhdpi/ic_new_task.png | Bin 0 -> 18691 bytes 64 files changed, 940 insertions(+), 636 deletions(-) create mode 100644 common/src/main/res/mipmap-hdpi/icon_red_packet_open.png create mode 100644 common/src/main/res/mipmap-mdpi/icon_red_packet_open.png create mode 100644 common/src/main/res/mipmap-xhdpi/icon_red_packet_open.png create mode 100644 common/src/main/res/mipmap-xxxhdpi/icon_red_packet_open.png create mode 100644 live/src/main/res/drawable/bg_live_item_rank.xml delete mode 100644 live/src/main/res/layout/view_live_room1.xml create mode 100644 live/src/main/res/layout/view_live_room_part2.xml create mode 100644 live/src/main/res/mipmap-hdpi/bg_new_task.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_gift_wall.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_close_mic.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_hour_rank.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_menu_gift.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_menu_menu.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_menu_msg.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_menu_panda.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_open_mic.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_shen_long.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_vs_new.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_week_rank.png create mode 100644 live/src/main/res/mipmap-hdpi/ic_new_task.png create mode 100644 live/src/main/res/mipmap-mdpi/bg_new_task.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_gift_wall.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_close_mic.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_hour_rank.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_menu_gift.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_menu_menu.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_menu_msg.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_menu_panda.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_open_mic.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_shen_long.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_vs_new.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_week_rank.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_new_task.png create mode 100644 live/src/main/res/mipmap-xhdpi/bg_new_task.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_gift_wall.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_close_mic.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_hour_rank.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_menu_gift.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_menu_menu.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_menu_msg.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_menu_panda.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_open_mic.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_shen_long.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_vs_new.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_week_rank.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_new_task.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/bg_new_task.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_gift_wall.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_close_mic.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_hour_rank.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_menu_gift.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_menu_menu.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_menu_msg.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_menu_panda.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_open_mic.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_shen_long.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_vs_new.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_week_rank.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_new_task.png 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 0000000000000000000000000000000000000000..3898394ede295796b14910d484a3f77e32c2ce79 GIT binary patch literal 3417 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cb0d8242e54bcc7f3eeef0ee586a5666e7495efb GIT binary patch literal 1778 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 Q-T(jq07*qoM6N<$g4o0Uga7~l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..778143449b4b422c05c7332266e100f853943797 GIT binary patch literal 16488 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 P6lL&q^>bP0l+XkK`&+SU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..696fe771030ed3f7de02384b41ea17cefcf6a29c GIT binary patch literal 5330 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..28e9288b7e125e228430570be8dd5aa3c01b7393 GIT binary patch literal 1069 zcmV+|1k(G7P)Px&=Sf6CR5(v%RBuRYWf*^-b3C)%qb;X4Z?-Q>?^V%polYq(p)pKC0*!IA4;C%m zjg=&X2*y-of>Z`Y<(%t-jV>WMltS!-h$+Kt3qowh8lhLZ>FtiA&VR>qo_NLX_kDi<4zP!o-EQY&v6uk>su*J>h?vK59EXSxIF5@W;?KFcx%*2?OBa`0;qr^s zYAsS#^|@p+c})-m4geHMl4OqKm?(-uc6N3aA_5|A$+GU29nf`wdvREwTjIp+} zvoqe|aFj+Okv#wam&^5xqA050?_Upx!+-NUPd)UUGsc3ENaR;KEOk(2Wu-x*(Kr}m zf+R^7V`F1Co0^)QMMS36YOl~9MN#DL?rv`=6xyc?(vw`Ao}T(QH#hG=LqkKBBuVW6 z@DyVVX+t8BkY{ISZ&g)QnJ+_+Mx&c8EiGT^bh@l`9aL5Qt+cfCYpAKIxr&G`#+ZD$ z$!Iic{eJ)J`T6;UnYtuN56ous2L%NMnoJE5d5+^ghuYfO7ZCAjL`DE<_z$Pk`4Z3bsR<-WN|?>&_w{0-2M39|y1EaChKA~AW@ffxvDi_X=Y4|aCP`_M#>U3S z2L}h+o12?I2?m32==J*i_V)IVeLml7d3kw-ySux0?RNVY^Yim>yWQ?P%gf7qG#Mf) zP+eX99suxkqse5-nVOn<)9G|h)YsQvb-7$GZ*OnMJs!`uUaz-%Vq#)?Wo6~A*Xwn5 zbaZ?ckH={uf`AxXJ_!_H-D};TwH9FW%-miBz}g6hrb&iAMfn% z@Beafaq-WzF$Dnl6ey(ec>ES3UdtF#Q4~BrK2~ftn_+Zx^i@?=)xN&I!0PJiURPIF zxxrw_9T^$%FD|?G8&DKP@T9; z^CO?1pZh7i4~MpuF-ERUMJ1U`D!skEHv~c8JswY36vdRfX@V&UGye%~#_kkeK@ge% z;5tc4Mkklk_ne#@ficFZs)~ph6$D{%eSQ7j|9&Hx0)_bS@URd7s#R4r0f3%30)PZ# nECv9-m`tX<>FMc|IGObie@n|asR>pj00000NkvXXu0mjf$g%b( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..184cf7d50b67aa7cbfb00fb222b8be26f55659a9 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^d_c_4!3HF+i2N%7QjEnx?oJHr&dIz4a>_hi978Pp z-%d8h(ut literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..58d01f3cf4a756c1aa30064cf73e7c290844949f GIT binary patch literal 6626 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%0Ay&4``H|zvT!^B zXi!-Nf7GEsbE)BJ^BnZb>Y}>8us(X|hDTZ+GnCZgsAMW}VoFiTRU+Xdr962_#Er~) zdmq1g;k&hQcQ!v@!)FekHZwhxJKknt8*Dnwv^GU4vAQ1BwT`xQY0RGL+kbo}|I&Ul zMjR~4aSSO7&q+&OYfR}v_a98uJL)rF>jJ>gnJD;~Q$UF-)Yw$BY|YEtm(N>Neqhy( zs5+`GLAg}Un@S~oOK+OLiJTP#;;N1Igi^?`eJXr;quUH|#{sF@cg& zNTSGi^p|X7>-7gb0xrt7lxHZ5od|yObG#{h)E?WmNCjIq9iH8l`3(`x0GWa!n0H= zA&Gbrfj@Zi+`oVP!x-G>oP7U@X3RKgq+{_^lUE}j0FV(b*OJHyYpwJ?JZR+v7fyH& z#-$67ZiEJbb4g5c;$g>4O38#06n3T(DJV_^OCm+F5G+X&R3b@H_#Q`8Nn$D|2}Lo> zO*Omg^lx4JPOrExKtEJ?_H>eQ(~oa$W8xqpHoTFiId?AS7Da8AobsUSVUt1%6`~h1 zY=LveS=j1NB4R=?9`a5p&PtJFNhB$eij|UxlJGu>StXH3;)Iu!N*Kedy*<_6oOSsP z@AQfL0`Mc{w-h_Og2UJhXz zOBO{+l%t51VG50crB_kulGYpX=5lJSbkRpz`h!vNmSQSSUORgB(#fYzS@GDopzT=f| z|M(ZX`Y*EE1neVY{KOv59vDku!h{KO@ZiBwt5W5$V~37zYE~oSNDPamY*PwNB`G7N z1TjulDc&nQIzVpShHbl6W?A0#+QyCP!iCT69+n?DJm0?zp9GWdSLy-4??3nZ-|s$! z9ngn?-IehEPX_m~OUOP3%K)I=0l&j`|2YOg4uBaLKkwru_Wfg@B$Io(>YmtqPv5-T gKYe1%z5ho3A5<;8?u=UdRsaA107*qoM6N<$f{JV5^8f$< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..69b934cc1934cc885b443990b086ee170c417ad9 GIT binary patch literal 2460 zcmV;N31jw&P)Px;R!KxbRA@upT7OKF=^g*R(jLECK+0_%HxBDLu!`M~ETC?<(=c?Ni^K~faR|&G zJCg;xC70WDdP`WA^D@N)@qjr0Kus4+2A_jsy44$Blp9_-W z!hK;RVB!R6B+X>i!ez+sIV{{b5#1-EC*h0_7fiAs4NNfK1j!5w>L)pOIAFd`L@&>i zG(s^8Px%EAjYy%91M?CQ0nA+3Mx+u3uK)w*5R|0A00h814?slb!7prRG#HvtU|=J! z&Vy6(5SPsx5A{r#3Y3T-nNg*PvRH#5T zH8wVOJT*0SjT{j1KF4wH6DLmW*}He|Kk>iy>({H=+uPd|3PqCLZog$RnJ#f0=Pf8G zC{?S~dH_D<}D{sGC0+++5+ef`R<Qx;b9q(-1xbbQj z(!rv4i7M|8<{LzmCSeQQ+O=y{H*VbcbYx_tqqw-Zc64+U8E;UsTCJW77cP8v%a$#_ z7r|(?+Sty{&fjV@n(t+2XRq$->znjrc&ekLV{=haQSF^OcbbFKCbLR?6N=oW_dU~3cFJFElKR;h}<;s=DgoK1w z7A#osZ6b>I8_yaHh7FrGZF+xjaIm$ktgN}ezkkx{biyG>g%I5DAtF|MD3ypH8L2_D z22)&IoZQydc824)M{#j+TZkyu4~*MvHvcRqC+AJC*E`{Ix$cjRjhT-fJ9g&Ckt0Yt zLpcPfI_}#hSuGi~-5FH(z zl$e-^@StE>)>=_f@src1Pk$-F+(USGfPso-3svDc>i&zUhe=5M7>)P7d-sw}zWBkbpVu-;8 zaO>8sQ(e1u?Nf)t@tM(RJmc|rV5~ujWm)fv6)SRdI^8ZIXx3S+)?;aDX|Hh{=i)ey z<$2!AFpLLznaAUqbi3UTCnqOIr>3SRG#ZUQE-o&U=lQ9cnwrwOx;mu(QlY~aXAr#P ziZn3n%anPZH^~IoKyX}VXXkqb1qB}!6%{3&JbAJvK0f~C*w|PN!!SyQVPFGMxC+1F zU88uOce&l}k*21mcdM(bZ_C*icms%BnfT&=+uPjSoV$AU>hAy*&r542!!R^HKK^j~ z_U)JM-o1;)9|oXL24{osaqy7Y+1Uvh85xO-7A;ClPEJmUjg5^N85#L<$BrGJ37s1B z=VU1o$xH_~p(`o-a^V3OESiHpI}o~=fvXVgH=f5>bVcRL0iWhXVlx=vH5!dS%FWIF zv7jDufEcIKIZ#R&6B%20;<)caVLb)G+ezOkyR>hEEgg3o5c z^=ACSg$orno9(YW&wIRHuR})7c!ptO6$(Xy*=%mm>-7x|hvT$bt^O9vvT(7IaSi1~ zbab=^sn4oatKPYH?;fIjD4ObI-Mc2=JD}y&w&F6R&Us_p;qu_ zMhA8I7#bStwApNbE-Wm3yQilIwk8F}7iZ=x0}#Qe zw{G29YA_hkB$uMcJkR%q31&J2n6KPyuEF?nv-!%J=Mv0x)-2{{Xl6*!Y;&`@1cPmm zq4}&d=L*bIl_sQt2#X#-u=HA#*7GVEcvSQNJpMTuI{hz()18@NaW)r{0sjw#9>7xx zCT{2@QitbJGRWG|T=WItz-$@2VoO6b%>BW9oSvTkE4g~+)TvYJ%gf6@^beX*QBkU_ ztgP3EhlgRba&hLqM4Ulvxl2UICVUhKMyl7$FIloAdSGDSFEUJg<+j;uuGj1J#~ltw zt6Hr_$q_bBRkh*%fv; z9A1mXf}rM`DfCa%eV9>oy zxpH|C5#jSZ00OW77Cu4OM-B`IJukb>=qCr=%M9hsLTSYR%{c%OAW8*f2{>*NmM5E~ zt-#Px^E~qt8X{ltLI|wb{y^z47q$e|M`RxoPCA9XaN*cYum#4d!7-q0!1tNH$N$~p zsU}2pNF(Bfnk^HM4kV=#cEM(P-V6un5Yhi9=gk78g+=i{35e}I01I^zP&_aP5YOx+ a;C}$w7F0;}uyRBI0000Px?#D zHFPm8k)kzLOIl+KRf7^@!^jjD(n>2ajaWg&(3aYYD<~aBaF}^-=IzUE&b{|d$8msr z-;CDuORf(y-*W!nIp=@QcfL>>u zMTXNv_$nak00=mfiQv-8zXR7OuUY=h07)PL^f-VklBrTKGOiV<15{_{D-vM9AOS8K z>IOQUe|wtKD;N=6G;y?JRzvN)Cjo}&EHa5Xe&A@TIsw>$ww*n35CmR@I^P#%pS-54!gD+FwMZ2FGw4Q5>}XUFYwXf&>RWOXh6Vx9=_pK z!y>DI5po!^9S)3u5HKSRM4VexiN=tvtnnAXLI_6>#RP!oxd96QpcH7bU_acT2~ zlTVDz%NtYoKfK|c2k%(1^DU1m5|ev-C?6UMjIh>MocQ5!ox^r7Zd|C%nL9i1Q=03b z{%SH=b>DdlR$uYQ7eA0->7@xNyg8WV27?i{I>w3UUM6?bH}~dJ?ioLxa~T&vYq}Nc zC$jvmRhQiPz;@YbFXkre^#bnz{c&jU1hv3~fgRjPd5AvZYw{_f5WZB3V*6E`ao#E1 zr;G!=c`kWvQvBk@Pha@db8jE4V4csH+dwe#$7xPvuVC&^4ar}9dTZ-7v%@p%Lhp}J z)0s%Nk3yzM@6;CNM5o1?_hn;$-t<~+$9IiOT8biW!b8U&LN zibEs`5e0$)@W()_1}zM#0j2^=OZ3aneR;g-vmZ2e0G zF-}geZ^%?Z;JD$^@fi~)#5OIsrdAi&<&Fv8Tys|i8!Pegbpg}hr1!25K||O;{?+T2TzS&;aZ4z4K`{=cE>OE5 zoPe4X)Tj`PL0~laTS2b{Uldd^i~U7E%dYlMEvC-s0j!Pm@HK1 z?fOl~fI#fO{-SB1`amf{;h;JH2Tz`}_UX6wdltkVV8xlQRj?E0%;p)9_SwsBA9Kv; zc~*dwYEe!QW&mpt?Q2Qon= zO^BWoJdQM9xM2PHC$~(z&S(fUNfgJI!7?!mOb@7%wn&^wLo^3bF(V%YgW#_MJz~ch z3rNXgvvjhv^MZxzuG+MxE$2 zj{edoY(iKABV-3oUD6o=BW@}oB1bmW`SG_Gue<#B-p@8=;Ff0G`b^>1(^t&6>DjQtviW>xT5E3wAVulSw zw4zDUDL@oZ^R{NS1S=nY;`)U@fAy~w_;5d)xs5Z0hg*Ji!h$&qS2Ljt{5eolpo<_$ zF#8~v05u6l8Ui^8I3^Yl6BAkv*jmwa2aHooH#6W%^7@V~k50R+{ecSDwLi{y$pBJa zU*Eg7c6#hY#-?ls7n2e|dLL+Mrv@(nFJOvxvJ~)v;Rn9}5nm~rn1B(@2!SNYcfZ-| zKYc};qZuz5yreT$2H+_-J3D+Zex77I^TT{@l!S);ue4YIOaSRm&Pi z*R?U~6BwI@dO5dbK$l+uQUId_h6;WaBtU9D+r%s|4lT>sN;D&23JLOk`wrf4_oG*? z*}P9`V{Wz6pEZ~BGbv_xY02j&{r2M1nx`z%t8;ad$=df+&SS{qn1xvaPGv~x-%n< z##HJP(2|A5BGf1l5q}XNVrt?mimf3DmR4?C8enQ^%tE}h?X~Uqp7Pztf9Dd+r%syA z*~+Q`NKE$HtORvtWLo5+QKucfsO{_reCbp*bs1>RL$eBXI#h)q=#YRI9wYpAqKp`vvRJXMyNoFxkDId?}`wqlcbv*O^+aBGu!zDe7{F0bT4d7GA zJ$F6SasBe&tbea8o$y&uw<-W6@|5y63rO>FnI(PS1^TO@gTahctvPr1<(Eup zY6?fMU$OcXXQ#ag>P9O^tToFdBXtW*;=`JWrEzyIe_aV1(rU%rvt3at%1--R6;ayakZ&%K%7Z{m}V_+^i#kkwIUU+h&O+ zL*8YUk+}gQegALX0hEEuQ9-fZeBD!e9^F|F<2+@vcDh7lHoDRLd zHM(icve*mU%NGgunnBxEd002ovPDHLk FV1h|N3^V`$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8e70707900bfc033736d352b72da5fafec0c1627 GIT binary patch literal 4255 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�Nv+2YIInRLOKW1|bV zw5@lw1#PHaCogSUC5>)59xV-pblGjQVf=X`api@hFk;kb_;Pbi$JO4{pt8E%b|}qn zt*u7+R~xWyy{HrWq$>nLKM|ZU>XxYy)#E4CII$fgEu88Sg4<4N|0V6NC z6oNN}I(Y!4G*Uu$)nMQnmBtzn@?+1|Z!q`Ox6s%cfU0Ud6p3oEsWxAsqy{zZwyJe4 zRNK?u@lj$j&7r_b_vwkgoI3rzlavDd#_JQgS5+LVJB%5Np2g0C)n=zA5{<%P zSCHazAl2&z%L+E!vS_qF+#v3Jao*ZjcdkE5W5SM$_;0p)06z*$bm6RIkvF}!Pq|`d z>G?vgG1C8@|B7*gNBh37Ye2v3OuYQwT2RqRO~FVsh6ipQkFtrAAlTjQk|7D51fzqi zI+z;9nzjGI>}9XR<+PigOw(eRH}yK~s;WUr!I}7c-)7x?ooAKOU@Kqyw_Q7{_czn* zv*RL{T@kO6J4RWWiVf^!GRC1OeDsL)$1gg2%x|Y$a~ZzdT7i3)u7cfWGaG}{fA+c@ z_L~!Nw**H|+2t`rM1T@eV!Lwx(aM>m2;hoPm;FE9H zZu@d$!!*kmCL40mZ{Gu;W`?;sg6XW+9KW9x6ewq3d(p)!=iM?{Fly>B{;8EX*wg}9 zl)yMQrSs2)^Dv^g1iC>j{rEQRof&f9_09D-zigJ-PbQa6{pB-!ZhSKL4x|(nV)+Lj z;_XjAd|=-`ecdVSxXWHM?VM~1a8kS!{m&YbbJvWku9)hK>G`vg2OyGov9n|@*?cDPIk|V5_ae^t#eqmHMGzr!ju5zTj4`%%Y-!$}F~x)W zx>D0TvdtlivJ9p(Fg?t|CtAbX4;-#uwQX;IS(Hm4urmZfOyP`kx6Rh-P~@$3C;T5- zFFqs#(xdrIoIoFIy4+cBfQ-+oWKOCq9Zr0FcdBj=sdM6(FmXOg&nJ!)J03ob0h7)) zyGpaO0nn$bW=AL5a9V#RUhAz-Qo>zj9fu+sRWeXw%+7pXou7n%T23e)X_>yFKI z<{rs0P}x8y_;cwb(x!tU5ERi#8a+O!U&;hYha}|#;Ijpw;_)T^CSV*`XKw<=Uzj5hr|nI^{|0SPx&uSrBfR5(v<*XAWvw^|$4sF)>v&?2oAUrY(hZV|zP z+1l0z+3HJ)Kj4GZQlXY5YAD!c+aks{g$hNa5P#4Xv1zuXd9h+z)5!Q6GnqN%Ofw}b zy)ZEM!ujs`zVCb&*tO;Ldihu^Rtf;GF~%wo(ZX>YhlnYTj{eM7Cr?Z+d z=3$Hpj4@Oc1)Wakb3UK%HvI>K!L9A>?Z0`RryBY)jIqU?ot<9^OarQ|tt~Ye4DaPY z7$TzE?Jk*|ob>TLPryu36uGajFAxrgj{rb#Ae&C7gONxi0nN?L1(GD)1%Q{S6DpD< zDZ8|^bg!zaswSU$G#ZVxx3@nQMX?}v4yvmDR#{p39n{y?mm%T@j4@d+N+y$;-QC>> zq9|JPfh0*vIUJ6O;^Jb1evXJd$8is#p`qbzM7)iNnhUC`vQ#QXKp%^uXt@S->~J_f zwOXwPGCFn%$ z7>~!PBcg{yjf5^CYDS}xpP8BQ7z_rXqodMGmQ(-XS9yi{`3k_7Y?0K86O6TO<6nrCNcXYZe!oE-c8{)KQjoTOV_F4yy;qoeOw zEEY?5cXuEXiJTBE5*q-*MC}G+>^=YxI+JBtwb^XOKp=3hyu93&$z-lnRi$o?hlhuM zbai!ook%3of*|~B8)E_hdX*9yd3F;h*3che%RXDO6avuy+?FNAwE4lEdhW!RaNZ(U{zIB1%PA5SPTGm j?RNWL^YinXIr{nsofNV-31M9_00000NkvXXu0mjf?iSSz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0f19b07e47ec04ab2174f7982b15afa797b0773c GIT binary patch literal 5763 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