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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2022-12-14 14:44:06 +08:00
commit dd7214a945
2 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -79,7 +79,6 @@ import com.yunbao.common.bean.RewardAllModel;
import com.yunbao.common.bean.StarChallengeStatusModel; import com.yunbao.common.bean.StarChallengeStatusModel;
import com.yunbao.common.bean.TaskModel; import com.yunbao.common.bean.TaskModel;
import com.yunbao.common.bean.UserBean; import com.yunbao.common.bean.UserBean;
import com.yunbao.common.event.CoinChangeEvent;
import com.yunbao.common.event.CustomFullServiceNotifyEvent; import com.yunbao.common.event.CustomFullServiceNotifyEvent;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.API; import com.yunbao.common.http.API;
@ -2060,10 +2059,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//左上角显示对方主播头像及昵称 //左上角显示对方主播头像及昵称
public void setOtherInfo(String touids, String url, String name) { public void setOtherInfo(String touids, String url, String name) {
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
if (!pkHandler) { if (!pkHandler) {
return; return;
} }
@ -2079,9 +2074,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
}); });
initPkRank(); initPkRank();
}
}, 4000);//3秒后执行Runnable中的run方法
if (LivePushTxViewHolder.mTRTCCloud != null) { if (LivePushTxViewHolder.mTRTCCloud != null) {
@ -3814,7 +3806,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
updatePkRank((PkRankBean) event.getObject()); updatePkRank((PkRankBean) event.getObject());
break; break;
case PK_TWO_UPDATE_HEAD_DATA: case PK_TWO_UPDATE_HEAD_DATA:
setHeadData( event.getLivePKUserListBean()); setHeadData(event.getLivePKUserListBean());
break; break;
case PK_TWO_START: case PK_TWO_START:
pkUid = event.getObject().toString(); pkUid = event.getObject().toString();

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

@ -500,8 +500,15 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
LivePKUserListBean livePKUserListBean = JSON.parseObject(pkInfo.getString("pk_top_users"), LivePKUserListBean.class); LivePKUserListBean livePKUserListBean = JSON.parseObject(pkInfo.getString("pk_top_users"), LivePKUserListBean.class);
if (mLiveRoomViewHolder != null) { if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.pkHandler = true; mLiveRoomViewHolder.pkHandler = true;
linkMicPkStartRunnable = new Runnable() {
@Override
public void run() {
mLiveRoomViewHolder.setOtherInfo(pkInfo.getString("pkuid"), pkInfo.getString("pkuimg"), pkInfo.getString("pkuname")); mLiveRoomViewHolder.setOtherInfo(pkInfo.getString("pkuid"), pkInfo.getString("pkuimg"), pkInfo.getString("pkuname"));
} }
};
linkMicPkStartHandler.postDelayed(linkMicPkStartRunnable,4000);
}
mLiveRyLinkMicPkPresenter.onEnterRoomPkStart(pkUid, pkInfo.getLongValue("pk_gift_liveuid"), pkInfo.getLongValue("pk_gift_pkuid"), pkInfo.getIntValue("pk_time"), livePKUserListBean); mLiveRyLinkMicPkPresenter.onEnterRoomPkStart(pkUid, pkInfo.getLongValue("pk_gift_liveuid"), pkInfo.getLongValue("pk_gift_pkuid"), pkInfo.getIntValue("pk_time"), livePKUserListBean);
} else if (!pkInfo.getString("end_pk_time").equals("0")) { } else if (!pkInfo.getString("end_pk_time").equals("0")) {
if (mLiveRoomViewHolder != null) { if (mLiveRoomViewHolder != null) {
@ -1222,19 +1229,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
private String mPkUid, mPkhead, mPkname, mIsLadders; private String mPkUid, mPkhead, mPkname, mIsLadders;
private Handler linkMicPkStartHandler = new Handler(); private Handler linkMicPkStartHandler = new Handler();
private Runnable linkMicPkStartRunnable = new Runnable() { private Runnable linkMicPkStartRunnable = null;
@Override
public void run() {
if (mLiveRoomViewHolder != null) {
Log.e("tasdsdg", liveID + "1111" + CommonAppConfig.getInstance().getUid());
if (!liveID.equals(CommonAppConfig.getInstance().getUid())) {
mLiveRoomViewHolder.setOtherInfo(mPkUid, mPkhead, mPkname);
mLiveRoomViewHolder.initPkRank(mIsLadders);
}
}
}
};
@Override @Override
public void onLinkMicPkStart(final String pkUid, final String pkhead, final String pkname, String isLadders) { public void onLinkMicPkStart(final String pkUid, final String pkhead, final String pkname, String isLadders) {
@ -1243,7 +1238,19 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mPkhead = pkhead; mPkhead = pkhead;
mPkname = pkname; mPkname = pkname;
mIsLadders = isLadders; mIsLadders = isLadders;
linkMicPkStartRunnable = () -> {
if (mLiveRoomViewHolder != null) {
Log.e("tasdsdg", liveID + "1111" + CommonAppConfig.getInstance().getUid());
if (!liveID.equals(CommonAppConfig.getInstance().getUid())) {
mLiveRoomViewHolder.setOtherInfo(mPkUid, mPkhead, mPkname);
mLiveRoomViewHolder.initPkRank(mIsLadders);
}
}
};
if (mLiveRyLinkMicPkPresenter != null && mLiveRoomViewHolder != null) { if (mLiveRyLinkMicPkPresenter != null && mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.pkHandler = true;
mLiveRyLinkMicPkPresenter.onLinkMicPkStart(pkUid, 1); mLiveRyLinkMicPkPresenter.onLinkMicPkStart(pkUid, 1);
linkMicPkStartHandler.postDelayed(linkMicPkStartRunnable, 4000);//3秒后执行Runnable中的run方法 linkMicPkStartHandler.postDelayed(linkMicPkStartRunnable, 4000);//3秒后执行Runnable中的run方法
} }