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

小遊戲提醒

Browse Source
This commit is contained in:
18401019693
2023-10-26 14:42:09 +08:00
parent 192b0cb417
commit b191dfb1be
10 changed files with 237 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -777,9 +777,9 @@ public class LiveAudienceActivity extends LiveActivity {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveRoomChangeEvent(LiveRoomChangeEvent e) {
if (manager!=null&&manager.getsudGameMin()){
ToastUtil.show(WordUtil.isNewZh()?"小遊戲進行中，無法切換直播間":"Game in progress, unable to switch to live room");
}else {
if (manager != null && manager.getsudGameMin()) {
ToastUtil.show(WordUtil.isNewZh() ? "小遊戲進行中，無法切換直播間" : "Game in progress, unable to switch to live room");
} else {
LiveBean liveBean = e.getLiveBean();
if (TextUtils.equals(mLiveUid, liveBean.getUid())) {
ToastUtil.show(mContext.getString(R.string.current_live_room));
@@ -808,7 +808,6 @@ public class LiveAudienceActivity extends LiveActivity {
}
}
@Override
@@ -1542,7 +1541,7 @@ public class LiveAudienceActivity extends LiveActivity {
break;
case SUD_GAME_CREATE_ROOM:
if (manager != null) {
manager.setSudName(event.getAvatar());
manager.setSudName(event.getAvatar(), event.getCreateSudRoomModel());
}
break;

21
live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
View File

@@ -5,11 +5,13 @@ import com.yunbao.common.bean.ActiveModel;
import com.yunbao.common.bean.AiAutomaticSpeechModel;
import com.yunbao.common.bean.AnchorRecommendItemModel;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.CreateSudRoomModel;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.MsgModel;
import com.yunbao.common.bean.OlineUserlistModel;
import com.yunbao.common.bean.RedPacketInfoModel;
import com.yunbao.common.bean.RedPacketModel;
import com.yunbao.common.bean.SudGameDateModel;
import com.yunbao.common.bean.WishModel;
import com.yunbao.common.bean.XydCompleteModel;
import com.yunbao.common.event.AllServerNotifyEvent;
@@ -56,6 +58,25 @@ public class LiveAudienceEvent extends BaseModel {
private boolean isPk;
public String mStream;
public String mLiveUid, giftId;
public SudGameDateModel createSudRoomModel;
public SudGameDateModel getCreateSudRoomModel() {
return createSudRoomModel;
}
public LiveAudienceEvent setCreateSudRoomModel(SudGameDateModel createSudRoomModel) {
this.createSudRoomModel = createSudRoomModel;
return this;
}
public boolean isContactGift() {
return isContactGift;
}
public LiveAudienceEvent setContactGift(boolean contactGift) {
isContactGift = contactGift;
return this;
}
public String getGiftId() {
return giftId;

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

@@ -31,6 +31,7 @@ import com.yunbao.common.bean.PkRankBean;
import com.yunbao.common.bean.RedPacketInfoModel;
import com.yunbao.common.bean.RedPacketModel;
import com.yunbao.common.bean.SocketModel;
import com.yunbao.common.bean.SudGameDateModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.bean.WishModel;
import com.yunbao.common.bean.XydCompleteModel;
@@ -753,7 +754,8 @@ 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("room_name"))
.setCreateSudRoomModel(GsonUtils.fromJson(map.toString(), SudGameDateModel.class)));
break;
}

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

@@ -67,6 +67,7 @@ import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.AiAutomaticSpeechModel;
import com.yunbao.common.bean.BannerBean;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.CreateSudRoomModel;
import com.yunbao.common.bean.FansCheckRed;
import com.yunbao.common.bean.GiftModel;
import com.yunbao.common.bean.GuardUserModel;
@@ -90,6 +91,7 @@ import com.yunbao.common.bean.RedPacketInfoModel;
import com.yunbao.common.bean.RedPacketModel;
import com.yunbao.common.bean.RewardAllModel;
import com.yunbao.common.bean.StarChallengeStatusModel;
import com.yunbao.common.bean.SudGameDateModel;
import com.yunbao.common.bean.TaskModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.bean.WishModel;
@@ -128,6 +130,7 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.utils.formatBigNum;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.common.views.LiveSudGamePopup;
import com.yunbao.common.views.weight.ClipPathCircleImage;
import com.yunbao.common.views.weight.FullServiceNotificationView;
import com.yunbao.common.views.weight.NobleNoticeView;
@@ -647,7 +650,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
};
public void setSudName(String sudName) {
public void setSudName(String sudName, SudGameDateModel sudGameDateModel) {
sud_text_name = (TextView) findViewById(R.id.sud_text_name);
sud_layout_name = (LinearLayout) findViewById(R.id.sud_layout_name);
sud_text_name.setText(WordUtil.isNewZh() ?
@@ -657,7 +660,18 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
ViewClicksAntiShake.clicksAntiShake(sud_layout_name, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
sud_layout_name.setVisibility(View.GONE);
CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
createSudRoomModel.setSudGameId(sudGameDateModel.getSudGameId());
createSudRoomModel.setSudGameRoomId(sudGameDateModel.getSudGameRoomId());
createSudRoomModel.setAvatar(sudGameDateModel.getAvatar());
createSudRoomModel.setRoomName(sudGameDateModel.getRoomName());
createSudRoomModel.setSudGameName(sudGameDateModel.getSudGameName());
new XPopup.Builder(mContext)
.enableDrag(false)
.dismissOnTouchOutside(false)
.dismissOnBackPressed(false)
.asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
.show();
}
});
sudNameHandler.removeCallbacks(sudNameRunnable);

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

@@ -45,6 +45,7 @@ import com.yunbao.common.bean.MsgModel;
import com.yunbao.common.bean.RedPacketInfoModel;
import com.yunbao.common.bean.RedPacketModel;
import com.yunbao.common.bean.StarChallengeStatusModel;
import com.yunbao.common.bean.SudGameDateModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.bean.WishModel;
import com.yunbao.common.bean.XydCompleteModel;
@@ -721,7 +722,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.hindeRedPacket();
}
if (TextUtils.equals(data.getSudGameRoomStatus(), "1")) {
mLiveRoomViewHolder.setSudName(data.getSudGameRoomName());
mLiveRoomViewHolder.setSudName(data.getSudGameRoomName(), data.getSudGameDateModel());
}
}
@@ -1968,9 +1969,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
}
}
public void setSudName(String sudName) {
public void setSudName(String sudName, SudGameDateModel sudGameDateModel) {
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.setSudName(sudName);
mLiveRoomViewHolder.setSudName(sudName, sudGameDateModel);
}
}

2
live/src/main/res/layout/view_live_room.xml
View File

@@ -2500,7 +2500,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:text="主播創建了【游戲名】房間，快來與主播同玩~"
android:textColor="@color/black3"
android:textColor="@color/white"
android:textSize="14sp"
/>
</LinearLayout>