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

小遊戲bug修改

Browse Source
This commit is contained in:
18401019693
2023-10-27 16:20:19 +08:00
parent bf7bc6b786
commit f356446c03
10 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1038,14 +1038,19 @@ public class LiveAudienceActivity extends LiveActivity {
@Override
public void interaction(long interactionID, List<CustomSidebarChildModel> child) {
new XPopup.Builder(mContext)
.enableDrag(false)
if (manager != null && manager.getsudGameMin()) {
ToastUtil.show(WordUtil.isNewZh() ? "您已在游戏房间中" : "You are already in the game room");
} else {
new XPopup.Builder(mContext)
.enableDrag(false)
// .dismissOnTouchOutside(false)
// .dismissOnBackPressed(false)
.moveUpToKeyboard(false)
.asCustom(new SudGameListPopup(mContext, interactionID, child, mLiveUid))
.moveUpToKeyboard(false)
.asCustom(new SudGameListPopup(mContext, interactionID, child, mLiveUid))
.show();
}
.show();
}
});
new XPopup.Builder(mContext)
@@ -1757,14 +1762,19 @@ public class LiveAudienceActivity extends LiveActivity {
//互动游戏
if (event.isInteraction()) {
// callBack.interaction(event.getInteractionID());
new XPopup.Builder(mContext)
.enableDrag(false)
if (manager != null && manager.getsudGameMin()) {
ToastUtil.show(WordUtil.isNewZh() ? "您已在游戏房间中" : "You are already in the game room");
} else {
new XPopup.Builder(mContext)
.enableDrag(false)
// .dismissOnTouchOutside(false)
// .dismissOnBackPressed(false)
.moveUpToKeyboard(false)
.asCustom(new SudGameListPopup(mContext, event.getInteractionID(), event.getChild(), mLiveUid))
.moveUpToKeyboard(false)
.asCustom(new SudGameListPopup(mContext, event.getInteractionID(), event.getChild(), mLiveUid))
.show();
}
.show();
}
}

2
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@@ -754,7 +754,7 @@ public class SocketRyClient {
case "SudGameCreateRoom":
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.SUD_GAME_CREATE_ROOM)
.setAvatar(map.getString("room_name"))
.setAvatar(map.getString("sud_game_name"))
.setCreateSudRoomModel(GsonUtils.fromJson(map.toString(), SudGameDateModel.class)));
break;

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

@@ -3123,6 +3123,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
return sudGameMin != null && sudGameMin.getVisibility() == View.VISIBLE;
}
public void hidesudGameMin() {
if (sudGameMin != null) {
sudGameMin.setVisibility(View.GONE);
}
}
/**
* 私信的切换动画
*

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

@@ -52,6 +52,7 @@ import com.yunbao.common.bean.XydCompleteModel;
import com.yunbao.common.custom.MyViewPager;
import com.yunbao.common.event.AllServerNotifyEvent;
import com.yunbao.common.event.FollowEvent;
import com.yunbao.common.event.HideShowEvent;
import com.yunbao.common.event.LiveFloatEvent;
import com.yunbao.common.event.LiveGiftDialogEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
@@ -722,7 +723,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.hindeRedPacket();
}
if (TextUtils.equals(data.getSudGameRoomStatus(), "1")) {
mLiveRoomViewHolder.setSudName(data.getSudGameRoomName(), data.getSudGameDateModel());
mLiveRoomViewHolder.setSudName(data.getSudGameDateModel().getSudGameName(), data.getSudGameDateModel());
}
}
@@ -1325,6 +1326,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveEndViewHolder.subscribeActivityLifeCycle();
mLiveEndViewHolder.addToParent();
Bus.get().post(new LiveGiftDialogEvent());
Bus.get().post(new HideShowEvent().setClose(false).setHide(true));
mLiveRoomViewHolder.hidesudGameMin();
}
mLiveBean.setIsattention(isattention + "");
mLiveEndViewHolder.showData(mLiveBean, mLiveBean.getStream());