From 9e0c437af542b91c2983cce31625f030c5d18ecf Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Mon, 14 Aug 2023 19:55:58 +0800
Subject: [PATCH 1/2] =?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/views/MonthGiftNamingViewHolder.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/views/MonthGiftNamingViewHolder.java b/common/src/main/java/com/yunbao/common/views/MonthGiftNamingViewHolder.java
index 4db962114..ad0df2a11 100644
--- a/common/src/main/java/com/yunbao/common/views/MonthGiftNamingViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/MonthGiftNamingViewHolder.java
@@ -26,8 +26,8 @@ public class MonthGiftNamingViewHolder extends RecyclerView.ViewHolder {
 
     public void showData(GiftWallModel giftWallModel) {
         giftTitle.setText(giftWallModel.getGiftname());
-        namingCoin.setText(giftWallModel.getNamingCoinMax());
-        userName.setText("*"+giftWallModel.getUserNicename());
+        namingCoin.setText("*"+giftWallModel.getNamingCoinMax());
+        userName.setText(giftWallModel.getUserNicename());
         ImgLoader.display(itemView.getContext(), giftWallModel.getGifticon(), giftImg);
         ImgLoader.display(itemView.getContext(), giftWallModel.getAvatar(), avatar);
 

From 7e1b054a989b1e1626de0b4e131b93c9fcdd2c80 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Mon, 14 Aug 2023 21:05:15 +0800
Subject: [PATCH 2/2] =?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

---
 common/src/main/res/layout/dialog_live_gift_popup.xml        | 2 ++
 config.gradle                                                | 2 +-
 live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

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 01dd778ed..3f631f656 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup.xml
@@ -15,6 +15,8 @@
             android:id="@+id/operate_image"
             android:layout_width="122dp"
             android:layout_height="50dp"
+            android:layout_marginEnd="5dp"
+            android:scaleType="fitXY"
             android:layout_gravity="end|bottom" />
 
         <FrameLayout
diff --git a/config.gradle b/config.gradle
index 95e50fc0e..16ea83058 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 437,
+            versionCode      : 438,
             versionName      : "6.5.4"
     ]
     manifestPlaceholders = [
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 78429ac88..b47e8bfa8 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -315,7 +315,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         .append("&for");
                 Bundle bundle = new Bundle();
                 bundle.putString("url", htmlUrl.toString());
-
+                bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3);
                 LiveHDDialogFragment fragment = new LiveHDDialogFragment();
                 fragment.setArguments(bundle);
                 fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
@@ -718,7 +718,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
         }
         if (!TextUtils.isEmpty(liveGiftModel.getOperateImage())) {
             operateImage.setVisibility(View.VISIBLE);
-            ImgLoader.display(getContext(), liveGiftModel.getOperateUrl(), operateImage);
+            ImgLoader.display(getContext(), liveGiftModel.getOperateImage(), operateImage);
         }
     }