From a618bee6b728e817d9f9b3cb27e380aae97dfa42 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Mon, 14 Aug 2023 11:18:33 +0800 Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yunbao/common/manager/IMLoginManager.java | 4 ++++ live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java | 1 + .../main/java/com/yunbao/live/socket/SocketRyChatUtil.java | 2 +- .../main/java/com/yunbao/live/views/PortraitLiveManager.java | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index 73ea85e0c..baa0d2a74 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -281,6 +281,10 @@ public class IMLoginManager extends BaseCacheManager { return userInfo; } + public void setMedalName(String medalName) { + userInfo.setMedalName(medalName); + } + /** * 判断是否已登录 * diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java index 06ff06492..80d111021 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -277,6 +277,7 @@ public class LiveGiftPopup extends AbsDialogFragment { .append(userInfo.getId()) .append("&token=") .append(userInfo.getToken()) + .append("no_back=1") .append("&for"); Bundle bundle = new Bundle(); bundle.putString("url", htmlUrl.toString()); diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java b/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java index 635f9e662..e503b7626 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java @@ -99,7 +99,7 @@ public class SocketRyChatUtil { .param("liangname", u.getGoodName()) .param("vip_type", u.getVip().getType()) .param("guard_type", guardType) - .param("medal_name", u.getMedalName()) + .param("medal_name", model.getMedalName()) .param("medal_level", u.getMedalLevel()) .param("good_num", u.getGoodnum()) .param("ct", content) diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index c78937083..b367283bd 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -409,7 +409,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe .enterRoomNew(mLiveBean.getStream(), mLiveBean.getUid(), mLiveBean.getCity(), new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(EnterRoomNewModel data) { - + IMLoginManager.get(mContext).getUserInfo().setMedalName(data.getEnterRoomInfo().getMedalName()); isEnterRoom = true; if (TextUtils.isEmpty(leaveStream)) { leaveStream = mLiveBean.getStream(); @@ -1915,7 +1915,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) { if (mLiveRoomViewHolder != null) { - mLiveRoomViewHolder.showGiftWall(toUid, isAnchor,mAnchorName,mAvatarUrl); + mLiveRoomViewHolder.showGiftWall(toUid, isAnchor, mAnchorName, mAvatarUrl); } }