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

Merge branch 'master' into tmp_mon

Browse Source 
# Conflicts:
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
This commit is contained in:
zlzw
2023-02-14 10:16:06 +08:00
parent af00538101 d36ece4c54
commit 0294296ada
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@@ -688,7 +688,7 @@ public class LiveAudienceActivity extends LiveActivity {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveRoomChangeEvent(LiveRoomChangeEvent e) {
if (verticalViewPager.ismEnableScroll()) {
LiveBean liveBean = e.getLiveBean();
if (e.isLiveEnd()) {
manager.removeLiveEnd();
@@ -707,9 +707,7 @@ public class LiveAudienceActivity extends LiveActivity {
mAncherIcon = liveBean.getAvatar();
manager.onAdd(liveBean, mLiveType, mLiveTypeVal, mLiveSDK);
}
} else {
verticalViewPager.setEnableScroll(IMLoginManager.get(mContext).isSlide());
}
}
@Override
@@ -1244,13 +1242,11 @@ public class LiveAudienceActivity extends LiveActivity {
}
break;
case SOCKET_LIVE_DRPK_SET_PK_VIEW:
ToastUtil.show("setPkView");
if (manager.getmLivePlayViewHolder() != null) {
manager.getmLivePlayViewHolder().setPkview();
}
break;
case SOCKET_LIVE_DRPK_SET_PK_END_VIEW:
ToastUtil.show("setPkEndview");
if (manager.getmLivePlayViewHolder() != null) {
manager.getmLivePlayViewHolder().setPkEndview();
}