From 13646d64c7593c0f13f4755936e68b0870bcc03e Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Fri, 23 Aug 2024 18:16:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=82=E4=BC=97=E8=A7=82=E6=92=ADnotify-push?= =?UTF-8?q?1=20push2=20push3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yunbao/common/Constants.java | 2 + .../common/bean/EnterRoomInfoModel.java | 32 +- .../live/activity/LiveAudienceActivity.java | 5 + .../yunbao/live/event/LiveAudienceEvent.java | 13 +- .../yunbao/live/socket/SocketSwClient.java | 4 + .../yunbao/live/views/LiveRoomViewHolder.java | 277 ++++++++++++++++-- .../live/views/PortraitLiveManager.java | 15 +- live/src/main/res/layout/view_live_room.xml | 19 +- .../mipmap-xhdpi/icon_live_room_follow.png | Bin 0 -> 13631 bytes .../mipmap-xhdpi/icon_live_room_followed.png | Bin 0 -> 6114 bytes 10 files changed, 334 insertions(+), 33 deletions(-) create mode 100644 live/src/main/res/mipmap-xhdpi/icon_live_room_follow.png create mode 100644 live/src/main/res/mipmap-xhdpi/icon_live_room_followed.png diff --git a/common/src/main/java/com/yunbao/common/Constants.java b/common/src/main/java/com/yunbao/common/Constants.java index 775acb274..2558b4584 100644 --- a/common/src/main/java/com/yunbao/common/Constants.java +++ b/common/src/main/java/com/yunbao/common/Constants.java @@ -282,6 +282,8 @@ public class Constants { public static final String SOCKET_LIVE_ANCHOR_PK_DIALOG="GuildCompetitionNotice";//公会赛弹窗 + public static final String SOCKET_SEND_NEW_TASK_PUSH="SendNewTaskPush";//直播间-新用户完成任务push + //视频举报获取位置 public static int xIndex = 0; public static int yindex = 0; diff --git a/common/src/main/java/com/yunbao/common/bean/EnterRoomInfoModel.java b/common/src/main/java/com/yunbao/common/bean/EnterRoomInfoModel.java index d32508ad6..1e5cab634 100644 --- a/common/src/main/java/com/yunbao/common/bean/EnterRoomInfoModel.java +++ b/common/src/main/java/com/yunbao/common/bean/EnterRoomInfoModel.java @@ -113,10 +113,40 @@ public class EnterRoomInfoModel extends BaseModel { private String giftWallLightenNumber; @SerializedName("gift_wall_lighten_total") private String giftWallLightenTotal; - @SerializedName("connection_info") private LivePkMicModel connectionInfo; + @SerializedName("is_first_entry") + private String isFirstEntry; + @SerializedName("s_new_user") + private String isNewUser; + @SerializedName("is_com_all") + private String isComAll; + + public String getIsComAll() { + return isComAll; + } + + public void setIsComAll(String isComAll) { + this.isComAll = isComAll; + } + + public String getIsFirstEntry() { + return isFirstEntry; + } + + public void setIsFirstEntry(String isFirstEntry) { + this.isFirstEntry = isFirstEntry; + } + + public String getIsNewUser() { + return isNewUser; + } + + public void setIsNewUser(String isNewUser) { + this.isNewUser = isNewUser; + } + public LivePkMicModel getConnectionInfo() { return connectionInfo; } diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 9737ceaa0..8b34ec953 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1580,6 +1580,11 @@ public class LiveAudienceActivity extends LiveActivity { manager.setSudName(event.getAvatar(), event.getCreateSudRoomModel()); } break; + case LIVE_AUTHOR_NEW_TASK_PUSH: + if (manager != null) { + manager.setNewTaskPush(event.getUid(),event.getHrefUrl()); + } + break; } diff --git a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java index 470923b0f..c6f53c34d 100644 --- a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java +++ b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java @@ -59,6 +59,7 @@ public class LiveAudienceEvent extends BaseModel { public String mStream; public String mLiveUid, giftId; public SudGameDateModel createSudRoomModel; + private String hrefUrl; public SudGameDateModel getCreateSudRoomModel() { return createSudRoomModel; @@ -114,6 +115,15 @@ public class LiveAudienceEvent extends BaseModel { return this; } + public String getHrefUrl() { + return hrefUrl; + } + + public LiveAudienceEvent setHrefUrl(String url) { + hrefUrl = url; + return this; + } + public boolean getIsContactGift() { return isContactGift; } @@ -491,7 +501,8 @@ public class LiveAudienceEvent extends BaseModel { PK_RANK_START(76, "PK排位赛开始"), GuardSpecialEffect(77, "PK排位赛开始"), LIVE_DIALOG_ANCHOR_TIPS(78, "主播公会赛tips"), - LIVE_REMOVE_LIVEUID(79, "主播退出多人PK"); + LIVE_REMOVE_LIVEUID(79, "主播退出多人PK"), + LIVE_AUTHOR_NEW_TASK_PUSH(80, "新人任务完成"); private int type; private String name; diff --git a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java index e0d56e245..d47b4df78 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java @@ -798,6 +798,10 @@ public class SocketSwClient { Bus.get().post(new LiveAudienceEvent() .setType(LiveAudienceEvent.LiveAudienceType.LIVE_DIALOG_ANCHOR_TIPS) .setObject(WordUtil.isNewZh() ? item.getString("text") : item.getString("text_en"))); + case Constants.SOCKET_SEND_NEW_TASK_PUSH: + item = map.getJSONObject("ct"); + Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.LIVE_AUTHOR_NEW_TASK_PUSH).setUid(item.getString("uid")).setHrefUrl(item.getString("href"))); + break; } } 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 c70398baf..192ca7e93 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -2,6 +2,7 @@ package com.yunbao.live.views; import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY; +import android.animation.ObjectAnimator; import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; @@ -27,6 +28,7 @@ import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.AnimationSet; import android.view.animation.AnimationUtils; +import android.view.animation.LinearInterpolator; import android.view.animation.TranslateAnimation; import android.widget.Button; import android.widget.FrameLayout; @@ -56,12 +58,9 @@ import com.bumptech.glide.load.resource.gif.GifDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; import com.google.gson.Gson; import com.lxj.xpopup.XPopup; -import com.lzy.okgo.model.Progress; import com.makeramen.roundedimageview.RoundedImageView; import com.ms.banner.Banner; import com.ms.banner.BannerConfig; @@ -71,8 +70,8 @@ import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; +import com.yunbao.common.activity.WebViewActivity; import com.yunbao.common.bean.PrankProgressBean; -import com.yunbao.common.fragment.GiftWallMainTab1Fragment; import com.yunbao.common.utils.DebugUtils; import com.yunbao.common.utils.L; import com.yunbao.common.utils.MobclickAgent; @@ -89,7 +88,6 @@ import com.yunbao.common.bean.GuardUserModel; import com.yunbao.common.bean.HourRank; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.LinkMicUserBean; -import com.yunbao.common.bean.LiveAnchorCallMeModel; import com.yunbao.common.bean.LiveAnchorSayModel; import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveGiftBean; @@ -133,12 +131,10 @@ import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.NewLevelManager; import com.yunbao.common.manager.RandomPkManager; -import com.yunbao.common.utils.AppManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DeviceUtils; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DpUtil; -import com.yunbao.common.utils.L; import com.yunbao.common.utils.LiveRoomCheckLivePresenter; import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.RouteUtil; @@ -164,9 +160,7 @@ import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveRyAnchorActivity; import com.yunbao.live.activity.LiveSwAnchorActivity; import com.yunbao.live.activity.ZhuangBanActivity; -import com.yunbao.live.adapter.ComboAdapter; import com.yunbao.live.adapter.LiveChatAdapter; -import com.yunbao.live.adapter.LiveNewWishListAdapter; import com.yunbao.live.adapter.LiveRoomFastMessageRecyclerViewAdapter; import com.yunbao.live.adapter.LiveUserAdapter; import com.yunbao.live.adapter.PrankAdapter; @@ -179,20 +173,17 @@ import com.yunbao.live.bean.LiveGiftPrizePoolWinBean; import com.yunbao.live.bean.LiveLuckGiftWinBean; import com.yunbao.live.bean.LivePKUserListBean; import com.yunbao.live.bean.LiveReceiveGiftBean; -import com.yunbao.live.bean.LiveWishlistBean; import com.yunbao.live.bean.NewAllServerNotifyGuardEvent; import com.yunbao.live.bean.WishlistItemModel; import com.yunbao.live.custom.LiveLightView; import com.yunbao.live.custom.RightGradual; import com.yunbao.live.dialog.DragonSendMoneyListPopup; import com.yunbao.live.dialog.GiftWallDialog; -import com.yunbao.live.dialog.LiveContactDetailsSendGiftDialog; import com.yunbao.live.dialog.LiveFaceUnityDialogFragment; import com.yunbao.live.dialog.LiveFansMedalDialogFragment; import com.yunbao.live.dialog.LiveGameDialogFragment; import com.yunbao.live.dialog.LiveHDDialogFragment; import com.yunbao.live.dialog.LivePrankDialogFragment; -import com.yunbao.live.dialog.LiveUserAnchorMailBoxWebInfoPopDialog; import com.yunbao.live.dialog.LiveUserDialogFragment; import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience; import com.yunbao.live.dialog.ReceiveRendPacketPopup; @@ -206,8 +197,6 @@ import com.yunbao.live.presenter.LiveGiftAnimPresenter; import com.yunbao.live.presenter.LiveLightAnimPresenter; import com.yunbao.live.utils.LiveRoomVoteManager; import com.yunbao.live.utils.LiveTextRender; -import com.yunbao.live.utils.LoadDian9TuUtil; -import com.yunbao.live.utils.ZeusKt; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -230,8 +219,6 @@ import io.rong.imlib.RongIMClient; import io.rong.imlib.model.Conversation; import io.rong.imlib.model.UserInfo; -import com.bumptech.glide.load.resource.gif.GifDrawable; - import pl.droidsonroids.gif.GifImageView; /** @@ -472,12 +459,35 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private ProgressBar wish_progressbar; private LinearLayout anTask; + private boolean isComAll; + private int mDp500; + + //首次进入该直播间 关注弹窗 + private RelativeLayout notify_follow_layout; + private ImageView notify_follow_coin; + private TextView notify_follow_name; + private ImageView follow_first_look; + private ImageView close_first_look_follow; + + //完成新人任务,领取专属豪礼 + private RelativeLayout new_task_gift_notify; + private TextView new_task_gift_details; + private ImageView close_task_receive_close; + + //完成了任务 + private RelativeLayout new_task_gift_notify1; + private TextView new_task_gift_details1; + private ImageView close_task_receive_close1; public LiveRoomViewHolder setGuardType(int guardType) { this.guardType = guardType; return this; } + public void setComAll(boolean isComAll){ + this.isComAll = isComAll; + } + @Override protected int getLayoutId() { return R.layout.view_live_room; @@ -931,10 +941,202 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mLiveGiftAnimPresenter.startGiftTipAnimatormSud(); } }, 2000); - - } + private Handler firstFollowLookHandler = new Handler(); + private Runnable firstFollowLookRunnable = new Runnable() { + @Override + public void run() { + if (notify_follow_layout != null) { + animatorFollowFirstLook(false); + firstFollowLookHandler.removeCallbacks(firstFollowLookRunnable); + if(!nothingCheck || !isComAll){//没有任何操作 + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + showTaskDetailsNotify(); + } + }, 2000); + } + } + } + }; + + private ObjectAnimator animator_follow_first_look; + private boolean nothingCheck = false; + + public void showFirstLookLiveFollowNotify() { + notify_follow_layout.post(new Runnable() { + @Override + public void run() { + LinearLayout.LayoutParams params1 = (LinearLayout.LayoutParams) notify_follow_layout.getLayoutParams(); + params1.width = mChatRecyclerView.getWidth() - DpUtil.dp2px(72); + notify_follow_layout.setLayoutParams(params1); + } + }); + ImgLoader.displayAvatar(mContext, mAvatarUrl, notify_follow_coin); + notify_follow_name.setText(mAnchorName); + close_first_look_follow.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + nothingCheck = true; + animatorFollowFirstLook(false); + } + }); + follow_first_look.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + nothingCheck = true; + follow_first_look.setImageResource(R.mipmap.icon_live_room_followed); + //關注 + follow(); + if (((LiveAudienceActivity) mContext).getCountDownTimer() != null) { + ((LiveAudienceActivity) mContext).getCountDownTimer().cancel(); + } + animatorFollowFirstLook(false); + firstFollowLookHandler.removeCallbacks(firstFollowLookRunnable); + } + }); + firstFollowLookHandler.removeCallbacks(firstFollowLookRunnable); + firstFollowLookHandler.postDelayed(firstFollowLookRunnable, 7000); + notify_follow_layout.setVisibility(View.VISIBLE); + mDp500 = DpUtil.dp2px(-300); + animatorFollowFirstLook(true); + } + + public void animatorFollowFirstLook(boolean isIn) { + if (isIn) { + animator_follow_first_look = ObjectAnimator.ofFloat(notify_follow_layout, "translationX", mDp500, 0); + animator_follow_first_look.setDuration(800); + } else { + animator_follow_first_look = ObjectAnimator.ofFloat(notify_follow_layout, "translationX", 0, mDp500); + animator_follow_first_look.setDuration(800); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + notify_follow_layout.setVisibility(View.GONE); + } + },1000); + } + animator_follow_first_look.setInterpolator(new LinearInterpolator()); + animator_follow_first_look.start(); + } + + private Handler firstTaskDetailsHandler = new Handler(); + private Runnable firstTaskDetailsRunnable = new Runnable() { + @Override + public void run() { + if (new_task_gift_notify != null) { + animatorTaskDetails(false); + firstTaskDetailsHandler.removeCallbacks(firstTaskDetailsRunnable); + } + } + }; + + private ObjectAnimator animator_first_task_details; + + public void showTaskDetailsNotify() { + new_task_gift_notify.post(new Runnable() { + @Override + public void run() { + LinearLayout.LayoutParams params1 = (LinearLayout.LayoutParams) new_task_gift_notify.getLayoutParams(); + params1.width = mChatRecyclerView.getWidth() - DpUtil.dp2px(72); + new_task_gift_notify.setLayoutParams(params1); + } + }); + close_task_receive_close.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + animatorTaskDetails(false); + firstTaskDetailsHandler.removeCallbacks(firstTaskDetailsRunnable); + } + }); + firstTaskDetailsHandler.removeCallbacks(firstTaskDetailsRunnable); + firstTaskDetailsHandler.postDelayed(firstTaskDetailsRunnable, 7000); + new_task_gift_notify.setVisibility(View.VISIBLE); + mDp500 = DpUtil.dp2px(-300); + animatorTaskDetails(true); + } + + public void animatorTaskDetails(boolean isIn) { + if (isIn) { + animator_first_task_details = ObjectAnimator.ofFloat(new_task_gift_notify, "translationX", mDp500, 0); + animator_first_task_details.setDuration(800); + } else { + animator_first_task_details = ObjectAnimator.ofFloat(new_task_gift_notify, "translationX", 0, mDp500); + animator_first_task_details.setDuration(800); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + new_task_gift_notify.setVisibility(View.GONE); + } + },1000); + } + animator_first_task_details.setInterpolator(new LinearInterpolator()); + animator_first_task_details.start(); + } + + + private Handler firstTaskDetailsHandler1 = new Handler(); + private Runnable firstTaskDetailsRunnable1 = new Runnable() { + @Override + public void run() { + if (new_task_gift_notify1 != null) { + animatorTaskDetails1(false); + firstTaskDetailsHandler1.removeCallbacks(firstTaskDetailsRunnable1); + } + } + }; + private ObjectAnimator animator_first_task_details1; + + public void showTaskDetailsNotify1(String url) { + new_task_gift_notify1.post(new Runnable() { + @Override + public void run() { + LinearLayout.LayoutParams params1 = (LinearLayout.LayoutParams) new_task_gift_notify1.getLayoutParams(); + params1.width = mChatRecyclerView.getWidth() - DpUtil.dp2px(72); + new_task_gift_notify1.setLayoutParams(params1); + } + }); + new_task_gift_details1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ZhuangBanActivity.forward(mContext, url, false, 1); + } + }); + close_task_receive_close1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + animatorTaskDetails1(false); + firstTaskDetailsHandler1.removeCallbacks(firstTaskDetailsRunnable1); + } + }); + firstTaskDetailsHandler1.removeCallbacks(firstTaskDetailsRunnable1); + firstTaskDetailsHandler1.postDelayed(firstTaskDetailsRunnable1, 7000); + new_task_gift_notify1.setVisibility(View.VISIBLE); + mDp500 = DpUtil.dp2px(-300); + animatorTaskDetails1(true); + } + + public void animatorTaskDetails1(boolean isIn) { + if (isIn) { + animator_first_task_details1 = ObjectAnimator.ofFloat(new_task_gift_notify1, "translationX", mDp500, 0); + animator_first_task_details1.setDuration(800); + } else { + animator_first_task_details1 = ObjectAnimator.ofFloat(new_task_gift_notify1, "translationX", 0, mDp500); + animator_first_task_details1.setDuration(800); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + new_task_gift_notify1.setVisibility(View.GONE); + } + },1000); + } + animator_first_task_details1.setInterpolator(new LinearInterpolator()); + animator_first_task_details1.start(); + } + + private View sudGameMin; public void onShowHideEvent() { @@ -948,9 +1150,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } }); } - sudGameMin.setVisibility(View.VISIBLE); - } HashMap svgaImageViewHashMap = new HashMap<>(); @@ -1949,6 +2149,20 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis recycler_prank.setLayoutManager(new LinearLayoutManager(mContext)); initPrankAdapter(); + + notify_follow_layout = findViewById(R.id.notify_follow_layout); + notify_follow_coin = findViewById(R.id.notify_follow_coin); + notify_follow_name = findViewById(R.id.notify_follow_name); + follow_first_look = findViewById(R.id.follow_first_look); + close_first_look_follow = findViewById(R.id.close_first_look_follow); + + new_task_gift_notify = findViewById(R.id.new_task_gift_notify); + new_task_gift_details = findViewById(R.id.new_task_gift_details); + close_task_receive_close = findViewById(R.id.close_task_receive_close); + + new_task_gift_notify1 = findViewById(R.id.new_task_gift_notify1); + new_task_gift_details1 = findViewById(R.id.new_task_gift_details1); + close_task_receive_close1 = findViewById(R.id.close_task_receive_close1); } /** @@ -4071,6 +4285,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0) { + isAttention = 1; EventBus.getDefault().post("stop_svga_new_user_follow1"); } } @@ -4620,6 +4835,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } } + /** + * 首次进入直播间 + */ + public void firstLookLiveNotifty() { + if (mLiveRoomHandler != null) { + mLiveRoomHandler.sendEmptyMessageAtTime(LiveRoomHandler.WHAT_FIRST_LOOK_LIVE, getNextTime(3000)); + } + } + private long getNextTime(int time) { long now = SystemClock.uptimeMillis(); if (time < 1000) { @@ -4884,7 +5108,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } - public void setShowTask(String url,boolean isShow){ + public void setShowTask(String url, boolean isShow) { anTask = findViewById(R.id.anTask); anTask.setOnClickListener(new View.OnClickListener() { @Override @@ -4892,7 +5116,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis ZhuangBanActivity.forward(mContext, url, false, 1); } }); - anTask.setVisibility(isShow?View.VISIBLE:View.GONE); + anTask.setVisibility(isShow ? View.VISIBLE : View.GONE); } /** @@ -4941,7 +5165,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } - private static class LiveRoomHandler extends Handler { private LiveRoomViewHolder mLiveRoomViewHolder; @@ -4951,6 +5174,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private static final int WHAT_ANCHOR_PAUSE = 4;//主播切后台 private static final int WHAT_ANCHOR_LIGHT = 5;//主播飘心 private static final int WHAT_ANCHOR_CHECK_LIVE = 6;//主播checkLive + private static final int WHAT_FIRST_LOOK_LIVE = 7;//用户首次进入该直播间计时 public LiveRoomHandler(LiveRoomViewHolder liveRoomViewHolder) { mLiveRoomViewHolder = new WeakReference<>(liveRoomViewHolder).get(); @@ -4975,6 +5199,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis case WHAT_ANCHOR_CHECK_LIVE: mLiveRoomViewHolder.anchorCheckLive(); break; + case WHAT_FIRST_LOOK_LIVE: + if (isAttention == 0) { + mLiveRoomViewHolder.showFirstLookLiveFollowNotify(); + } else { + mLiveRoomViewHolder.showTaskDetailsNotify(); + } + break; } } } diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index e88bcd3b1..d9747e30f 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -909,7 +909,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } //初始化整蠱列表 mLiveRoomViewHolder.initPrankProgress(isShowPrank?1:2); - + mLiveRoomViewHolder.setComAll(data.getEnterRoomInfo().getIsComAll().equals("1")); + //检测是否是首次观看该直播间 + /*if(data.getEnterRoomInfo().getIsFirstEntry().equals("1")&&data.getEnterRoomInfo().getIsNewUser().equals("1")&&data.getEnterRoomInfo().getIsattention().equals("0")){ + mLiveRoomViewHolder.firstLookLiveNotifty(); + }*/ + mLiveRoomViewHolder.firstLookLiveNotifty(); } @Override @@ -2312,6 +2317,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } } + public void setNewTaskPush(String uid,String url) { + if (mLiveRoomViewHolder != null) { + if(CommonAppConfig.getInstance().getUid().equals(uid)){ + mLiveRoomViewHolder.showTaskDetailsNotify1(url); + } + } + } + /** * 全服喇叭 * diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 81c6ed1a6..2210d66d5 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -91,7 +91,6 @@ android:textSize="8sp" /> - - @@ -3260,18 +3263,20 @@ tools:visibility="visible" /> diff --git a/live/src/main/res/mipmap-xhdpi/icon_live_room_follow.png b/live/src/main/res/mipmap-xhdpi/icon_live_room_follow.png new file mode 100644 index 0000000000000000000000000000000000000000..a043539b403acd5a3f13102732767fee88a01a17 GIT binary patch literal 13631 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 RTS))_002ovPDHLkV1h|RilzVn literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xhdpi/icon_live_room_followed.png b/live/src/main/res/mipmap-xhdpi/icon_live_room_followed.png new file mode 100644 index 0000000000000000000000000000000000000000..319ce6cbc7cd746b654916683101c8718bcb80c0 GIT binary patch literal 6114 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 literal 0 HcmV?d00001