diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index a6f66d293..46127b6ef 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -727,26 +727,15 @@ public class LiveAudienceActivity extends LiveActivity { liveGiftDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment"); break; case CURRENT_ACTIVITY: - int type = 0; - if (TextUtils.equals(event.getModel().getActiveName(), "闖關熱戀")) { - type = 0; - } else if (TextUtils.equals(event.getModel().getActiveName(), "甜蜜約會")) { - type = 1; - } else if (TextUtils.equals(event.getModel().getActiveName(), "娛樂整蠱")) { - type = 3; - } else if (TextUtils.equals(event.getModel().getActiveName(), "怪物大作戰")) { - type = 4; - } else if (TextUtils.equals(event.getModel().getActiveName(), "動感零鉆購")) { - type = 2; - } + String type = event.getModel().getActiveId(); LiveGameDialogFragment currentFragment = new LiveGameDialogFragment(); - currentFragment.selectIndex(type); + currentFragment.setActivityId(Integer.parseInt(type)); currentFragment.setRoomId(mLiveUid); currentFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGameDialogFragment"); break; case WE_CHEAT: LiveGameDialogFragment fragment = new LiveGameDialogFragment(); - fragment.selectIndex(3); + fragment.setActivityId(6); fragment.setRoomId(mLiveUid); fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGameDialogFragment"); break; diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java index 8e5d1f4d6..e7c0cfe1c 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java @@ -238,7 +238,6 @@ public class LiveGameDialogFragment extends AbsDialogFragment { return; } } - dismiss(); } private void selectTab(int position) {