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

老用户回归,星级Im消息修改

Browse Source
This commit is contained in:
18401019693
2022-10-11 15:36:17 +08:00
parent 9b1e182fbd
commit 0a25585c8e
8 changed files with 168 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,8 +338,9 @@ public class LiveAudienceActivity extends LiveActivity {
}
}
};
private void over(){
if("NEWUSER".equals(getIntent().getStringExtra("OPEN"))){
private void over() {
if ("NEWUSER".equals(getIntent().getStringExtra("OPEN"))) {
manager.mLiveAudienceViewHolder.openNewPeopleDialog();
}
}
@@ -842,6 +843,9 @@ public class LiveAudienceActivity extends LiveActivity {
case AT_MESSAGE:
manager.showAtMessage();
break;
case START_MESSAGE:
manager.starMessage(event.getMsgModel());
break;
}

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

@@ -133,8 +133,8 @@ public class LiveAudienceEvent extends BaseModel {
RECOMMEND_CARD_NOTIFY(21, "贵族推荐通知"),
SLIDE_SETTINGS(22, "滑動設置"),
NEW_MESSAGE_REMINDER(23, "新消息提醒"),
AT_MESSAGE(24, "@消息")
;
AT_MESSAGE(24, "@消息"),
START_MESSAGE(25, "星级消息");
private int type;
private String name;

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

@@ -470,6 +470,16 @@ public class SocketRyClient {
.setMsgModel(recommendCardNotifyMsg.get(0)));
}
break;
case Constants.STAR_CHALLENGE_UPDATE://星级助力
SocketModel starChallengeModel = GsonUtils.fromJson(socketMsg, SocketModel.class);
List<MsgModel> starChallengeMsg = starChallengeModel.getMsg();
if (starChallengeMsg.size() > 0) {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.START_MESSAGE)
.setMsgModel(starChallengeMsg.get(0)));
}
break;
}
}

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

@@ -1027,14 +1027,25 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
public void showStart(StarChallengeStatusModel data) {
boolean star = false;
if (mBannerList2 == null) {
mBannerList2 = new ArrayList<>();
} else {
for (BannerBean bean : mBannerList2) {
if (bean.isStart()){
star = true;
bean.setModel(data);
}
}
if (!star){
BannerBean bannerBean = new BannerBean();
bannerBean.setStart(true);
bannerBean.setModel(data);
mBannerList2.add(bannerBean);
}
}
BannerBean bannerBean = new BannerBean();
bannerBean.setStart(true);
bannerBean.setModel(data);
mBannerList2.add(bannerBean);
showBanner2();
mBanner2.update(mBannerList2);
}
public void hideFloatMsg() {

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

@@ -172,6 +172,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
private Handler liveHandler = new Handler();
//公共參數
private OpenParametersModel openParametersModel = null;
//星级活动地址
private String activityUrl = "";
public PortraitLiveManager(Activity context, Intent intent) {
this.mContext = context;
@@ -294,6 +296,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override
public void onSuccess(StarChallengeStatusModel data) {
if (mLiveRoomViewHolder != null) {
activityUrl = data.getActivityUrl();
mLiveRoomViewHolder.showStart(data);
}
}
@@ -1558,4 +1561,22 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.showAtMessage();
}
}
public void starMessage(MsgModel msgModel) {
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder
.showStart(
new StarChallengeStatusModel(activityUrl)
.setTaskNum(msgModel.getTaskNum())
.setTaskName1(msgModel.getTaskName1())
.setTaskName2(msgModel.getTaskName2())
.setStarSrc(msgModel.getStarSrc())
.setCurrentStarVal(msgModel.getCurrentStarVal())
.setTargetStarVal(msgModel.getTargetStarVal())
.setAssistSrc(msgModel.getAssistSrc())
.setTargetAssistNum(msgModel.getTargetAssistNum())
.setCurrentAssistNum(msgModel.getCurrentAssistNum()));
}
}
}