From 6ba71508ca2c6054376135c90b942768661be083 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 4 Aug 2023 16:28:43 +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 --- .../java/com/yunbao/live/activity/LiveAudienceActivity.java | 2 +- .../java/com/yunbao/live/activity/LiveRyAnchorActivity.java | 2 +- .../java/com/yunbao/live/dialog/LiveUserDialogFragment.java | 2 +- .../main/java/com/yunbao/live/views/LiveRoomViewHolder.java | 4 ++-- .../main/java/com/yunbao/live/views/PortraitLiveManager.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 50586d85c..57cb71237 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1441,7 +1441,7 @@ public class LiveAudienceActivity extends LiveActivity { break; case GIFT_WALL: if (manager != null) { - manager.showGiftWall(event.getUid()); + manager.showGiftWall(event.getUid(),event.isVoicePress()); } break; diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index 59d2218aa..c86e84341 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -1658,7 +1658,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl break; case GIFT_WALL: if (mLiveRoomViewHolder != null) { - mLiveRoomViewHolder.showGiftWall(event.getUid()); + mLiveRoomViewHolder.showGiftWall(event.getUid(),event.isVoicePress()); } break; } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java index 73849cca0..78644b9e0 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java @@ -272,7 +272,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On @Override public void onViewClicks() { Bus.get().post(new LiveAudienceEvent() - .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(mToUid)); + .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(mToUid).setVoicePress(isAnchor)); dismiss(); } }); 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 2ab379b72..6cda50e27 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -2658,7 +2658,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } } - public void showGiftWall(String toUid) { + public void showGiftWall(String toUid,boolean isAnchor) { GiftWallDialog giftWallDialog = new GiftWallDialog(); Bundle bundle = new Bundle(); bundle.putString(Constants.LIVE_UID, mLiveUid); @@ -2667,7 +2667,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis bundle.putString("mAvatarUrl", mAvatarUrl); bundle.putString("toUid", toUid); bundle.putInt("isAttention", isAttention); - bundle.putBoolean("isLive", mContext instanceof LiveRyAnchorActivity); + bundle.putBoolean("isLive", isAnchor); giftWallDialog.setArguments(bundle); giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); 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 3bf3421ec..10c1ab114 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1910,10 +1910,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.setAttention(attention); } - public void showGiftWall(String toUid) { + public void showGiftWall(String toUid,boolean isAnchor) { if (mLiveRoomViewHolder != null) { - mLiveRoomViewHolder.showGiftWall(toUid); + mLiveRoomViewHolder.showGiftWall(toUid,isAnchor); } }