From 2ce527cee83d857447526374da1f8265aa6efa02 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 8 Apr 2023 17:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E6=84=BF=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/view_live_new_wish.xml    | 33 ++++++++++++++-----
 common/src/main/res/values-en/strings.xml     |  1 +
 common/src/main/res/values/strings.xml        |  1 +
 .../yunbao/live/views/LiveRoomViewHolder.java |  6 ++--
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/common/src/main/res/layout/view_live_new_wish.xml b/common/src/main/res/layout/view_live_new_wish.xml
index b4fb1b7b1..7a3635f6c 100644
--- a/common/src/main/res/layout/view_live_new_wish.xml
+++ b/common/src/main/res/layout/view_live_new_wish.xml
@@ -4,15 +4,32 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/imageView2"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="117dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:background="@drawable/bg_xyd_add_item"
-        android:layout_marginBottom="4dp"
-        android:scaleType="centerInside" />
+        android:layout_height="117dp">
+
+
+        <ImageView
+            android:id="@+id/imageView2"
+            android:layout_width="match_parent"
+            android:layout_height="117dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/bg_xyd_add_item"
+            android:scaleType="centerInside" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="95dp"
+            android:layout_marginTop="60dp"
+            android:text="@string/add_gift2"
+            android:textColor="#4223CD"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+    </FrameLayout>
+
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml
index 6a63d995c..6587139de 100644
--- a/common/src/main/res/values-en/strings.xml
+++ b/common/src/main/res/values-en/strings.xml
@@ -1118,4 +1118,5 @@ Limited ride And limited avatar frame</string>
     <string name="live_play_setting">Play setting</string>
     <string name="live_language_setting">language setting</string>
     <string name="traditional_chinese">Traditional Chinese</string>
+    <string name="add_gift2">Add gifts, nobles, and guardian wishes</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index d7ef14ef8..58c751518 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1116,5 +1116,6 @@
     <string name="live_play_setting">播放設置</string>
     <string name="live_language_setting">語言設定</string>
     <string name="traditional_chinese">繁體中文</string>
+    <string name="add_gift2">添加禮物、貴族、守護心願</string>
 
 </resources>
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index deb32880f..ef3e07c6e 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1899,11 +1899,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         if (flipper.getChildCount() > 0) {
             flipper.removeAllViews();
         }
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(13), DpUtil.dp2px(13));
-        params.leftMargin = DpUtil.dp2px(6);
-        params.rightMargin = DpUtil.dp2px(2);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(44), DpUtil.dp2px(16));
         LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        textParams.leftMargin = DpUtil.dp2px(2);
+        textParams.leftMargin = DpUtil.dp2px(5);
         View hotView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
         View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
         ImageView hotPic = hotView.findViewById(R.id.wish_pic);