Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -76,8 +76,8 @@ public class LiveRoomVoteManager {
|
||||
mCancel.setText(R.string.live_vote_close_no);
|
||||
mCancel.setOnClickListener(v -> {
|
||||
mTitle.setText(createVoteModel.getContent());
|
||||
mSubmit.setText(createVoteModel.getAnswer1());
|
||||
mCancel.setText(createVoteModel.getAnswer2());
|
||||
mSubmit.setText(getAnswerText(createVoteModel.getAnswer1()));
|
||||
mCancel.setText(getAnswerText(createVoteModel.getAnswer2()));
|
||||
initClick();
|
||||
});
|
||||
mSubmit.setOnClickListener(v -> endAnchorVote());
|
||||
@@ -92,6 +92,12 @@ public class LiveRoomVoteManager {
|
||||
mSubmit.setOnClickListener(v -> updateVote(true));
|
||||
mCancel.setOnClickListener(v -> updateVote(false));
|
||||
}
|
||||
private String getAnswerText(String answer){
|
||||
if(answer.length()>4){
|
||||
return answer.substring(0,4)+"\n"+answer.substring(4);
|
||||
}
|
||||
return answer;
|
||||
}
|
||||
|
||||
private void updateVote(boolean isSubmit) {
|
||||
LiveNetManager.get(mContext)
|
||||
@@ -136,8 +142,8 @@ public class LiveRoomVoteManager {
|
||||
mCancel.setOnClickListener(null);
|
||||
mSubmit.setOnClickListener(null);
|
||||
|
||||
mSubmit.setText(createVoteModel.getAnswer1());
|
||||
mCancel.setText(createVoteModel.getAnswer2());
|
||||
mSubmit.setText(getAnswerText(createVoteModel.getAnswer1()));
|
||||
mCancel.setText(getAnswerText(createVoteModel.getAnswer2()));
|
||||
|
||||
new Timer().schedule(new TimerTask() {
|
||||
int time = 6;
|
||||
@@ -169,8 +175,8 @@ public class LiveRoomVoteManager {
|
||||
expansion();
|
||||
}
|
||||
mTitle.setText(createVoteModel.getContent());
|
||||
mSubmit.setText(createVoteModel.getAnswer1());
|
||||
mCancel.setText(createVoteModel.getAnswer2());
|
||||
mSubmit.setText(getAnswerText(createVoteModel.getAnswer1()));
|
||||
mCancel.setText(getAnswerText(createVoteModel.getAnswer2()));
|
||||
mCancel.setOnClickListener(null);
|
||||
mSubmit.setOnClickListener(null);
|
||||
if (mSubmit.getTag() == null || !mSubmit.getTag().equals(createVoteModel.getLiveUid())) {
|
||||
|
||||
Reference in New Issue
Block a user