From 9bce23581764f34b0495415be39b4268231db4d9 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 16 Aug 2023 16:23:28 +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

---
 .../yunbao/common/bean/GiftWallGiftDetail.java   |  3 +++
 .../res/layout/popup_achievement_details.xml     | 16 +++++++++++-----
 config.gradle                                    |  4 ++--
 .../com/yunbao/live/dialog/LiveGiftPopup.java    |  6 +++---
 4 files changed, 19 insertions(+), 10 deletions(-)

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 35d6cf855..da39c6aca 100644
--- a/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
+++ b/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
@@ -23,6 +23,9 @@ public class GiftWallGiftDetail extends BaseModel {
     }
 
     public String getUserNicename() {
+        if (userNicename.length() > 5) {
+            userNicename = userNicename.substring(0, 5) + "...";
+        }
         return userNicename;
     }
 
diff --git a/common/src/main/res/layout/popup_achievement_details.xml b/common/src/main/res/layout/popup_achievement_details.xml
index 9a706886d..4c1f20c01 100644
--- a/common/src/main/res/layout/popup_achievement_details.xml
+++ b/common/src/main/res/layout/popup_achievement_details.xml
@@ -128,15 +128,21 @@
             android:text="@string/regular_bubble"
             android:textColor="#6F43FF"
             android:textSize="12sp" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/achievement_img_list"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:layout_marginStart="8dp"
-            android:background="@drawable/background_achievement_details_list"
             android:layout_marginTop="6dp"
-            android:layout_marginEnd="8dp" />
+            android:background="@drawable/background_achievement_details_list"
+            android:layout_marginEnd="8dp">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/achievement_img_list"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+
 
         <TextView
             android:id="@+id/gift_details_btn2"
diff --git a/config.gradle b/config.gradle
index 00d1a15d7..4e7ba2ebe 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-            serverHost       : "https://napi.yaoulive.com",
+//            serverHost       : "https://napi.yaoulive.com",
 //            测试
-//            serverHost       : "https://ceshi.yaoulive.com",
+            serverHost       : "https://ceshi.yaoulive.com",
 
 
 
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 6a682dc7f..0bb4e0bd8 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -465,10 +465,10 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         diamondText.setText(coinModel.getCoin());
                         lvStr.setText("Lv." + coinModel.getUserLevel());
                         int nextLeve = Integer.parseInt(coinModel.getUserNextLevelRewards());
-                        int maxLeve = Integer.parseInt(coinModel.getUserLevelMax())+Integer.parseInt(coinModel.getUserLevelCurrentConsumption());
+                        int maxLeve = Integer.parseInt(coinModel.getUserLevelMax()) + Integer.parseInt(coinModel.getUserLevelCurrentConsumption());
                         findViewById(R.id.red_point).setVisibility((!TextUtils.isEmpty(coinModel.getUsersPackRedDot())) &&
                                 TextUtils.equals(coinModel.getUsersPackRedDot(), "1") ? View.VISIBLE : View.GONE);
-                        if (!TextUtils.equals(coinModel.getUserLevel(),coinModel.getUserLevelMax())) {
+                        if (!TextUtils.equals(coinModel.getUserLevel(), coinModel.getUserLevelMax())) {
                             String leveNext = String.valueOf(nextLeve);
                             String userNextLevel = coinModel.getUserLevelUpgrades();
                             String hint = String.format(getString(R.string.leveling_points),
@@ -1102,7 +1102,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
                     if (goldText != null) {
                         goldText.setText(goldCoin);
                     }
-                    if (mGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mGiftBean.getSwf().contains("svga")) {
+                    if (!mGiftBean.getSwf().contains("svga")) {
                         showLianBtn();
                     }
                     if (mGiftBean.getType() == 7) {