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

Merge branch 'dev_random_pk'

Browse Source
This commit is contained in:
zlzw
2022-12-10 17:30:48 +08:00
parent 284b9784d6 26f02065df
commit b188613035
3 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@@ -1124,7 +1124,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
} else {
ToastUtil.show("主播正在PK，稍後再試");
if (RandomPkManager.getInstance().isRankModel()) {
if (RandomPkManager.getInstance().isRequestPk()) {
RandomPkManager.getInstance().setPkStatus(RandomPkManager.PK_STATUS_REFUSE);
}
}

1
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@@ -286,6 +286,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
@Override
public void onResponseJoinOtherRoom(String inviterRoomId, String inviterUserId, String inviteeRoomId, String inviteeUserId, boolean agree, String extra) {
super.onResponseJoinOtherRoom(inviterRoomId, inviterUserId, inviteeRoomId, inviteeUserId, agree, extra);
IMRTCManager.getInstance().callPkSuccess(inviterRoomId);
runOnUiThread(new Runnable() {
@Override
public void run() {