Merge remote-tracking branch 'origin/master'

This commit is contained in:
zlzw 2022-08-31 18:55:50 +08:00
commit 24a98bdab6
3 changed files with 1 additions and 2 deletions

View File

@ -178,7 +178,6 @@ public class SocketRyClient {
} }
UserBean us = CommonAppConfig.getInstance().getUserBean(); UserBean us = CommonAppConfig.getInstance().getUserBean();
if (map.getString("uid") != null && map.getString("uid").equals(us.getId())) { if (map.getString("uid") != null && map.getString("uid").equals(us.getId())) {
LiveAudienceActivity.is_fans = "1";
int num = LiveAudienceActivity.fansNum + 1; int num = LiveAudienceActivity.fansNum + 1;
LiveRoomViewHolder.setFansNum(num); LiveRoomViewHolder.setFansNum(num);
} }

View File

@ -1416,6 +1416,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mViewMedal.setVisibility(View.GONE); mViewMedal.setVisibility(View.GONE);
} else { } else {
if (mBtnFollow.getVisibility() == View.VISIBLE) { if (mBtnFollow.getVisibility() == View.VISIBLE) {
LiveAudienceActivity.is_fans = "2";
mBtnFollow.setVisibility(View.GONE); mBtnFollow.setVisibility(View.GONE);
mViewMedal.setVisibility(View.VISIBLE); mViewMedal.setVisibility(View.VISIBLE);
} }

View File

@ -325,7 +325,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
if (mLiveRoomViewHolder != null) { if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.removeFromParent(); mLiveRoomViewHolder.removeFromParent();
mLiveRoomViewHolder.clearData(); mLiveRoomViewHolder.clearData();
mLiveRoomViewHolder.release();
mLiveRoomViewHolder = null; mLiveRoomViewHolder = null;
} }
if (mLiveEndViewHolder != null) { if (mLiveEndViewHolder != null) {