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

Merge remote-tracking branch 'origin/声网升级' into 声网升级

Browse Source 
# Conflicts:
#	live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
This commit is contained in:
Martin 2024-05-28 17:13:59 +08:00
commit 0252963b2e
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -216,7 +216,7 @@ public interface PDLiveApi {
); );
/** /**
* 关注主播 * 关注主播···································································
* *
* @param liveuid * @param liveuid
* @return * @return

19
live/src/main/java/com/yunbao/live/adapter/AnchorUserMicInfoAdapter.java
View File

@ -121,11 +121,12 @@ public class AnchorUserMicInfoAdapter extends RefreshAdapter<UserBean> {
gift_svga = (SVGAImageView) itemView.findViewById(R.id.gift_svga); gift_svga = (SVGAImageView) itemView.findViewById(R.id.gift_svga);
mBtn = itemView.findViewById(R.id.mic_btn); mBtn = itemView.findViewById(R.id.mic_btn);
mClose = itemView.findViewById(R.id.mic_exit); mClose = itemView.findViewById(R.id.mic_exit);
mBtn.setOnClickListener(v -> { ViewClicksAntiShake.clicksAntiShake(mBtn, new ViewClicksAntiShake.ViewClicksCallBack() {
if (MicedUserManager.get().getMicUserList().size() < 3) { @Override
if (v.getTag() != null) { public void onViewClicks() {
UserBean tag = (UserBean) v.getTag(); if (MicedUserManager.get().getMicUserList().size() < 3) {
ViewClicksAntiShake.clicksAntiShake(mBtn, () -> { if (mBtn.getTag() != null) {
UserBean tag = (UserBean) mBtn.getTag();
if (tag.getTypeMic() == TYPE_MIC_REQUEST) { if (tag.getTypeMic() == TYPE_MIC_REQUEST) {
applyMic(tag, 4, createSocketSendBean()); applyMic(tag, 4, createSocketSendBean());
ToastUtil.show(mContext.getString(R.string.live_mic_request)); ToastUtil.show(mContext.getString(R.string.live_mic_request));
@ -140,12 +141,14 @@ public class AnchorUserMicInfoAdapter extends RefreshAdapter<UserBean> {
applyMic(tag, 1, bean); applyMic(tag, 1, bean);
ToastUtil.show(mContext.getString(R.string.live_mic_invite)); ToastUtil.show(mContext.getString(R.string.live_mic_invite));
} }
}); }
}else {
ToastUtil.show(mContext.getString(R.string.live_mic_max));
} }
}else {
ToastUtil.show(mContext.getString(R.string.live_mic_max));
} }
}); });
mClose.setOnClickListener(v -> { mClose.setOnClickListener(v -> {
if (v.getTag() != null) { if (v.getTag() != null) {
API.get().createPDLiveApi(false) API.get().createPDLiveApi(false)

2
live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
View File

@ -597,7 +597,7 @@ public class LiveSwLinkMicPkPresenter implements View.OnClickListener {
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.UN_LEAVELIVE)); Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.UN_LEAVELIVE));
LiveSwAnchorActivity.isDRPK = 1; LiveSwAnchorActivity.isDRPK = 1;
LivePushSwViewHolder.btn_close.setVisibility(View.VISIBLE); LivePushSwViewHolder.btn_close.setVisibility(View.VISIBLE);
//SocketSwLinkMicPkUtil.linkMicPkAccept(mSocketSwClient, mApplyUid, mApplyUrl, mApplyNmae); SocketSwLinkMicPkUtil.linkMicPkAccept(mSocketSwClient, mApplyUid, mApplyUrl, mApplyNmae);
EventBus.getDefault().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.UP_PK_TWO).setObject(mApplyUid)); EventBus.getDefault().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.UP_PK_TWO).setObject(mApplyUid));
onLinkMicPkStart(mApplyUid, 2); onLinkMicPkStart(mApplyUid, 2);
} }