yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复：送礼全服通知展示多个礼物名字问题

Browse Source
This commit is contained in:
18401019693 2023-01-10 17:04:56 +08:00
parent 1ad9effe91
commit f26fb83fec
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/com/yunbao/common/glide/ImgLoader.java
View File

@ -239,6 +239,7 @@ public class ImgLoader {
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) { public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
if (callback != null) { if (callback != null) {
callback.onLoadSuccess(resource); callback.onLoadSuccess(resource);
} }
} }

1
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -154,6 +154,7 @@ public class SocketRyClient {
public void processBroadcast(String socketMsg) { public void processBroadcast(String socketMsg) {
L.e("收到socket--->" + socketMsg); L.e("收到socket--->" + socketMsg);
Log.i("SocketRyClient", "socketMsg" + socketMsg);
Log.i("SocketRyClient", "socketMsg" + socketMsg); Log.i("SocketRyClient", "socketMsg" + socketMsg);
if (Constants.SOCKET_STOP_PLAY.equals(socketMsg)) { if (Constants.SOCKET_STOP_PLAY.equals(socketMsg)) {

3
live/src/main/java/com/yunbao/live/utils/AllMsgTextRender.java
View File

@ -68,12 +68,15 @@ public class AllMsgTextRender {
ImgLoader.displayDrawable(context, url, new ImgLoader.DrawableCallback() { ImgLoader.displayDrawable(context, url, new ImgLoader.DrawableCallback() {
@Override @Override
public void onLoadSuccess(Drawable drawable) { public void onLoadSuccess(Drawable drawable) {
if (builder!=null&&!builder.toString().contains(text)){
builder = createPrefix(drawable, builder); builder = createPrefix(drawable, builder);
builder = renderMsg(color2, builder, text); builder = renderMsg(color2, builder, text);
textView.setText(builder); textView.setText(builder);
giftAnimPresenter.setCountDownTimerEnd(intoIndex); giftAnimPresenter.setCountDownTimerEnd(intoIndex);
} }
}
@Override @Override
public void onLoadFailed() { public void onLoadFailed() {
builder = createPrefix(null, builder); builder = createPrefix(null, builder);

11
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -696,6 +696,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRyLinkMicPkPresenter.release(); mLiveRyLinkMicPkPresenter.release();
mLiveRyLinkMicPkPresenter = null; mLiveRyLinkMicPkPresenter = null;
} }
if (mLiveEndViewHolder != null) {
mLiveEndViewHolder.removeFromParent();
mLiveEndViewHolder.release();
}
mLiveEndViewHolder = null;
if (isQuit) { if (isQuit) {
isQuitF = true; isQuitF = true;
if (mLiveAudienceViewHolder != null) { if (mLiveAudienceViewHolder != null) {
@ -714,11 +719,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.clearData(); mLiveRoomViewHolder.clearData();
mLiveRoomViewHolder.countDownTimerTrickery = null; mLiveRoomViewHolder.countDownTimerTrickery = null;
} }
if (mLiveEndViewHolder != null) {
mLiveEndViewHolder.removeFromParent();
mLiveEndViewHolder.release();
}
mLiveEndViewHolder = null;
mLiveAudienceViewHolder = null; mLiveAudienceViewHolder = null;
mLivePlayViewHolder = null; mLivePlayViewHolder = null;
mLiveRoomViewHolder = null; mLiveRoomViewHolder = null;