diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 817eeb527..9839b3209 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -296,7 +296,7 @@ accompaniment share Game - Red envelopes + Red packets Lian Mai SinglePK WishList @@ -1219,7 +1219,7 @@ Limited ride And limited avatar frame no Subscribing %s diamonds/piece - Total %s drill + Consume %s diamonds GO TOP UP > Range Range is [%s] Randomly available @@ -1230,16 +1230,16 @@ Limited ride And limited avatar frame value 2. Who is the red envelope given to? After the red envelope is issued, all users in the broadcast room can grab it, including themselves - 3. How to send red packets? + 5. How to send red packets? 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 - 4. How to deal with unclaimed red envelopes? + 3. How to deal with unclaimed red envelopes? 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 - 5. What can you do with the red envelopes you grab? + 4. What can you do with the red envelopes you grab? Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected - Congratulations Red Envelope + Congratulations Get %s View Lucky Audience > - Give a gift to heart + Giving a gift to the host Countdown :%s To open :%s %s red packet diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 74b5d5db4..1ba7f328b 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1224,11 +1224,11 @@ 有紅包的直播間會給新增熱度,吸引更多用戶觀看直播 2.紅包發給誰? 紅包發出后,直播間所有用戶都可搶,包括自己 - 3.紅包怎麽發? + 5.紅包怎麽發? 紅包同爲禮物,20%鑽石獎勵給主播,剩餘70%的鑽石會以【1鑽石=1金豆】的比列兌換成金豆塞進紅包内給直播間觀看領取,剩餘10%隨機包成鑽石禮物包進紅包裹,另平臺設有紅包目標任務,每連成一個目標,平臺將獎勵目標紅包 數總價值的2%開設超級獎池供所有目標用戶抽取 - 4.未被領取的紅包如何處理? + 3.未被領取的紅包如何處理? 紅包打開后未被領取,以及主播下播后未打開的紅包,會退回您的賬戶 - 5.搶到的紅包能幹嘛? + 4.搶到的紅包能幹嘛? 搶到紅包所得金豆可用於平臺一切金豆行爲,不可轉增,不可體現 恭喜搶到紅包 獲得%s diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 0249c3847..9ab1cf72d 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1225,11 +1225,11 @@ 有紅包的直播間會給新增熱度,吸引更多用戶觀看直播 2.紅包發給誰? 紅包發出后,直播間所有用戶都可搶,包括自己 - 3.紅包怎麽發? + 5.紅包怎麽發? 紅包同爲禮物,20%鑽石獎勵給主播,剩餘70%的鑽石會以【1鑽石=1金豆】的比列兌換成金豆塞進紅包内給直播間觀看領取,剩餘10%隨機包成鑽石禮物包進紅包裹,另平臺設有紅包目標任務,每連成一個目標,平臺將獎勵目標紅包 數總價值的2%開設超級獎池供所有目標用戶抽取 - 4.未被領取的紅包如何處理? + 3.未被領取的紅包如何處理? 紅包打開后未被領取,以及主播下播后未打開的紅包,會退回您的賬戶 - 5.搶到的紅包能幹嘛? + 4.搶到的紅包能幹嘛? 搶到紅包所得金豆可用於平臺一切金豆行爲,不可轉增,不可體現 恭喜搶到紅包 獲得%s diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 0860b8f51..808fc9fd2 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -296,7 +296,7 @@ accompaniment share Game - Red envelopes + Red packets Lian Mai SinglePK WishList @@ -1220,7 +1220,7 @@ Limited ride And limited avatar frame no Subscribing %s diamonds/piece - Total %s drill + Consume %s diamonds GO TOP UP > Range Range is [%s] value @@ -1231,16 +1231,16 @@ Limited ride And limited avatar frame A studio with a red envelope will add heat and attract more users to watch live broadcasts 2. Who is the red envelope given to? After the red envelope is issued, all users in the broadcast room can grab it, including themselves - 3. How to send red packets? + 5. How to send red packets? 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 - 4. How to deal with unclaimed red envelopes? + 3. How to deal with unclaimed red envelopes? 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 - 5. What can you do with the red envelopes you grab? + 4. What can you do with the red envelopes you grab? Grab the red envelope to obtain gold beans can be used on the platform of all gold beans behavior, not increased, not reflected - Congratulations Red Envelope + Congratulations Get %s View Lucky Audience > - Give a gift to heart + Giving a gift to the host Countdown :%s To open :%s %s red packet diff --git a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java b/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java index 74529d058..3d2dd2c5a 100644 --- a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java +++ b/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) { diff --git a/live/src/main/res/layout/view_result_red_packet.xml b/live/src/main/res/layout/view_result_red_packet.xml index d98f87e34..e953869d1 100644 --- a/live/src/main/res/layout/view_result_red_packet.xml +++ b/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" /> \ No newline at end of file diff --git a/live/src/main/res/layout/view_send_red_packet.xml b/live/src/main/res/layout/view_send_red_packet.xml index 7e9049517..5cc9240bd 100644 --- a/live/src/main/res/layout/view_send_red_packet.xml +++ b/live/src/main/res/layout/view_send_red_packet.xml @@ -1,6 +1,7 @@ + android:visibility="gone" + tools:visibility="visible"> - - - + + + + + + + diff --git a/live/src/main/res/mipmap-xxxhdpi/bg_red_packet_info_en.png b/live/src/main/res/mipmap-xxxhdpi/bg_red_packet_info_en.png new file mode 100644 index 000000000..ab8e0dbbc Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/bg_red_packet_info_en.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/bg_red_packet_info_zh.png b/live/src/main/res/mipmap-xxxhdpi/bg_red_packet_info_zh.png new file mode 100644 index 000000000..795575b86 Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/bg_red_packet_info_zh.png differ