From 0d7bdce4f09342876548962fbc83d32b16c03b88 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 3 Apr 2024 16:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=88=E6=8A=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=85=A8=E6=9C=8D=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dialog/GuardUpgradePopup.java | 1 + .../event/AllServerNotifyFFGGGDJANEvent.java | 227 ++++++++++++++++++ .../main/res/layout/guard_upgrade_popup.xml | 64 +++-- .../res/mipmap-xxhdpi/icon_ssssbbbbbsd.png | Bin 0 -> 49595 bytes common/src/main/res/values-en-rUS/string.xml | 4 +- common/src/main/res/values/strings.xml | 4 +- .../live/activity/LiveAudienceActivity.java | 8 + .../live/activity/ZhuangBanActivity.java | 12 +- .../yunbao/live/bean/LiveReceiveGiftBean.java | 11 + .../bean/NewAllServerNotifyGuardEvent.java | 11 + .../live/dialog/LiveBuyGuardDialog.java | 7 + .../com/yunbao/live/dialog/LiveGiftPopup.java | 73 +++--- .../yunbao/live/dialog/LiveGuardDialog.java | 57 ++++- .../live/presenter/LiveGiftAnimPresenter.java | 197 ++++++++++++++- .../yunbao/live/socket/SocketRyClient.java | 6 + .../yunbao/live/views/LiveRoomViewHolder.java | 27 ++- .../live/views/PortraitLiveManager.java | 7 + .../main/res/layout/banner_item_buy_guard.xml | 1 + .../main/res/layout/dialog_live_buy_guard.xml | 2 +- .../src/main/res/layout/dialog_live_guard.xml | 8 +- live/src/main/res/layout/view_live_room.xml | 74 +++++- .../background_full_service_notice_new.png | Bin 0 -> 147068 bytes 22 files changed, 710 insertions(+), 91 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_ssssbbbbbsd.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/background_full_service_notice_new.png diff --git a/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java b/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java index 0b6931e4c..36b326d0c 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java @@ -68,6 +68,7 @@ public class GuardUpgradePopup extends CenterPopupView { } else { hintStringBuffer.append("Your guardian level has reached level ") .append(mUpgradesModel.getLevel()) + .append(" You can receive the following rewards") ; } leave_hint.setText(hintStringBuffer.toString()); diff --git a/common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java b/common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java new file mode 100644 index 000000000..447dfa5ab --- /dev/null +++ b/common/src/main/java/com/yunbao/common/event/AllServerNotifyFFGGGDJANEvent.java @@ -0,0 +1,227 @@ +package com.yunbao.common.event; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +import java.util.List; + +public class AllServerNotifyFFGGGDJANEvent extends BaseModel { + + @SerializedName("_method_") + private String method; + @SerializedName("action") + private String action; + @SerializedName("msg_cn") + private String msgCn; + @SerializedName("msg_en") + private String msgEn; + @SerializedName("uid") + private String uid; + @SerializedName("liveuid") + private String liveuid; + @SerializedName("background_image") + private String backgroundImage; + @SerializedName("style") + private List style; + @SerializedName("jump_type") + private String jumpType; + @SerializedName("link") + private String link; + @SerializedName("button_image") + private String buttonImage; + @SerializedName("button_msg_cn") + private String buttonMsgCn; + @SerializedName("button_msg_en") + private String buttonMsgEn; + @SerializedName("button_style") + private List buttonStyle; + @SerializedName("h5_type") + private String h5Type; + + public String getH5Type() { + return h5Type; + } + + public AllServerNotifyFFGGGDJANEvent setH5Type(String h5Type) { + this.h5Type = h5Type; + return this; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getMsgCn() { + return msgCn; + } + + public void setMsgCn(String msgCn) { + this.msgCn = msgCn; + } + + public String getMsgEn() { + return msgEn; + } + + public void setMsgEn(String msgEn) { + this.msgEn = msgEn; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public String getLiveuid() { + return liveuid; + } + + public void setLiveuid(String liveuid) { + this.liveuid = liveuid; + } + + public String getBackgroundImage() { + return backgroundImage; + } + + public void setBackgroundImage(String backgroundImage) { + this.backgroundImage = backgroundImage; + } + + public List getStyle() { + return style; + } + + public void setStyle(List style) { + this.style = style; + } + + public String getJumpType() { + return jumpType; + } + + public void setJumpType(String jumpType) { + this.jumpType = jumpType; + } + + public String getLink() { + return link; + } + + public void setLink(String link) { + this.link = link; + } + + public String getButtonImage() { + return buttonImage; + } + + public void setButtonImage(String buttonImage) { + this.buttonImage = buttonImage; + } + + public String getButtonMsgCn() { + return buttonMsgCn; + } + + public void setButtonMsgCn(String buttonMsgCn) { + this.buttonMsgCn = buttonMsgCn; + } + + public String getButtonMsgEn() { + return buttonMsgEn; + } + + public void setButtonMsgEn(String buttonMsgEn) { + this.buttonMsgEn = buttonMsgEn; + } + + public List getButtonStyle() { + return buttonStyle; + } + + public void setButtonStyle(List buttonStyle) { + this.buttonStyle = buttonStyle; + } + + public static class StyleDTO { + @SerializedName("str_cn") + private String strCn; + @SerializedName("str_en") + private String strEn; + @SerializedName("colour") + private String colour; + + public String getStrCn() { + return strCn; + } + + public void setStrCn(String strCn) { + this.strCn = strCn; + } + + public String getStrEn() { + return strEn; + } + + public void setStrEn(String strEn) { + this.strEn = strEn; + } + + public String getColour() { + return colour; + } + + public void setColour(String colour) { + this.colour = colour; + } + } + + public static class ButtonStyleDTO { + @SerializedName("str_cn") + private String strCn; + @SerializedName("str_en") + private String strEn; + @SerializedName("colour") + private String colour; + + public String getStrCn() { + return strCn; + } + + public void setStrCn(String strCn) { + this.strCn = strCn; + } + + public String getStrEn() { + return strEn; + } + + public void setStrEn(String strEn) { + this.strEn = strEn; + } + + public String getColour() { + return colour; + } + + public void setColour(String colour) { + this.colour = colour; + } + } +} diff --git a/common/src/main/res/layout/guard_upgrade_popup.xml b/common/src/main/res/layout/guard_upgrade_popup.xml index eb3d3fdf2..e28f64048 100644 --- a/common/src/main/res/layout/guard_upgrade_popup.xml +++ b/common/src/main/res/layout/guard_upgrade_popup.xml @@ -48,17 +48,24 @@ - + + + + + @@ -73,7 +81,7 @@ - + + + + @@ -100,17 +115,23 @@ - + + + + @@ -132,21 +154,23 @@ android:layout_marginEnd="13dp" android:layout_marginBottom="38dp"> -