From 0317b339f8de781adc18a24e9ea4d1d70f13c326 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 20 Mar 2024 15:19:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98,=E6=96=B0=E5=A2=9E=E7=9B=B4=E6=92=AD=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=A5=9E=E9=BE=99=E9=80=81?= =?UTF-8?q?=E8=B4=A2=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yunbao/common/bean/LiveBean.java | 12 ++++++++++++ .../common/dialog/GuardBuyTipsDialog.java | 2 +- .../main/res/layout/dialog_guard_buy_tips.xml | 8 ++++++-- .../live/dialog/DragonSendsMoneyPopup.java | 2 +- .../res/mipmap-mdpi/icon_guard_type_0.png | Bin 5779 -> 37394 bytes .../res/mipmap-mdpi/icon_guard_type_1.png | Bin 6662 -> 47929 bytes .../res/mipmap-mdpi/icon_guard_type_2.png | Bin 7285 -> 44493 bytes .../views/MainHomeLiveItemViewHolder.java | 10 +++++++++- .../main/res/layout/item_main_home_lives.xml | 11 +++++++++++ 9 files changed, 40 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/bean/LiveBean.java b/common/src/main/java/com/yunbao/common/bean/LiveBean.java index 11de89a26..27f18a989 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveBean.java +++ b/common/src/main/java/com/yunbao/common/bean/LiveBean.java @@ -56,6 +56,18 @@ public class LiveBean implements Parcelable { private int redPacketStatus; @SerializedName("giftId") private String giftId; + @SerializedName("sendMoneyLongStatus ") + private int sendMoneyLongStatus ; + + public int getSendMoneyLongStatus() { + return sendMoneyLongStatus; + } + + public LiveBean setSendMoneyLongStatus(int sendMoneyLongStatus) { + this.sendMoneyLongStatus = sendMoneyLongStatus; + return this; + } + private Map params;//用于跳转Activity时扩展参数，例：从首页Banner跳转到直播间时需要根据携带参数判断是否弹出新人特惠对话框 public String getRecommendCardIconSizeTwo() { diff --git a/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java b/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java index 2f1e3a7f7..27b8e9e19 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java @@ -34,7 +34,7 @@ public class GuardBuyTipsDialog { dialog.setContentView(R.layout.dialog_guard_buy_tips); dialog.setCancelable(true); dialog.setCanceledOnTouchOutside(true); - Button btn_confirm = dialog.findViewById(R.id.btn_confirm); + TextView btn_confirm = dialog.findViewById(R.id.btn_confirm); TextView content1 = dialog.findViewById(R.id.content1); TextView content2 = dialog.findViewById(R.id.content2); TextView contentTextView = dialog.findViewById(R.id.content); diff --git a/common/src/main/res/layout/dialog_guard_buy_tips.xml b/common/src/main/res/layout/dialog_guard_buy_tips.xml index 7f6c3be40..349c6fab4 100644 --- a/common/src/main/res/layout/dialog_guard_buy_tips.xml +++ b/common/src/main/res/layout/dialog_guard_buy_tips.xml @@ -8,7 +8,7 @@ -