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

update

Browse Source
This commit is contained in:
zlzw 2023-05-17 17:37:34 +08:00
parent 83a240fcb8
commit 5af061c26f
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/res/values/strings.xml
View File

@ -1167,4 +1167,15 @@ Limited ride And limited avatar frame</string>
<string name="live_vote_hide_text">VOTE</string>
<string name="live_room_vote_over_tip">%s \n box disappears after %s seconds</string>
<string name="live_anchor_vote_tip">Please complete the form.</string>
<string name="complete_information">Fill And gift</string>
<string name="complete_information_consumable">Fill in the \'*\' option to complete</string>
<string name="love_powder">True love powder\nPhoto Frame(7 days)</string>
<string name="golden_beans_128">128 Golden Beans</string>
<string name="love_powder_medal">True love powder\nMedal (7 days)</string>
<string name="man_student">MAN</string>
<string name="girl_student">GIRL</string>
<string name="complete_information_hint">Backpack, please check</string>
<string name="complete_information_hint3">Leave without a gift</string>
<string name="complete_information_hint2">Love you</string>
<string name="you_guide_me">Can you guide me</string>
</resources>

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

@ -1360,12 +1360,14 @@ public class LiveAudienceActivity extends LiveActivity {
try {
voteModel = new LiveRoomVoteModel();
map = (JSONObject) event.getObject();
voteModel.setStatus(map.getInteger("status"));
voteModel.setStatus(1);
voteModel.setContent(map.getString("question"));
voteModel.setAnswer1(map.getString("answer1"));
voteModel.setAnswer2(map.getString("answer2"));
voteModel.setAnswer1Num(map.getInteger("num1"));
voteModel.setAnswer2Num(map.getInteger("num2"));
voteModel.setResult(map.getString("result"));
voteModel.setOptionText(map.getString("optionText"));
System.out.println(">>>" + voteModel);
String content = voteModel.getResult();
if (!StringUtil.isEmpty(voteModel.getOptionText())) {

2
live/src/main/java/com/yunbao/live/utils/LiveAnchorVoteManager.java
View File

@ -51,6 +51,8 @@ public class LiveAnchorVoteManager {
data.setAnswer1(answer1);
data.setAnswer2(answer2);
data.setLiveUid(liveUid);
data.setContent(question);
data.setStatus(1);
vote = data;
createTimerTask();
EventBus.getDefault().post(new LiveAnchorEvent()

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

@ -4281,7 +4281,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
dismissVote(voteModel.getResult(), content);
} else if (event.getType() == LiveAnchorEvent.LiveAnchorType.VOTE_ANCHOR_UPDATE) {
LiveRoomVoteModel voteModel = JSONObject.parseObject(event.getObject().toString(), LiveRoomVoteModel.class);
LiveRoomVoteModel voteModel = new LiveRoomVoteModel();
JSONObject map = (JSONObject) event.getObject();
voteModel.setStatus(1);
voteModel.setLiveUid(mLiveUid);
voteModel.setContent(map.getString("question"));
voteModel.setAnswer1(map.getString("answer1"));
voteModel.setAnswer2(map.getString("answer2"));
voteModel.setAnswer1Num(map.getInteger("num1"));
voteModel.setAnswer2Num(map.getInteger("num2"));
setVoteData(voteModel);
}
}
@ -5060,7 +5068,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
topBanner2.update(mTopBannerList);
}
}
}