yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/新潘多拉_6.8.2' into 新潘多拉_6.8.2

Browse Source 
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
ningwenqiang 2024-09-24 13:57:32 +08:00
commit ad44be5af8
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -911,8 +911,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
L.e("getIsFirstEntry:"+data.getEnterRoomInfo().getIsFirstEntry()); L.e("getIsFirstEntry:"+data.getEnterRoomInfo().getIsFirstEntry());
L.e("getIsNewUser:"+data.getEnterRoomInfo().getIsNewUser()); L.e("getIsNewUser:"+data.getEnterRoomInfo().getIsNewUser());
L.e("getIsattention:"+data.getEnterRoomInfo().getIsattention()); L.e("getIsattention:"+data.getEnterRoomInfo().getIsattention());
if(data.getEnterRoomInfo().getIsNewUser().equals("1")){
//检测是否是首次观看该直播间 //检测是否是首次观看该直播间
if(data.getEnterRoomInfo().getIsFirstEntry().equals("1")&&data.getEnterRoomInfo().getIsNewUser().equals("1")){ if(data.getEnterRoomInfo().getIsFirstEntry().equals("1")){
mLiveRoomViewHolder.firstLookLiveNotify(); mLiveRoomViewHolder.firstLookLiveNotify();
} }
//判断是否有免费礼物 //判断是否有免费礼物
@ -922,6 +923,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
//观看200秒之后，推送活动入口im消息 //观看200秒之后，推送活动入口im消息
mLiveRoomViewHolder.firstTaskInlet1Notify(); mLiveRoomViewHolder.firstTaskInlet1Notify();
} }
}
@Override @Override
public void onError(String error) { public void onError(String error) {