From 3454b6f924aa05866448bebea6fe02167a2b7c3d Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 18 May 2023 10:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=95=E7=A5=A8=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../live/utils/LiveRoomVoteManager.java | 19 +++++++++++++++++++
.../yunbao/live/views/LiveRoomViewHolder.java | 5 -----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java b/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java
index 1ed2c70b9..3b2dc8080 100644
--- a/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java
+++ b/live/src/main/java/com/yunbao/live/utils/LiveRoomVoteManager.java
@@ -20,6 +20,8 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveRyAnchorActivity;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
@@ -42,9 +44,11 @@ public class LiveRoomVoteManager {
LiveRoomVoteModel createVoteModel;
+ private Map<String,Boolean> foldMap;
public LiveRoomVoteManager(Context mContext, View root) {
this.mContext = mContext;
+ foldMap=new HashMap<>();
mAnchorVoteHide = root.findViewById(R.id.vote_hide);
mVoteShow = root.findViewById(R.id.vote_show);
mClose = root.findViewById(R.id.vote_close);
@@ -160,6 +164,15 @@ public class LiveRoomVoteManager {
return;
}
this.createVoteModel = createVoteModel;
+ if(!createVoteModel.isVote()) {
+ if (isFold(createVoteModel.getLiveUid())) {
+ fold();
+ } else {
+ expansion();
+ }
+ }else {
+ fold();
+ }
mTitle.setText(createVoteModel.getContent());
mSubmit.setText(createVoteModel.getAnswer1());
mCancel.setText(createVoteModel.getAnswer2());
@@ -209,9 +222,11 @@ public class LiveRoomVoteManager {
boolean hide = mAnchorVoteHide.getTag() == null || (boolean) mAnchorVoteHide.getTag();
Animation animation;
if (hide) {
+ foldMap.put(createVoteModel.getLiveUid(),true);
animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_vote_out);
} else {
animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_vote_in);
+ foldMap.put(createVoteModel.getLiveUid(),false);
}
animation.setAnimationListener(new Animation.AnimationListener() {
@Override
@@ -271,4 +286,8 @@ public class LiveRoomVoteManager {
hideAnchorVote();
}
}
+
+ public boolean isFold(String mLiveUid) {
+ return foldMap.containsKey(mLiveUid)&& Boolean.TRUE.equals(foldMap.get(mLiveUid));
+ }
}
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 3a97f5826..0c38f1936 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -3693,11 +3693,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void setVoteData(LiveRoomVoteModel voteModel) {
Log.i("voteModel", voteModel.toString());
voteModel.setLiveUid(mLiveUid);
- if(voteModel.isVote()){
- voteManager.fold();
- }else{
- voteManager.expansion();
- }
voteManager.setCreateVoteModel(voteModel);
}