diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 62463aead..adf58e673 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1167,4 +1167,15 @@ Limited ride And limited avatar frame VOTE %s \n box disappears after %s seconds Please complete the form. + Fill And gift + Fill in the \'*\' option to complete + True love powder\nPhoto Frame(7 days) + 128 Golden Beans + True love powder\nMedal (7 days) + MAN + GIRL + Backpack, please check + Leave without a gift + Love you + Can you guide me 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 8b2728324..a891923c8 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -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())) { diff --git a/live/src/main/java/com/yunbao/live/utils/LiveAnchorVoteManager.java b/live/src/main/java/com/yunbao/live/utils/LiveAnchorVoteManager.java index 8ea230e2a..1d10fa148 100644 --- a/live/src/main/java/com/yunbao/live/utils/LiveAnchorVoteManager.java +++ b/live/src/main/java/com/yunbao/live/utils/LiveAnchorVoteManager.java @@ -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() diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 536312a86..3a97f5826 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -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); } - } }