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

add[修復BUG]

Browse Source
This commit is contained in:
Martin 2024-06-18 13:50:21 +08:00
parent 35c83a255a
commit a3228f48c2
10 changed files with 119 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -772,13 +772,14 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
pr = new pkRunnable(pkUid, pkhead, pkname, isLadders);
mHandler.postDelayed(pr, 4000);//3秒后执行Runnable中的run方法
mLiveRoomViewHolder.initAnchorSay();
mLiveRoomViewHolder.closePrankView();
}
} else {
if (mLiveRyLinkMicPkPresenter != null && mLiveRoomViewHolder != null) {
mLiveRyLinkMicPkPresenter.onLinkMicPkStart(pkUid, 1);
pr = new pkRunnable(pkUid, pkhead, pkname, isLadders);
mHandler.postDelayed(pr, 4000);//3秒后执行Runnable中的run方法
mLiveRoomViewHolder.closePrankView();
}
}
}

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

@ -266,7 +266,6 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
mContainerWrap = (ViewGroup) findViewById(R.id.container_wrap);
mContainer = (ViewGroup) findViewById(R.id.container);
mLiveRyLinkMicPkPresenter = new LiveRyLinkMicPkPresenter(mContext, mLivePushViewHolder, true, mContainer);
RandomPkManager.getInstance().addOnRandomPkTimer(onRandomPkTimer);
//添加开播前设置控件
@ -814,6 +813,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
mLiveRoomViewHolder.initAnchorSay();
mLiveRoomViewHolder.setGiftWall(obj.getString("gift_wall_lighten_number"), obj.getString("gift_wall_lighten_total"));
}
mLiveRyLinkMicPkPresenter.setmLiveRoomViewHolder(mLiveRoomViewHolder);
if (mLiveAnchorViewHolder == null) {
mLiveAnchorViewHolder = new LiveRyAnchorViewHolder(mContext, mContainer);
mLiveAnchorViewHolder.setLiveBean(mLiveBean);

1
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@ -879,6 +879,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
mLiveRoomViewHolder.initPrankProgress();
mLiveRoomViewHolder.sendMsgPrank();
}
mLiveSwLinkMicPkPresenter.setmLiveRoomViewHolder(mLiveRoomViewHolder);
}
/**

62
live/src/main/java/com/yunbao/live/adapter/FreePkRecyclerAdapter.java
View File

@ -146,31 +146,13 @@ public class FreePkRecyclerAdapter extends RefreshAdapter<RandomPkUserBean> {
if (code == 0 && info.length > 0) {
JSONObject obj = JSON.parseObject(info[0]);
if (obj != null) {
if (TextUtils.equals(obj.getString("ispk"), "0")) {//自己不在PK，可以发起邀请
if(mDrPkNum!=-1){
LiveHttpUtil.getMicList(liveUid, 0, new com.yunbao.common.http.HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
System.out.println("code = " + code + ", msg = " + msg + ", info = " + Arrays.deepToString(info));
//非0认为未开通连麦权限
if (code != 0) {
if (mDrPkNum == -1) {
if (WordUtil.isNewZh()) {
ToastUtil.show("邀请 " + bean.getUserNiceName() + " 发送成功");
} else {
ToastUtil.show("invite " + bean.getUserNiceName() + " successful");
}
mOnItemClickListener.onItemClick(bean, -1);
if(mContext instanceof LiveSwAnchorActivity){
((LiveSwAnchorActivity) mContext).linkMicAnchorApply(bean.getId(), bean.getId(),
false);
}else{
((LiveRyAnchorActivity) mContext).linkMicAnchorApply(bean.getId(), bean.getId(),
((LiveRyAnchorActivity) mContext).buildLinkMicJSON().toString()
);
}
return;
}
if (mDrPkNum <= 0) {
if (WordUtil.isNewZh()) {
ToastUtil.show("多人次數已用完");
@ -203,10 +185,44 @@ public class FreePkRecyclerAdapter extends RefreshAdapter<RandomPkUserBean> {
}
});
}else{
if (WordUtil.isNewZh()) {
ToastUtil.show("請先關閉PK");
} else {
ToastUtil.show("Please disable the PK");
if (TextUtils.equals(obj.getString("ispk"), "0")) {//自己不在PK，可以发起邀请
LiveHttpUtil.getMicList(liveUid, 0, new com.yunbao.common.http.HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
System.out.println("code = " + code + ", msg = " + msg + ", info = " + Arrays.deepToString(info));
//非0认为未开通连麦权限
if (code != 0) {
if (mDrPkNum == -1) {
if (WordUtil.isNewZh()) {
ToastUtil.show("邀请 " + bean.getUserNiceName() + " 发送成功");
} else {
ToastUtil.show("invite " + bean.getUserNiceName() + " successful");
}
mOnItemClickListener.onItemClick(bean, -1);
if(mContext instanceof LiveSwAnchorActivity){
((LiveSwAnchorActivity) mContext).linkMicAnchorApply(bean.getId(), bean.getId(),
false);
}else{
((LiveRyAnchorActivity) mContext).linkMicAnchorApply(bean.getId(), bean.getId(),
((LiveRyAnchorActivity) mContext).buildLinkMicJSON().toString()
);
}
}
} else {
if (WordUtil.isNewZh()) {
ToastUtil.show("請先關閉語音連麥");
} else {
ToastUtil.show("Please disable the voice connection first");
}
}
}
});
}else{
if (WordUtil.isNewZh()) {
ToastUtil.show("請先關閉PK");
} else {
ToastUtil.show("Please disable the PK");
}
}
}
}

42
live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java
View File

@ -173,11 +173,9 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
if (giftBeans.size() < 6) {
mBtnAddGift.setVisibility(View.VISIBLE);
mGiftNotDate.setVisibility(View.VISIBLE);
mPrankBtn.setVisibility(View.VISIBLE);
} else {
mBtnAddGift.setVisibility(View.GONE);
mGiftNotDate.setVisibility(View.GONE);
mPrankBtn.setVisibility(View.GONE);
}
}
}
@ -248,7 +246,6 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
giftBeans = new ArrayList<>();
recyclerAdapter.setList(giftBeans);
recyclerAdapter.notifyDataSetChanged();
mPrankBtn.setVisibility(View.VISIBLE);
mBtnAddGift.setVisibility(View.VISIBLE);
mGiftNotDate.setVisibility(View.VISIBLE);
setGiftBean(recyclerAdapter.getList(),"1");
@ -287,7 +284,6 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mBtnAddGift.setVisibility(View.GONE);
mGiftNotDate.setVisibility(View.GONE);
recyclerAdapter.setViewType(TYPE_TURNTABLE);
mPrankBtn.setVisibility(View.VISIBLE);
mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_turntable_save);
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
mPrankBtn.setText("發送圖標");
@ -298,6 +294,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mPrankBtn.setTag(0);
recyclerAdapter.clearList();
initTurntableData();
mPrankBtn.setVisibility(View.VISIBLE);
} else {
mTurntableConfigLayout.setVisibility(View.GONE);
mGiftConfigLayout.setVisibility(View.VISIBLE);
@ -306,14 +303,15 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
recyclerAdapter.setViewType(LivePrankRecyclerAdapter.TYPE_GIFT);
mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_turntable_save);
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
/*if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
mPrankBtn.setText("添加禮物");
} else {
mPrankBtn.setText("Add gift");
}
}*/
mPrankBtn.setTag(1);
recyclerAdapter.clearList();
initGiftData();
mPrankBtn.setVisibility(View.GONE);
}
}
@ -341,11 +339,9 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
if (giftBeans.size() < 6) {
mBtnAddGift.setVisibility(View.VISIBLE);
mGiftNotDate.setVisibility(View.VISIBLE);
mPrankBtn.setVisibility(View.VISIBLE);
} else {
mBtnAddGift.setVisibility(View.GONE);
mGiftNotDate.setVisibility(View.GONE);
mPrankBtn.setVisibility(View.GONE);
}
}
});
@ -419,10 +415,12 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
@Override
public void onSuccess(PrankHttpTurntableBean data) {
initGiftData();
if (WordUtil.isNewZh()) {
ToastUtil.show("保存成功！");
} else {
ToastUtil.show("successful");
if(!is_cleared.equals("1")){
if (WordUtil.isNewZh()) {
ToastUtil.show("保存成功！");
} else {
ToastUtil.show("successful");
}
}
//通知主播刷新整蛊信息、
if(onPrankResultListener!=null){
@ -462,7 +460,6 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
} else {
mBtnAddGift.setVisibility(View.GONE);
mGiftNotDate.setVisibility(View.GONE);
mPrankBtn.setVisibility(View.GONE);
}
mPrankRecyclerView.setVisibility(View.VISIBLE);
recyclerAdapter.setViewType(LivePrankRecyclerAdapter.TYPE_GIFT);
@ -543,14 +540,23 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
return;
}
}
if(isClear){
bean.setTurntable1("");
bean.setTurntable2("");
bean.setTurntable3("");
bean.setTurntable4("");
bean.setTurntable5("");
bean.setTurntable6("");
}
LiveNetManager.get(mContext).setAnchorPrankTurntable(mLiveUid, bean.getCoin() + "", bean.getTurntable1(), bean.getTurntable2(), bean.getTurntable3(), bean.getTurntable4(), bean.getTurntable5(), bean.getTurntable6(), bean.getStatus() + "", new HttpCallback<Object>() {
@Override
public void onSuccess(Object data) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存成功");
} else {
ToastUtil.show("Save success");
if(!isClear){
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存成功");
} else {
ToastUtil.show("Save success");
}
}
}

6
live/src/main/java/com/yunbao/live/presenter/AbsLinkMicPkPresenter.java
View File

@ -11,6 +11,7 @@ import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.live.views.LiveRoomViewHolder;
public abstract class AbsLinkMicPkPresenter {
private boolean isSw = false;
@ -29,6 +30,7 @@ public abstract class AbsLinkMicPkPresenter {
protected String mApplyNmae;//正在申请Pk的主播的名字
protected boolean mIsApplyDialogShow;//是否显示了申请PK的弹窗
public LiveRoomViewHolder mLiveRoomViewHolder;
/**
* 主播与主播PK 主播收到其他主播发过来的多人PK申请的回调
@ -38,6 +40,10 @@ public abstract class AbsLinkMicPkPresenter {
showDRApplyDialogTmp(u);
}
public void setmLiveRoomViewHolder(LiveRoomViewHolder mLiveRoomViewHolder) {
this.mLiveRoomViewHolder = mLiveRoomViewHolder;
}
/**
* 主播与主播PK 主播收到其他主播发过来的PK申请的回调
*/

13
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@ -72,6 +72,7 @@ import com.yunbao.live.socket.SocketRyLinkMicPkUtil;
import com.yunbao.live.socket.SocketSendBean;
import com.yunbao.live.views.LiveLinkMicPkViewHolder;
import com.yunbao.live.views.LivePushRyViewHolder;
import com.yunbao.live.views.LiveRoomViewHolder;
import org.greenrobot.eventbus.EventBus;
@ -247,6 +248,10 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
}
public LiveRyLinkMicPkPresenter(Context context, LivePushRyViewHolder linkMicViewHolder, boolean isAnchor, View root) {
super(false);
mContext = context;
@ -1043,6 +1048,10 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
}
}
}
//收起整蛊列表
if(mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.closePrankView();
}
}
});
}
@ -1826,6 +1835,10 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
}
});
//收起整蛊列表
if(mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.closePrankView();
}
}
});

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

@ -607,6 +607,10 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
dRjoinOtherRoom(u);
//展示结束连麦按钮
mLiveAnchorViewHolder.showEndPkBt();
//收起整蛊列表
if(mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.closePrankView();
}
}
@ -831,9 +835,15 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
//设置多人PK 房主ROOM UID
mLiveAnchorViewHolder.setDrpkRoomId(mApplyUid);
mLiveAnchorViewHolder.showEndPkBt();
//收起整蛊列表
if(mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.closePrankView();
}
}
}
});
}
});
}

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

@ -1763,6 +1763,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
initPrankAdapter();
}
/**
* 收起整蛊列表
*/
public void closePrankView(){
if(prank_group.getVisibility()==View.VISIBLE){
prank_group.setVisibility(View.GONE);
prank_small_icon.setVisibility(View.VISIBLE);
}
}
public void sendMsgPrank(){
new Handler().postDelayed(new Runnable() {
@ -5021,7 +5031,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
countDownTimerTrickery.cancel();
countDownTimerTrickery = null;
lt_trickery.setVisibility(View.GONE);
prank_group_turntable_icon.setVisibility(View.VISIBLE);
if(!CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
prank_group_turntable_icon.setVisibility(View.VISIBLE);
}
LiveNetManager.get(mContext).endPrankTurntable(mLiveUid, new com.yunbao.common.http.base.HttpCallback<BaseModel>() {
@Override
public void onSuccess(BaseModel data) {
@ -5056,7 +5068,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
starTimeloud(2, time);
} else {
lt_trickery.setVisibility(View.GONE);
prank_group_turntable_icon.setVisibility(View.VISIBLE);
if(!CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
prank_group_turntable_icon.setVisibility(View.VISIBLE);
}
timeOver();
}
}

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

@ -642,6 +642,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
//初始化整蛊进度列表
mLiveRoomViewHolder.initPrankProgress();
isattention = Integer.parseInt(data.getEnterRoomInfo().getIsattention());
if (isattention == 0) {
if (countDownTimer != null) {
@ -727,6 +728,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLivePlayViewHolder.setPkView(connection_info.getPkuid());
}
}
//收起整蠱列表
mLiveRoomViewHolder.closePrankView();
}
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.pkHandler = false;
@ -777,6 +780,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.initPkRank(null);
}
}
//收起整蠱列表
mLiveRoomViewHolder.closePrankView();
//多人PK
} else if (pkInfo != null && pkInfo.getIntValue("drpk_status") == 1) {
if (mLiveRoomViewHolder != null) {
@ -809,6 +814,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
}
upDataPkScore(pkInfo.getJSONArray("userlist"), pkInfo.getIntValue("drpk_time"));
//收起整蠱列表
mLiveRoomViewHolder.closePrankView();
}
if (data.getEnterRoomInfo().getGuard() != null) {
if (mLiveRoomViewHolder != null) {