From 3f8d6ed4af25b6fd58b4bc1bc505ee8de724c2e4 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 3 Aug 2023 16:08: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 --- .../com/yunbao/common/bean/LiveGiftBean.java | 106 ++++++++++++++++++ .../utils/JavascriptInterfaceUtils.java | 6 + .../res/layout/dialog_live_gift_popup.xml | 90 ++++++++++++--- .../background_live_gift_gift_itle.png | Bin 0 -> 3007 bytes .../icon_live_gift_gift_itle.png | Bin 0 -> 5303 bytes common/src/main/res/values/strings.xml | 2 + .../com/yunbao/live/dialog/LiveGiftPopup.java | 29 ++++- .../live/views/FrameGiftViewHolder.java | 10 +- .../yunbao/live/views/LiveRoomViewHolder.java | 2 +- 9 files changed, 224 insertions(+), 21 deletions(-) create mode 100644 common/src/main/res/mipmap-xxhdpi/background_live_gift_gift_itle.png create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle.png diff --git a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java index 16f974b1d..5047d7c1b 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java +++ b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java @@ -48,6 +48,112 @@ public class LiveGiftBean { @JSONField(name = "operate_url") private String operateUrl; + @JSONField(name = "naming_liveuid") + private String namingLiveuid; + @JSONField(name = "naming_uid") + private String namingUid; + @JSONField(name = "naming_live_name") + private String namingLiveName; + @JSONField(name = "naming_user_name") + private String namingUserName; + @JSONField(name = "naming_live_avatar") + private String namingLiveAvatar; + @JSONField(name = "naming_user_avatar") + private String namingUserAvatar; + @JSONField(name = "naming_status") + private String namingStatus; + @JSONField(name = "naming_coin") + private String namingCoin; + + public View getmView() { + return mView; + } + + public LiveGiftBean setmView(View mView) { + this.mView = mView; + return this; + } + + public String getmGiftNum() { + return mGiftNum; + } + + public LiveGiftBean setmGiftNum(String mGiftNum) { + this.mGiftNum = mGiftNum; + return this; + } + + public String getNamingLiveuid() { + return namingLiveuid; + } + + public LiveGiftBean setNamingLiveuid(String namingLiveuid) { + this.namingLiveuid = namingLiveuid; + return this; + } + + public String getNamingUid() { + return namingUid; + } + + public LiveGiftBean setNamingUid(String namingUid) { + this.namingUid = namingUid; + return this; + } + + public String getNamingLiveName() { + return namingLiveName; + } + + public LiveGiftBean setNamingLiveName(String namingLiveName) { + this.namingLiveName = namingLiveName; + return this; + } + + public String getNamingUserName() { + return namingUserName; + } + + public LiveGiftBean setNamingUserName(String namingUserName) { + this.namingUserName = namingUserName; + return this; + } + + public String getNamingLiveAvatar() { + return namingLiveAvatar; + } + + public LiveGiftBean setNamingLiveAvatar(String namingLiveAvatar) { + this.namingLiveAvatar = namingLiveAvatar; + return this; + } + + public String getNamingUserAvatar() { + return namingUserAvatar; + } + + public LiveGiftBean setNamingUserAvatar(String namingUserAvatar) { + this.namingUserAvatar = namingUserAvatar; + return this; + } + + public String getNamingStatus() { + return namingStatus; + } + + public LiveGiftBean setNamingStatus(String namingStatus) { + this.namingStatus = namingStatus; + return this; + } + + public String getNamingCoin() { + return namingCoin; + } + + public LiveGiftBean setNamingCoin(String namingCoin) { + this.namingCoin = namingCoin; + return this; + } public String getOperateImage() { return operateImage; 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 99d965be4..41f967ed3 100644 --- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java +++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java @@ -542,9 +542,15 @@ public class JavascriptInterfaceUtils { Bus.get().post(new JavascriptInterfaceEvent() .setMethod("closeLiveRoom")); } + @JavascriptInterface public void clickLogOffAccount() { Bus.get().post(new JavascriptInterfaceEvent() .setMethod("clickLogOffAccount")); } + + @JavascriptInterface + public void toGiftNamingAlertAllPageView(String mAnchorName, String mLiveUid, String mAvatarUrl) { + RouteUtil.forwardGiftWallActivity("", mAnchorName, mLiveUid, mAvatarUrl, 0); + } } diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml index 81361b32b..e51c57a5d 100644 --- a/common/src/main/res/layout/dialog_live_gift_popup.xml +++ b/common/src/main/res/layout/dialog_live_gift_popup.xml @@ -6,23 +6,87 @@ android:layout_gravity="bottom" android:orientation="vertical"> - - + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> - - layout="@layout/view_blind_box" /> + + + + + + + + + + + + + + + + + + + android:src="@mipmap/icon_arrow_right_2" /> qj8^Tam*;82hWSRWc_J4=N@p#8$F3-Ew?tWJ9}r&xtPujNSt zeo+)c)^#b|q#(`Aq{pnVI?|`$MLb{eS(u7hvKb#9FHZ)R`z#i?x%HT-UOGjOpu7Yk zIb`IFz$azEK@i@X{;OX))gst=pR<}h-kc*);Uvv%QnnzjKA^Kc>DY*ck59Sr`rk*C zk?2?Gi|%MNCKn_3(=RxSHjDoqcY!d*)%YQ=VQ7fAtL1aV7%1ed| zs0>Bt=hHa_-EQjpEKROP!m?~kqs&u#dp|qsgp^vIJ!iv@#Bc`KS|{#;0>!>Q3ODaY ze0s~n>u2#87z?a?ZEh*VbK>8!<>jjDg73cd`(D)d=}6}~KQa<#ahluD_A>o=B83us zXQrIXkJ~zi0i^VZ`9h>6*f;}hMstjbvE5#uP@URNYmmY=_noxnMhXyW>J5Ch&^42p zBt&xG2hV_aTGF$;dH^OCo?oHy0FxCtwyw_Y?)|E7>79lf_I;SC!}Th(oJdrkyPDQ) zHp#X=7#3#bR^Lkw8+h*H8q3K2uP!^w!L?X)5aPQA=oMeX&}PJdhe&VUSAAA|T- zwG~U!$9|6YJ)bCS>B~GHg56pZ-X+YV_f@CCeHR&EM5Fzt%ceVuP*t=G;#`E930cza= zs_B2FVN~6q^G!ceRC;1px_&Hps)_X6Y(ClMTQYub+=K&G99Fo#4h;Iv51KwD#FX2{Kx&--aVW&CWyu8nyIdNlXXQqS;+h{y??SDNa@5SOiGK_I(18c)4w=o+G= zsGX_{cV<{Z%-fjNH_2RwzAWMIH9Sx(6`LC{|6406S+ji^ojonYk&{8aREYc@AHRbqPn`(=xk-;|fzbD@|Kzz`2Qo?g(13Du1wkGM>WvfzY}H`+sRU&hDS_l+Q`_ z9erIWS{d|1PVrKDWZy>ide3%Bi%s1pT8n(jzOcW&qHqawtJ=MuK9f@y8fIwITya3k z_|qR^I7F}>O8WRQM7$=WgK(*l8+kpC>P(cSl=s`ul-DbBg7^NclWK^f`m%Jr;=pvn#{DY}Y|=k1D=ms#0LU4lCrocx7w4-=(47G zR=y)+U|QUC!|~&|pZ63EhlP!155?j~rCv9d%~Chhyl($+I#+=5-4n7Yl!f`gPowsv zC}B+R!Ve;mSjx0RexjwehKM5%G?aq>9wV@*kw!LwCuB?mK>&|51)l^0;hw$&^0M;ez5mRJ%L8>b#k1CwIdWM&VgiljW5mUp{tt+m* z%SCE2+}GoZ%e;I~sk$@%NiFZg+xSmT5--YRrkyD+FqC^ zHaoRGV2^bOYk-LDy0Z=uF2Lu~k${_|`Hq(mIyD|vR(KufuZ|^`Z9BZ|vJcGt>3xkS zF_-E{he+?^ISnrq6+F|QAhL$O&yLamUYr2E@pTeVU^9BN^x=bnp{XgU zyEEY)sOWqUrLv~R_H(f3XUo}koj*1PC4=2<HMR7+sFP+)_CuWCZUq$}K_`FXiYm=0TGZ%gz*j93AzfC`2556a2En z{wysvA-m?Zn%~y*Tz~D7oX^_RHv*1f`HmV%4#0HF1r@7>nn}ux+k+YyLuA%YvwqgkMulU8>aDX8m zGA9=HS0MP&=sE2(3JNPSpg^q)&oYzwP2y9ave0WsA7E6tw^olxIdRN0(+IsKE{?TxoUU4kZbHB=qT&PEO}F)|028rVPj EABasb$N&HU literal 0 HcmV?d00001 diff --git a/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle.png b/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle.png new file mode 100644 index 0000000000000000000000000000000000000000..b575ecf36905898cd85ac2368442b877059b68e2 GIT binary patch literal 5303 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 去點亮 我的荣誉墙 成就詳情 + 冠名主播： + 冠名金主： 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 06d7054d1..3e99a8762 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -49,6 +49,7 @@ import com.yunbao.common.bean.LiveGiftBean2; import com.yunbao.common.bean.UserBean; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.event.GiftNumberEvent; +import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.common.event.SendBlindGiftEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; @@ -74,7 +75,6 @@ import com.yunbao.live.bean.GiftTopBean; import com.yunbao.live.bean.LiveGuardInfo; import com.yunbao.live.event.GiftTitleEvent; import com.yunbao.live.event.LiveAudienceEvent; -import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.live.event.LiveGiftItemEvent; import com.yunbao.live.event.LiveParcelItemRefreshEvent; import com.yunbao.live.http.LiveHttpUtil; @@ -94,14 +94,14 @@ import java.util.List; * 直播间新送礼弹窗 */ public class LiveGiftPopup extends AbsDialogFragment { - private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage; + private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar; private JSONArray liveGiftList; private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber; private RecyclerView giftTitle; private GiftTitleAdapter giftTitleAdapter; private FrameLayout contextLayoutGift; private String mStream, mLiveUid; - private FrameLayout blindBox, frameBlindTop, noNobility, giftNumberLayout, giftSendLayout; + private FrameLayout blindBox, frameBlindTop, noNobility, giftNumberLayout, giftSendLayout, namingLayout; private ProgressBar progressBlind, progressBlind1, progressBlind2; private SVGAImageView blindSvga, blindBoxOpen; private View iconMasking; @@ -116,7 +116,7 @@ public class LiveGiftPopup extends AbsDialogFragment { private String by; private boolean isWrap; private ProgressBar progressBar; - private MarqueeTextView giftDescription; + private MarqueeTextView giftDescription, namingName; private boolean isPk; @@ -144,6 +144,7 @@ public class LiveGiftPopup extends AbsDialogFragment { giftTitle = mRootView.findViewById(R.id.gift_title); liveWrap = mRootView.findViewById(R.id.live_wrap); giftDescription = mRootView.findViewById(R.id.gift_description); + namingName = mRootView.findViewById(R.id.naming_name); blindBox = mRootView.findViewById(R.id.blind_box); frameBlindTop = mRootView.findViewById(R.id.frame_blind_top); progressBlind = mRootView.findViewById(R.id.progress_blind1); @@ -166,13 +167,16 @@ public class LiveGiftPopup extends AbsDialogFragment { mLianText = mRootView.findViewById(R.id.lian_text); mBtnSendGroup = mRootView.findViewById(R.id.btn_send_lian); giftSendLayout = mRootView.findViewById(R.id.gift_send_layout); + namingLayout = mRootView.findViewById(R.id.naming_layout); description = mRootView.findViewById(R.id.description); lvStr = mRootView.findViewById(R.id.lv_str); iconArrow = mRootView.findViewById(R.id.icon_arrow); operateImage = mRootView.findViewById(R.id.operate_image); + namingAvatar = mRootView.findViewById(R.id.naming_avatar); leaveHint = mRootView.findViewById(R.id.leave_hint); progressBar = mRootView.findViewById(R.id.progressBar); levelingLayout = mRootView.findViewById(R.id.leveling_layout); + namingLayout.setVisibility(View.GONE); //设置礼物弹窗背景 ImgLoader.displayBlurLive(getContext(), R.drawable.backgroud_custom_gift2, gitBackground); gitBackground.setAlpha(0.97f); @@ -653,8 +657,22 @@ public class LiveGiftPopup extends AbsDialogFragment { @Subscribe(threadMode = ThreadMode.MAIN) public void onLiveGiftItemEvent(LiveGiftItemEvent event) { - liveGiftModel = event.getLiveGiftModel(); + + if (!TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") && !TextUtils.equals(liveGiftModel.getNamingUid(), "0")) { + namingLayout.setVisibility(View.VISIBLE); + ImgLoader.display(mContext, liveGiftModel.getNamingLiveAvatar(), namingAvatar); + StringBuffer namingNameText = new StringBuffer(); + namingNameText.append(mContext.getText(com.yunbao.live.R.string.title_anchor)) + .append(liveGiftModel.getNamingLiveName()) + .append(mContext.getText(com.yunbao.live.R.string.the_title_financier)) + .append(liveGiftModel.getNamingUserName()); + namingName.setText(namingNameText.toString()); + } else { + namingLayout.setVisibility(View.GONE); + + } + if (liveGiftModel.getType() == 7) { showBlindProgress(liveGiftModel.getBlind_box_type()); } else { @@ -853,6 +871,7 @@ public class LiveGiftPopup extends AbsDialogFragment { textBlindGiftName.setText(stringBuilder); boxBlindHandler.postDelayed(boxBlindRunnable, 1500); stringBuilders.remove(0); + } else { textBlindGiftName.setText(String.format(mContext.getString(R.string.random_availability), blindGiftNamesBuffer.toString())); } diff --git a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java index d89aa8c62..86ce8a3ed 100644 --- a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java @@ -2,6 +2,7 @@ package com.yunbao.live.views; import android.content.Context; import android.graphics.Color; +import android.text.TextUtils; import android.util.TypedValue; import android.view.View; import android.view.animation.AccelerateDecelerateInterpolator; @@ -20,6 +21,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.lxj.xpopup.XPopup; import com.yunbao.common.bean.LiveGiftBean; +import com.yunbao.common.event.LiveGiftDialogEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.utils.Bus; @@ -28,7 +30,6 @@ import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.R; import com.yunbao.live.dialog.SendRendPacketPopup; -import com.yunbao.common.event.LiveGiftDialogEvent; import java.io.File; @@ -76,7 +77,12 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder { } ImgLoader.display(mContext, model.getIcon(), giftIcon); ImgLoader.display(mContext, model.getCornerMark(), cornerMark); - giftName.setText(model.getName()); + if (!TextUtils.equals(model.getNamingLiveuid(), "0") && !TextUtils.equals(model.getNamingUid(), "0")) { + giftName.setText(model.getNamingUserName()); + } else { + giftName.setText(model.getName()); + } + //特殊礼物红包 if (model.getType() == 9999999) { mPayIco.setVisibility(View.GONE); 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 39db6a2b5..5dfa58d56 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -2669,7 +2669,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis bundle.putBoolean("isLive", mContext instanceof LiveRyAnchorActivity); giftWallDialog.setArguments(bundle); giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); -// RouteUtil.forwardGiftWallActivity(mStream,mAnchorName,mLiveUid,mAvatarUrl,isAttention); + } public boolean pkHandler = true;