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

修改游戏问题

Browse Source
This commit is contained in:
18401019693
2023-10-06 13:45:47 +08:00
parent 2d7684a5c8
commit 12482b6624
19 changed files with 189 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@ import com.yunbao.common.event.FollowEvent;
import com.yunbao.common.event.GiftWallIlluminateEvent;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveErrorEvent;
import com.yunbao.common.event.LiveOpenSudRoomEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent;
import com.yunbao.common.glide.ImgLoader;
@@ -92,7 +93,6 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.CustomDrawerPopupView;
import com.yunbao.common.views.LiveSudGamePopup;
import com.yunbao.common.views.floatingview.APPEasyFloat;
import com.yunbao.common.views.weight.VerticalViewPager;
import com.yunbao.live.R;
@@ -990,7 +990,8 @@ public class LiveAudienceActivity extends LiveActivity {
.enableDrag(false)
// .dismissOnTouchOutside(false)
// .dismissOnBackPressed(false)
.asCustom(new SudGameListPopup(mContext, interactionID, child,mLiveUid))
.moveUpToKeyboard(false)
.asCustom(new SudGameListPopup(mContext, interactionID, child, mLiveUid))
.show();
}
@@ -1634,6 +1635,13 @@ public class LiveAudienceActivity extends LiveActivity {
});
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveOpenSudRoomEvent(LiveOpenSudRoomEvent liveOpenSudRoomEvent) {
if (manager != null) {
manager.setCreateSudRoomModel(liveOpenSudRoomEvent.getCreateSudRoomModel());
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onNewRoleCustomDrawerPopupEvent(NewRoleCustomDrawerPopupEvent event) {
//是否关闭弹窗
@@ -1677,13 +1685,14 @@ public class LiveAudienceActivity extends LiveActivity {
}
}
//互动游戏
if (event.isInteraction()){
if (event.isInteraction()) {
// callBack.interaction(event.getInteractionID());
new XPopup.Builder(mContext)
.enableDrag(false)
// .dismissOnTouchOutside(false)
// .dismissOnBackPressed(false)
.asCustom(new SudGameListPopup(mContext, event.getInteractionID(), event.getChild(),mLiveUid))
.moveUpToKeyboard(false)
.asCustom(new SudGameListPopup(mContext, event.getInteractionID(), event.getChild(), mLiveUid))
.show();
}

1
live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java
View File

@@ -216,6 +216,7 @@ public class LiveNewFunctionDialogFragment extends AbsDialogFragment implements
if (datum.getType().equals("6")) {
new XPopup.Builder(mContext)
.enableDrag(false)
.moveUpToKeyboard(false)
// .dismissOnTouchOutside(false)
// .dismissOnBackPressed(false)
.asCustom(new SudGameListPopup(mContext, 0, datum.getChild(), liveUid))

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

@@ -26,7 +26,6 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.blankj.utilcode.util.GsonUtils;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
import com.lzf.easyfloat.EasyFloat;
import com.lzf.easyfloat.permission.PermissionUtils;
@@ -209,6 +208,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
return this;
}
private CreateSudRoomModel createSudRoomModel = null;
public void setCreateSudRoomModel(CreateSudRoomModel createSudRoomModel) {
this.createSudRoomModel = createSudRoomModel;
}
public PortraitLiveManager(Activity context, Intent intent) {
this.mContext = context;
this.mIntent = intent;
@@ -1117,15 +1122,18 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
}
}, 3000);
}
if (createSudRoomModel != null) {
new XPopup.Builder(mContext)
.enableDrag(false)
.dismissOnTouchOutside(false)
.dismissOnBackPressed(false)
.asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
.show();
}
// String jsonCreateSudRoom = IMLoginManager.get(mContext).getSudGame();
// if (!TextUtils.isEmpty(jsonCreateSudRoom)) {
// CreateSudRoomModel createSudRoomModel = new Gson().fromJson(jsonCreateSudRoom, CreateSudRoomModel.class);
// new XPopup.Builder(mContext)
// .enableDrag(false)
// .dismissOnTouchOutside(false)
// .dismissOnBackPressed(false)
// .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
// .show();
// }
} else {
enterRoomLeaveHandler.postDelayed(enterRoomLeaveRunnable, 200);