From dfeb1c246b272ed6f779d43f7df240ec87f3620b Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Sat, 5 Aug 2023 15:22:49 +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 --- .../utils/JavascriptInterfaceUtils.java | 4 +- .../com/yunbao/common/utils/RouteUtil.java | 3 +- .../views/GiftAlreadyWallViewHolder.java | 4 +- .../yunbao/common/views/GiftNumberPopup.java | 19 +++++++- .../res/layout/item_gift_already_wall.xml | 20 ++++++--- common/src/main/res/values-en-rUS/string.xml | 2 +- common/src/main/res/values-zh-rHK/strings.xml | 4 +- common/src/main/res/values-zh-rTW/strings.xml | 4 +- common/src/main/res/values-zh/strings.xml | 4 +- common/src/main/res/values/strings.xml | 6 ++- .../live/activity/GiftWallActivity.java | 9 ++-- .../live/activity/LiveAudienceActivity.java | 2 +- .../live/activity/LiveRyAnchorActivity.java | 2 +- .../java/com/yunbao/live/bean/CoinModel.java | 8 ++-- .../yunbao/live/dialog/GiftWallDialog.java | 45 ++++++++++--------- .../com/yunbao/live/dialog/LiveGiftPopup.java | 1 + .../live/dialog/LiveUserDialogFragment.java | 9 +++- .../yunbao/live/views/LiveRoomViewHolder.java | 8 +++- .../live/views/PortraitLiveManager.java | 4 +- .../main/res/layout/dialog_live_gift_wall.xml | 1 + 20 files changed, 103 insertions(+), 56 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java index 41f967ed3..41e336e9f 100644 --- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java +++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java @@ -550,7 +550,7 @@ public class JavascriptInterfaceUtils { } @JavascriptInterface - public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl) { - RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0); + public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl,int isAnchor ) { + RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0,isAnchor==1); } } diff --git a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java index e7346a06b..6f4a5d408 100644 --- a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java @@ -233,13 +233,14 @@ public class RouteUtil { postcard.navigation(); } - public static void forwardGiftWallActivity(String mStream, String mAnchorName, String mLiveUid, String mAvatarUrl, int isAttention) { + public static void forwardGiftWallActivity(String mStream, String mAnchorName, String mLiveUid, String mAvatarUrl, int isAttention,boolean isLive) { ARouter.getInstance().build(PATH_GIFT_WALL) .withString(Constants.LIVE_UID, mLiveUid) .withString(Constants.STREAM, mStream) .withString("mAnchorName", mAnchorName) .withString("mAvatarUrl", mAvatarUrl) .withInt("isAttention", isAttention) + .withBoolean("isLive",isLive) .navigation(); } diff --git a/common/src/main/java/com/yunbao/common/views/GiftAlreadyWallViewHolder.java b/common/src/main/java/com/yunbao/common/views/GiftAlreadyWallViewHolder.java index e19c54ad6..f9e376a54 100644 --- a/common/src/main/java/com/yunbao/common/views/GiftAlreadyWallViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/GiftAlreadyWallViewHolder.java @@ -16,16 +16,18 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake; public class GiftAlreadyWallViewHolder extends RecyclerView.ViewHolder { private ImageView giftImg; - private TextView giftTitle; + private TextView giftTitle, giftNumber; public GiftAlreadyWallViewHolder(@NonNull View itemView) { super(itemView); giftImg = itemView.findViewById(R.id.gift_img); giftTitle = itemView.findViewById(R.id.gift_title); + giftNumber = itemView.findViewById(R.id.gift_number); } public void showData(GiftWallModel giftWallModel) { giftTitle.setText(giftWallModel.getGiftname()); + giftNumber.setText("*" + giftWallModel.getGiftCountNumber()); ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg); ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { @Override diff --git a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java index bb9057ec9..4294b8b34 100644 --- a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java +++ b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java @@ -1,6 +1,7 @@ package com.yunbao.common.views; import android.content.Context; +import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; @@ -13,6 +14,7 @@ import com.yunbao.common.adapter.GiftNumberAdapter; import com.yunbao.common.event.GiftNumberEvent; import com.yunbao.common.manager.GiftQuantityManager; import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import org.greenrobot.eventbus.Subscribe; @@ -52,10 +54,23 @@ public class GiftNumberPopup extends BottomPopupView { new XPopup.Builder(getContext()) .asCustom(new InputCustomPopup(getContext(), getContext().getString(R.string.the_title_financier3), - R.string.custom_quantity,true).setListener(new InputCustomPopup.InputCustomListener() { + R.string.custom_quantity, true).setListener(new InputCustomPopup.InputCustomListener() { @Override public void onConfirm(String text) { - Bus.get().post(new GiftNumberEvent().setmCount(text)); + if (!TextUtils.isEmpty(text)) { + int number = Integer.parseInt(text); + if (1 <= number && number <= 9999) { + Bus.get().post(new GiftNumberEvent().setmCount(text)); + } else { + ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "1~9999")); + Bus.get().post(new GiftNumberEvent().setmCount("-1")); + } + + } else { + ToastUtil.show(String.format(getContext().getString(R.string.range_range_is), "1~9999")); + Bus.get().post(new GiftNumberEvent().setmCount("-1")); + } + } })).show(); diff --git a/common/src/main/res/layout/item_gift_already_wall.xml b/common/src/main/res/layout/item_gift_already_wall.xml index 672734db4..b5c177cc9 100644 --- a/common/src/main/res/layout/item_gift_already_wall.xml +++ b/common/src/main/res/layout/item_gift_already_wall.xml @@ -1,17 +1,17 @@ + android:layout_marginTop="17dp" /> + + \ No newline at end of file diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 3cbc3365f..27efda746 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame Illustrated book unlit All service - Love \\ \"ceremony \\\" at the beginning, \\ \"wall \\\" potential light temporarily no light + Love \"ceremony \" at the beginning, \"wall \" potential light temporarily no light No unlit gifts yet Instant light Honorary achievement diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 2e24cd429..09981e324 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1255,7 +1255,7 @@ 已點亮 未點亮 全服冠軍 - 愛\\“禮\\”伊始，\\“墻\\”勢點亮 暫無點亮 + 愛\“禮\”伊始，\“墻\”勢點亮 暫無點亮 暂无未点亮礼物哦 立即點亮 禮物墻入口 @@ -1266,7 +1266,7 @@ 每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。 當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。 榮譽成就 - 成就勳章 + 成就勛章 當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。 勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就； 富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就； diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 06bf6bb3f..8858a2d4e 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1254,7 +1254,7 @@ 已點亮 未點亮 全服冠軍 - 愛\\“禮\\”伊始，\\“墻\\”勢點亮 暫無點亮 + 愛\“禮\”伊始，\“墻\”勢點亮 暫無點亮 暂无未点亮礼物哦 立即點亮 禮物墻入口 @@ -1265,7 +1265,7 @@ 每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。 當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。 榮譽成就 - 成就勳章 + 成就勛章 當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。 勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就； 富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就； diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 46a8dee12..204907bf2 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1253,7 +1253,7 @@ 圖鑒 未點亮 全服冠軍 - 愛\\“禮\\”伊始，\\“墻\\”勢點亮 暫無點亮 + 愛\“禮\”伊始，\“墻\”勢點亮 暫無點亮 暂无未点亮礼物哦 立即點亮 榮譽成就 @@ -1266,7 +1266,7 @@ 每個週期內單個或累計送同一禮物達一定數量鑽石，會在該禮物圖標上顯示對於某位收禮人而言送出最多的送禮人頭像，點擊頭像還可直達冠名禮物的送禮人主頁。 當圖鑒的禮物與禮物牆中的禮物相同時，則送同一個禮物，先點禮物牆的禮物，之後再點亮圖鑒的禮物。 榮譽成就 - 成就勳章 + 成就勛章 當前主播共有3個成就，分別是勝友如雲、富甲一方、腰纏萬貫。 勝友如雲：當收到的禮物款數達到20、30、50、100、200款時，分別點亮對應的成就； 富甲一方：收到的單款禮物價格超過50000鑽時，即可點亮該成就； diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 8b03cafb8..febbf66d5 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1258,7 +1258,7 @@ Limited ride And limited avatar frame %s has been lit unlit All service - Love \\ \"ceremony \\\" at the beginning, \\ \"wall \\\" potential light temporarily no light + Love \"ceremony \" at the beginning, \"wall \" potential light temporarily no light No unlit gifts yet Instant light Gift Wall Entrance @@ -1294,11 +1294,13 @@ Limited ride And limited avatar frame 近期點亮 已獲得 去點亮 - 我的荣誉墙 + 我的榮譽墻 成就詳情 冠名主播： 冠名金主： 冠名 请输入自定义数量 + 请在直播间内进行送礼 + 已送出 diff --git a/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java b/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java index 7cf23cf24..d078f3b50 100644 --- a/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/GiftWallActivity.java @@ -22,6 +22,7 @@ import com.yunbao.common.fragment.GiftWithoutWallFragment; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.dialog.CodexDialog; @@ -125,7 +126,7 @@ public class GiftWallActivity extends AbsActivity { public void onViewClicks() { new XPopup.Builder(GiftWallActivity.this) .enableDrag(false) - .asCustom(new MedalAchievementPopup(GiftWallActivity.this, false, mLiveUid,mLiveUid)) + .asCustom(new MedalAchievementPopup(GiftWallActivity.this, false, mLiveUid, mLiveUid)) .show(); } }); @@ -173,10 +174,12 @@ public class GiftWallActivity extends AbsActivity { view.setVisibility(view == tab ? View.VISIBLE : View.GONE); } } + private void forwardHomePage() { - finish(); + finish(); RouteUtil.forwardUserHome(mContext, mLiveUid, false, mLiveUid, 0); } + /** * 关于点击礼物分类的通知 */ @@ -189,6 +192,6 @@ public class GiftWallActivity extends AbsActivity { @Subscribe(threadMode = ThreadMode.MAIN) public void onLiveGiftDialogEvent(LiveGiftDialogEvent event) { - onBackPressed(); + ToastUtil.show(getString(R.string.the__gifts_in_the_studio)); } } \ No newline at end of file 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 57cb71237..64b2b5eb4 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(),event.isVoicePress()); + manager.showGiftWall(event.getUid(),event.isVoicePress(),event.getUname(),event.getAvatar()); } 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 c86e84341..5ac18d0af 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(),event.isVoicePress()); + mLiveRoomViewHolder.showGiftWall(event.getUid(),event.isVoicePress(),event.getUname(),event.getAvatar()); } break; } diff --git a/live/src/main/java/com/yunbao/live/bean/CoinModel.java b/live/src/main/java/com/yunbao/live/bean/CoinModel.java index 738f09161..8e168bd45 100644 --- a/live/src/main/java/com/yunbao/live/bean/CoinModel.java +++ b/live/src/main/java/com/yunbao/live/bean/CoinModel.java @@ -35,11 +35,11 @@ public class CoinModel extends BaseModel { public String getCoin() { long coinMoney = Long.parseLong(coin); if (999999999 < coinMoney && coinMoney <= 999999999999L) { - coin = coin.substring(0, coin.length() - 2); + coin = coin.substring(0, coin.length() - 3); coin = coin + "k"; } if (999999999999L < coinMoney && coinMoney <= 999999999999999L) { - coin = coin.substring(0, coin.length() - 2); + coin = coin.substring(0, coin.length() - 3); coin = coin + "M"; } return coin; @@ -53,11 +53,11 @@ public class CoinModel extends BaseModel { public String getGold() { long goldMoney = Long.parseLong(gold); if (999999999 < goldMoney && goldMoney <= 999999999999L) { - gold = gold.substring(0, gold.length() - 2); + gold = gold.substring(0, gold.length() - 3); gold = gold + "k"; } if (999999999999L < goldMoney && goldMoney <= 999999999999999L) { - gold = gold.substring(0, gold.length() - 2); + gold = gold.substring(0, gold.length() - 3); gold = gold + "M"; } return gold; diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java index a392848e1..474797962 100644 --- a/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallDialog.java @@ -25,6 +25,7 @@ import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; @@ -43,7 +44,7 @@ import java.util.List; public class GiftWallDialog extends AbsDialogFragment { private LinearLayout layoutLitIcon, layoutUnlitIcon, layoutAllServiceChampion; private TextView textLitIcon, textUnlitIcon, textAllServiceChampion, anchorName, regularBubble; - private View viewAllServiceChampion, viewUnlitIcon, viewLitIcon, attention; + private View viewAllServiceChampion, viewUnlitIcon, viewLitIcon; private RoundedImageView avatar; private List tabText = new ArrayList<>(); private List tabView = new ArrayList<>(); @@ -70,7 +71,6 @@ public class GiftWallDialog extends AbsDialogFragment { viewUnlitIcon = mRootView.findViewById(R.id.view_unlit_icon); viewLitIcon = mRootView.findViewById(R.id.view_lit_icon); avatar = mRootView.findViewById(R.id.avatar); - attention = mRootView.findViewById(R.id.attention); anchorName = mRootView.findViewById(R.id.anchor_name); regularBubble = mRootView.findViewById(R.id.regular_bubble); tabText.add(textLitIcon); @@ -106,23 +106,7 @@ public class GiftWallDialog extends AbsDialogFragment { transaction.commit(); } }); - ViewClicksAntiShake.clicksAntiShake(attention, new ViewClicksAntiShake.ViewClicksCallBack() { - @Override - public void onViewClicks() { - CommonHttpUtil.setAttention(mLiveUid, new CommonCallback() { - @Override - public void callback(Integer isAttention) { - if (isAttention == 1) { - LiveActivity.sendSystemMessage(IMLoginManager.get(getContext()).getUserInfo().getUserNicename() - + getActivity().getString(R.string.live_follow_anchor)); - attention.setVisibility(View.GONE); - Bus.get().post(new LiveAudienceEvent() - .setType(LiveAudienceEvent.LiveAudienceType.IS_ATTENTION).setLiveType(isAttention)); - } - } - }); - } - }); + ViewClicksAntiShake.clicksAntiShake(regularBubble, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { @@ -149,8 +133,23 @@ public class GiftWallDialog extends AbsDialogFragment { .show(); } }); + ViewClicksAntiShake.clicksAntiShake(avatar, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + forwardHomePage(); + } + }); + ViewClicksAntiShake.clicksAntiShake(anchorName, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + forwardHomePage(); + } + }); + } + private void forwardHomePage() { + dismiss(); + RouteUtil.forwardUserHome(mContext, mLiveUid, false, mLiveUid, 0); } - private void initDate() { Bundle bundle = getArguments(); if (bundle == null) { @@ -168,7 +167,11 @@ public class GiftWallDialog extends AbsDialogFragment { transaction.commit(); ImgLoader.display(getContext(), mAvatarUrl, avatar); anchorName.setText(mAnchorName); - attention.setVisibility(isAttention == 0 ? View.VISIBLE : View.GONE); + if (isLive){ + textLitIcon.setText(getContext().getString(R.string.lit_icon)); + }else { + textLitIcon.setText(getContext().getString(R.string.been_sent)); + } } private void selectTab(TextView textView, View tab) { 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 e502936b3..833b30639 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -204,6 +204,7 @@ public class LiveGiftPopup extends AbsDialogFragment { transaction.replace(R.id.context_layout_gift, LiveParcelFragment.newInstance(mStream, mLiveUid)); transaction.commit(); isWrap = true; + findViewById(R.id.red_point).setVisibility(View.GONE); } }); //；连送 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 78644b9e0..99e491344 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java @@ -94,7 +94,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On private String mStream; private int mType; private int mAction; - private String mToName;//对方的名字 + private String mToName, mAvatarUrl;//对方的名字 private TextView mFollowText; private TextView mName; private TextView mID; @@ -272,7 +272,11 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On @Override public void onViewClicks() { Bus.get().post(new LiveAudienceEvent() - .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(mToUid).setVoicePress(isAnchor)); + .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL) + .setUid(mToUid) + .setVoicePress(isAnchor) + .setUname(mToName) + .setAvatar(mAvatarUrl)); dismiss(); } }); @@ -334,6 +338,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On mUserBean = JSON.toJavaObject(obj, UserBean.class); mToName = obj.getString("user_nicename"); + mAvatarUrl = obj.getString("avatar"); mAction = obj.getIntValue("action"); if (mUserBean.getIslive().equals("1")) { btn_live.setVisibility(View.VISIBLE); 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 6cda50e27..3e994c0bc 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,boolean isAnchor) { + public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) { GiftWallDialog giftWallDialog = new GiftWallDialog(); Bundle bundle = new Bundle(); bundle.putString(Constants.LIVE_UID, mLiveUid); @@ -2866,7 +2866,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void onViewClicks() { Bus.get().post(new LiveAudienceEvent() - .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))); + .setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL) + .setUid(mLiveUid) + .setVoicePress(true) + .setAvatar(mAvatarUrl) + .setUname(mAnchorName)); } }); } 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 10c1ab114..844afeb1f 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,boolean isAnchor) { + public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) { if (mLiveRoomViewHolder != null) { - mLiveRoomViewHolder.showGiftWall(toUid,isAnchor); + mLiveRoomViewHolder.showGiftWall(toUid, isAnchor,mAnchorName,mAvatarUrl); } } diff --git a/live/src/main/res/layout/dialog_live_gift_wall.xml b/live/src/main/res/layout/dialog_live_gift_wall.xml index 5ae28e0f1..d8a374d09 100644 --- a/live/src/main/res/layout/dialog_live_gift_wall.xml +++ b/live/src/main/res/layout/dialog_live_gift_wall.xml @@ -36,6 +36,7 @@ android:layout_width="15dp" android:layout_height="15dp" android:layout_marginStart="4dp" + android:visibility="gone" android:src="@mipmap/icon_following_anchor" />