From 95252f2f02ceda0996e24898743656fefde39060 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 22 Aug 2023 13:31:32 +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/GiftWallGiftDetail.java | 11 +++++++++++ .../com/yunbao/live/dialog/GiftWallItemPopup.java | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java b/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java index da39c6aca..c218edc0e 100644 --- a/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java +++ b/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java @@ -12,6 +12,17 @@ public class GiftWallGiftDetail extends BaseModel { private String avatar; @SerializedName("naming_coin") private String namingCoin; + @SerializedName("default_naming_coin") + private String default_naming_coin; + + public String getDefault_naming_coin() { + return default_naming_coin; + } + + public GiftWallGiftDetail setDefault_naming_coin(String default_naming_coin) { + this.default_naming_coin = default_naming_coin; + return this; + } public int getUid() { return uid; diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java index 29f4191c7..b9c8bf00e 100644 --- a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java @@ -117,7 +117,12 @@ public class GiftWallItemPopup extends CenterPopupView { distanceNaming.setVisibility(GONE); } else { distanceNaming.setVisibility(VISIBLE); - distanceNaming.setText(String.format(getContext().getString(R.string.distance_naming), String.valueOf(data.getNamingCoin()))); + if ( !csb){ + distanceNaming.setText(String.format(getContext().getString(R.string.distance_naming), String.valueOf(data.getDefault_naming_coin()))); + }else { + distanceNaming.setText(String.format(getContext().getString(R.string.distance_naming), String.valueOf(data.getNamingCoin()))); + } + } }