修改红包样式和文案

common/src/main/res/values-en-rUS/string.xml

@@ -296,7 +296,7 @@
     <string name="live_music">accompaniment</string>
     <string name="live_share">share</string>
     <string name="live_game">Game</string>
-    <string name="live_red_pack">Red envelopes</string>
+    <string name="live_red_pack">Red packets</string>
     <string name="live_link_mic">Lian Mai</string>
     <string name="live_link_pk">SinglePK</string>
     <string name="live_wishlist">WishList</string>
@@ -1219,7 +1219,7 @@ Limited ride And limited avatar frame</string>
     <string name="there_is_no">no</string>
     <string name="following_anchor">Subscribing</string>
     <string name="red_envelope_rill">%s diamonds/piece</string>
-    <string name="total_consumption_of_drill">Total  %s drill</string>
+    <string name="total_consumption_of_drill">Consume %s diamonds</string>
     <string name="top_up_now">GO TOP UP ></string>
     <string name="range_range_is">Range Range is [%s]</string>
     <string name="randomly_available">Randomly available</string>
@@ -1230,16 +1230,16 @@ Limited ride And limited avatar frame</string>
     <string name="red_packet_value">value</string>
     <string name="send_red_packet_illustrate3">2. Who is the red envelope given to?</string>
     <string name="send_red_packet_illustrate4">After the red envelope is issued, all users in the broadcast room can grab it, including themselves</string>
-    <string name="send_red_packet_illustrate5">3. How to send red packets?</string>
+    <string name="send_red_packet_illustrate5">5. How to send red packets?</string>
     <string name="send_red_packet_illustrate6">The red envelope is also a gift, 20% diamonds are awarded to the anchor, the remaining 70% of the diamonds will be exchanged into gold beans by the ratio of [1 diamond =1 golden bean] and stuffed into the red envelope for the broadcast to watch and receive, the remaining 10% will be randomly wrapped into a diamond gift wrapped in a red package, the other platform has a red envelope target task, each connected into a target, The platform will reward 2% of the total value of the target red envelope to open a super prize pool for all target users to draw</string>
-    <string name="send_red_packet_illustrate7">4. How to deal with unclaimed red envelopes?</string>
+    <string name="send_red_packet_illustrate7">3. How to deal with unclaimed red envelopes?</string>
     <string name="send_red_packet_illustrate8">Red envelopes that are not claimed after opening, and red envelopes that are not opened after the anchor broadcasts, will be returned to your account</string>
-    <string name="send_red_packet_illustrate9">5. What can you do with the red envelopes you grab?</string>
+    <string name="send_red_packet_illustrate9">4. What can you do with the red envelopes you grab?</string>
     <string name="send_red_packet_illustrate10">Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected</string>
-    <string name="congratulations_on_getting_the_red_envelope">Congratulations Red Envelope</string>
+    <string name="congratulations_on_getting_the_red_envelope">Congratulations</string>
     <string name="cred_envelope_obtained">Get %s</string>
     <string name="view_lucky_viewers">View Lucky Audience ></string>
-    <string name="anchor_his_heart">Give  a gift to heart</string>
+    <string name="anchor_his_heart">Giving a gift to the host</string>
     <string name="red_packet_countdown">Countdown :%s</string>
     <string name="open_red_packet">To open :%s</string>
     <string name="together_to_achieve_goal">%s red packet</string>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1224,11 +1224,11 @@
     <string name="send_red_packet_illustrate2">有紅包的直播間會給新增熱度，吸引更多用戶觀看直播</string>
     <string name="send_red_packet_illustrate3">2.紅包發給誰？</string>
     <string name="send_red_packet_illustrate4">紅包發出后，直播間所有用戶都可搶，包括自己</string>
-    <string name="send_red_packet_illustrate5">3.紅包怎麽發？</string>
+    <string name="send_red_packet_illustrate5">5.紅包怎麽發？</string>
     <string name="send_red_packet_illustrate6">紅包同爲禮物，20%鑽石獎勵給主播，剩餘70%的鑽石會以【1鑽石=1金豆】的比列兌換成金豆塞進紅包内給直播間觀看領取，剩餘10%隨機包成鑽石禮物包進紅包裹，另平臺設有紅包目標任務，每連成一個目標，平臺將獎勵目標紅包 數總價值的2%開設超級獎池供所有目標用戶抽取</string>
-    <string name="send_red_packet_illustrate7">4.未被領取的紅包如何處理？</string>
+    <string name="send_red_packet_illustrate7">3.未被領取的紅包如何處理？</string>
     <string name="send_red_packet_illustrate8">紅包打開后未被領取，以及主播下播后未打開的紅包，會退回您的賬戶</string>
-    <string name="send_red_packet_illustrate9">5.搶到的紅包能幹嘛？</string>
+    <string name="send_red_packet_illustrate9">4.搶到的紅包能幹嘛？</string>
     <string name="send_red_packet_illustrate10">搶到紅包所得金豆可用於平臺一切金豆行爲，不可轉增，不可體現</string>
     <string name="congratulations_on_getting_the_red_envelope">恭喜搶到紅包</string>
     <string name="cred_envelope_obtained">獲得%s</string>

common/src/main/res/values-zh/strings.xml

@@ -1225,11 +1225,11 @@
     <string name="send_red_packet_illustrate2">有紅包的直播間會給新增熱度，吸引更多用戶觀看直播</string>
     <string name="send_red_packet_illustrate3">2.紅包發給誰？</string>
     <string name="send_red_packet_illustrate4">紅包發出后，直播間所有用戶都可搶，包括自己</string>
-    <string name="send_red_packet_illustrate5">3.紅包怎麽發？</string>
+    <string name="send_red_packet_illustrate5">5.紅包怎麽發？</string>
     <string name="send_red_packet_illustrate6">紅包同爲禮物，20%鑽石獎勵給主播，剩餘70%的鑽石會以【1鑽石=1金豆】的比列兌換成金豆塞進紅包内給直播間觀看領取，剩餘10%隨機包成鑽石禮物包進紅包裹，另平臺設有紅包目標任務，每連成一個目標，平臺將獎勵目標紅包 數總價值的2%開設超級獎池供所有目標用戶抽取</string>
-    <string name="send_red_packet_illustrate7">4.未被領取的紅包如何處理？</string>
+    <string name="send_red_packet_illustrate7">3.未被領取的紅包如何處理？</string>
     <string name="send_red_packet_illustrate8">紅包打開后未被領取，以及主播下播后未打開的紅包，會退回您的賬戶</string>
-    <string name="send_red_packet_illustrate9">5.搶到的紅包能幹嘛？</string>
+    <string name="send_red_packet_illustrate9">4.搶到的紅包能幹嘛？</string>
     <string name="send_red_packet_illustrate10">搶到紅包所得金豆可用於平臺一切金豆行爲，不可轉增，不可體現</string>
     <string name="congratulations_on_getting_the_red_envelope">恭喜搶到紅包</string>
     <string name="cred_envelope_obtained">獲得%s</string>

common/src/main/res/values/strings.xml

@@ -296,7 +296,7 @@
     <string name="live_music">accompaniment</string>
     <string name="live_share">share</string>
     <string name="live_game">Game</string>
-    <string name="live_red_pack">Red envelopes</string>
+    <string name="live_red_pack">Red packets</string>
     <string name="live_link_mic">Lian Mai</string>
     <string name="live_link_pk">SinglePK</string>
     <string name="live_wishlist">WishList</string>
@@ -1220,7 +1220,7 @@ Limited ride And limited avatar frame</string>
     <string name="there_is_no">no</string>
     <string name="following_anchor">Subscribing</string>
     <string name="red_envelope_rill">%s diamonds/piece</string>
-    <string name="total_consumption_of_drill">Total  %s drill</string>
+    <string name="total_consumption_of_drill">Consume %s diamonds</string>
     <string name="top_up_now">GO TOP UP ></string>
     <string name="range_range_is">Range Range is [%s]</string>
     <string name="red_packet_value">value</string>
@@ -1231,16 +1231,16 @@ Limited ride And limited avatar frame</string>
     <string name="send_red_packet_illustrate2">A studio with a red envelope will add heat and attract more users to watch live broadcasts</string>
     <string name="send_red_packet_illustrate3">2. Who is the red envelope given to?</string>
     <string name="send_red_packet_illustrate4">After the red envelope is issued, all users in the broadcast room can grab it, including themselves</string>
-    <string name="send_red_packet_illustrate5">3. How to send red packets?</string>
+    <string name="send_red_packet_illustrate5">5. How to send red packets?</string>
     <string name="send_red_packet_illustrate6">The red envelope is also a gift, 20% diamonds are awarded to the anchor, the remaining 70% of the diamonds will be exchanged into gold beans by the ratio of [1 diamond =1 golden bean] and stuffed into the red envelope for the broadcast to watch and receive, the remaining 10% will be randomly wrapped into a diamond gift wrapped in a red package, the other platform has a red envelope target task, each connected into a target, The platform will reward 2% of the total value of the target red envelope to open a super prize pool for all target users to draw</string>
-    <string name="send_red_packet_illustrate7">4. How to deal with unclaimed red envelopes?</string>
+    <string name="send_red_packet_illustrate7">3. How to deal with unclaimed red envelopes?</string>
     <string name="send_red_packet_illustrate8">Red envelopes that are not claimed after opening, and red envelopes that are not opened after the anchor broadcasts, will be returned to your account</string>
-    <string name="send_red_packet_illustrate9">5. What can you do with the red envelopes you grab?</string>
+    <string name="send_red_packet_illustrate9">4. What can you do with the red envelopes you grab?</string>
     <string name="send_red_packet_illustrate10">Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected</string>
-    <string name="congratulations_on_getting_the_red_envelope">Congratulations Red Envelope</string>
+    <string name="congratulations_on_getting_the_red_envelope">Congratulations</string>
     <string name="cred_envelope_obtained">Get %s</string>
     <string name="view_lucky_viewers">View Lucky Audience ></string>
-    <string name="anchor_his_heart">Give  a gift to heart</string>
+    <string name="anchor_his_heart">Giving a gift to the host</string>
     <string name="red_packet_countdown">Countdown :%s</string>
     <string name="open_red_packet">To open :%s</string>
     <string name="together_to_achieve_goal">%s red packet</string>

live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java

@@ -19,6 +19,7 @@ import com.lxj.xpopup.core.CenterPopupView;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
 
@@ -213,7 +214,11 @@ public class SendRendPacketPopup extends CenterPopupView {
 
             }
         });
-
+        if(WordUtil.isNewZh()){
+            ((ImageView)findViewById(R.id.red_packet_info_img)).setImageResource(R.mipmap.bg_red_packet_info_zh);
+        }else{
+            ((ImageView)findViewById(R.id.red_packet_info_img)).setImageResource(R.mipmap.bg_red_packet_info_en);
+        }
     }
 
     private void selectText(TextView textView, boolean select) {

live/src/main/res/layout/view_result_red_packet.xml

@@ -105,7 +105,7 @@
             android:gravity="center"
             android:text="@string/anchor_his_heart"
             android:textColor="#8F3B00"
-            android:textSize="16sp"
+            android:textSize="14sp"
             android:textStyle="bold" />
     </LinearLayout>
 </FrameLayout>

live/src/main/res/layout/view_send_red_packet.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:animateLayoutChanges="true"
@@ -231,7 +232,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/background_send_red_packet_illustrate"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
 
         <androidx.core.widget.NestedScrollView
@@ -280,20 +282,6 @@
                         android:textColor="@color/white"
                         android:textSize="11sp" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
-                        android:text="@string/send_red_packet_illustrate5"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/send_red_packet_illustrate6"
-                        android:textColor="@color/white"
-                        android:textSize="11sp" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -324,6 +312,31 @@
                         android:text="@string/send_red_packet_illustrate10"
                         android:textColor="@color/white"
                         android:textSize="11sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:text="@string/send_red_packet_illustrate5"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/send_red_packet_illustrate6"
+                        android:textColor="@color/white"
+                        android:textSize="11sp" />
+
+                    <ImageView
+                        android:id="@+id/red_packet_info_img"
+                        android:layout_width="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="5dp"
+                        android:src="@mipmap/bg_red_packet_info_zh"
+                        />
+
                 </LinearLayout>