From 75e342975c254bd65e9b696bd89e0f356b193a2b Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 7 Jul 2023 10:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/values-en-rUS/string.xml | 1 + common/src/main/res/values-zh-rHK/strings.xml | 1 + common/src/main/res/values-zh-rTW/strings.xml | 1 + common/src/main/res/values-zh/strings.xml | 1 + common/src/main/res/values/strings.xml | 1 + .../java/com/yunbao/live/dialog/SendRendPacketPopup.java | 6 ++++++ 6 files changed, 11 insertions(+) diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 1a84487dd..0092f6deb 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1248,6 +1248,7 @@ Limited ride And limited avatar frame Check out your luck %s drew %s in the lucky red envelope number + Red envelope released successfully diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 0ed5dee4a..4c3ebe8e9 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1243,4 +1243,5 @@ 查看大家手氣 " %s 在 好運紅包 中抽到了 %s" 数量 + 红包发布成功 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index fbdb32fed..74b5d5db4 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1242,4 +1242,5 @@ 查看大家手氣 " %s 在 好運紅包 中抽到了 %s" 数量 + 红包发布成功 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index a21e0efad..0249c3847 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1243,6 +1243,7 @@ 查看大家手氣 " %s 在 好運紅包 中抽到了 %s" 数量 + 红包发布成功 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index cce8d3738..80e4ccec4 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1249,4 +1249,5 @@ Limited ride And limited avatar frame Check out your luck %s drew %s in the lucky red envelope number + Red envelope released successfully 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 6c4fc6725..728c5b169 100644 --- a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java @@ -99,7 +99,10 @@ public class SendRendPacketPopup extends CenterPopupView { if (numberInt >= 200 && numberInt <= 10000) { totalConsumptionOfDrill.setText(String.format(getContext().getString(R.string.total_consumption_of_drill), String.valueOf((totalInt * numberInt)))); redEnvelopeRill.setText(String.format(getContext().getString(R.string.red_envelope_rill), s.toString())); + rill.setTextColor(Color.WHITE); + } else { + rill.setTextColor(Color.parseColor("#FD2D46")); ToastUtil.show(getContext().getString(R.string.amount) + String.format(getContext().getString(R.string.range_range_is), "200~10000")); } @@ -134,7 +137,9 @@ public class SendRendPacketPopup extends CenterPopupView { int numberInt = Integer.parseInt(number); if (numberInt >= 1 && numberInt <= 100) { totalConsumptionOfDrill.setText(String.format(getContext().getString(R.string.total_consumption_of_drill), String.valueOf((rillInt * numberInt)))); + total.setTextColor(Color.WHITE); } else { + total.setTextColor(Color.parseColor("#FD2D46")); ToastUtil.show(getContext().getString(R.string.lucky_red_envelope_amount) + String.format(getContext().getString(R.string.range_range_is), "1~100")); } @@ -195,6 +200,7 @@ public class SendRendPacketPopup extends CenterPopupView { conditions, new HttpCallback() { @Override public void onSuccess(String data) { + ToastUtil.show(R.string.red_envelope_released_successfully); dismiss(); }