From 0a02b39c12f5fc4861127a56fb2346f198cd453a Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 11 Jul 2023 10:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9UI=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/values-en-rUS/string.xml           |  8 ++++----
 common/src/main/res/values/strings.xml                 |  8 ++++----
 live/src/main/res/layout/view_receive_red_packet.xml   |  6 ++++--
 live/src/main/res/layout/view_red_packet_luck_user.xml |  6 +++---
 .../yunbao/main/activity/RedPacketInfoActivity.java    | 10 +++++-----
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 97bf9fc7d..f1dafa3f2 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -504,7 +504,7 @@
     <string name="red_pack_3">Red envelopes</string>
     <string name="red_pack_4">Average red envelope</string>
     <string name="red_pack_5">Congratulations on making a fortune</string>
-    <string name="red_pack_6">Hand out red envelopes</string>
+    <string name="red_pack_6">Hand out</string>
     <string name="red_pack_7">Please enter the amount</string>
     <string name="red_pack_8">Please enter quantity</string>
     <string name="red_pack_9">%1$s red packets in total</string>
@@ -1214,11 +1214,11 @@ Limited ride And limited avatar frame</string>
     <string name="main_tabs_red_packet">Red packets</string>
     <string name="save_popular_red_packets">Popular red packets</string>
     <string name="amount">amount</string>
-    <string name="drill">drill</string>
+    <string name="drill">Diamonds</string>
     <string name="conditions">Conditions</string>
     <string name="there_is_no">no</string>
-    <string name="following_anchor">Following anchor</string>
-    <string name="red_envelope_rill">Red packet%s diamonds/piece</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="top_up_now">Go top up ></string>
     <string name="range_range_is">Range Range is [%s]</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 3822f159a..15e77f693 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -504,7 +504,7 @@
     <string name="red_pack_3">Red envelopes</string>
     <string name="red_pack_4">Average red envelope</string>
     <string name="red_pack_5">Congratulations on making a fortune</string>
-    <string name="red_pack_6">Hand out red envelopes</string>
+    <string name="red_pack_6">Hand out</string>
     <string name="red_pack_7">Please enter the amount</string>
     <string name="red_pack_8">Please enter quantity</string>
     <string name="red_pack_9">%1$s red packets in total</string>
@@ -1215,11 +1215,11 @@ Limited ride And limited avatar frame</string>
     <string name="main_tabs_red_packet">Red packets</string>
     <string name="save_popular_red_packets">Popular red packets</string>
     <string name="amount">amount</string>
-    <string name="drill">drill</string>
+    <string name="drill">Diamonds</string>
     <string name="conditions">Conditions</string>
     <string name="there_is_no">no</string>
-    <string name="following_anchor">Following anchor</string>
-    <string name="red_envelope_rill">Red packet%s diamonds/piece</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="top_up_now">Go top up ></string>
     <string name="range_range_is">Range Range is [%s]</string>
diff --git a/live/src/main/res/layout/view_receive_red_packet.xml b/live/src/main/res/layout/view_receive_red_packet.xml
index a01495062..fd4df13c5 100644
--- a/live/src/main/res/layout/view_receive_red_packet.xml
+++ b/live/src/main/res/layout/view_receive_red_packet.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:animateLayoutChanges="true"
@@ -96,9 +97,10 @@
         android:background="@drawable/background_open_red_packet"
         android:text="@string/red_packet_open"
         android:textColor="#FFE9BF"
-        android:textSize="32sp"
+        android:textSize="26sp"
         android:textStyle="bold"
-        android:visibility="invisible" />
+        android:visibility="invisible"
+        tools:visibility="visible" />
 
     <FrameLayout
         android:id="@+id/red_packet_time_layout"
diff --git a/live/src/main/res/layout/view_red_packet_luck_user.xml b/live/src/main/res/layout/view_red_packet_luck_user.xml
index 6bec88d35..78759e372 100644
--- a/live/src/main/res/layout/view_red_packet_luck_user.xml
+++ b/live/src/main/res/layout/view_red_packet_luck_user.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/gift_image"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
             tools:srcCompat="@mipmap/beauty_jingbai" />
 
         <TextView
@@ -39,6 +39,6 @@
             android:text="10000"
             android:textColor="@color/white"
             android:textSize="16sp"
-            android:textStyle="bold" />
+            />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java b/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java
index 3f73951ae..43a02db1a 100644
--- a/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java
@@ -61,18 +61,18 @@ public class RedPacketInfoActivity extends AbsActivity implements View.OnClickLi
         } else {
             status.setText(R.string.red_packet_info_status_timeout);
         }
-        if (bean.getRedPacketStatus() == 1 && bean.getAmountRefund() == 0){
+        if (bean.getRedPacketStatus() == 1 && bean.getAmountRefund() == 0) {
             gold.setVisibility(View.GONE);
             backAccountText.setText(R.string.red_packet_info_residue_none);
-        } else{
+        } else {
             gold.setVisibility(View.VISIBLE);
         }
         if (bean.getRedPacketStatus() == 2 && bean.getAmountRefund() == 0) {
             gold.setImageResource(R.mipmap.diamond);
-            backAccountText.setText(mContext.getString(R.string.red_packet_info_residue_back) + " +" + bean.getAmountDiamond());
-        }else if(bean.getRedPacketStatus()==2 && bean.getAmountRefund()>0){
+            backAccountText.setText(" +" + bean.getAmountDiamond()+"\n" + mContext.getString(R.string.red_packet_info_residue_back));
+        } else if (bean.getRedPacketStatus() == 2 && bean.getAmountRefund() > 0) {
             gold.setImageResource(R.mipmap.gold_coin);
-            backAccountText.setText(mContext.getString(R.string.red_packet_info_residue_back) + " +" + bean.getAmountRefund());
+            backAccountText.setText(" +" + bean.getAmountRefund() +"\n"+ mContext.getString(R.string.red_packet_info_residue_back));
         }
     }