From 64f40d52da3b9373c29f0ad843e88faab6cac4c8 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 7 Jul 2023 10:34:25 +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 --- gradle.properties | 8 ++++---- .../java/com/yunbao/live/dialog/SendRendPacketPopup.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 321e7baef..e850a38e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,8 +19,8 @@ org.gradle.configureondemand=true android.useAndroidX=true android.enableJetifier=true -#systemProp.http.proxyHost=127.0.0.1 -#systemProp.https.proxyHost=127.0.0.1 -#systemProp.https.proxyPort=10809 -#systemProp.http.proxyPort=10809 +systemProp.http.proxyHost=127.0.0.1 +systemProp.https.proxyHost=127.0.0.1 +systemProp.https.proxyPort=10809 +systemProp.http.proxyPort=10809 #android.enableR8.fullMode=true \ No newline at end of file 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 728c5b169..558618776 100644 --- a/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/SendRendPacketPopup.java @@ -102,7 +102,7 @@ public class SendRendPacketPopup extends CenterPopupView { rill.setTextColor(Color.WHITE); } else { - rill.setTextColor(Color.parseColor("#FD2D46")); + rill.setTextColor(Color.parseColor("#FF6F3C")); ToastUtil.show(getContext().getString(R.string.amount) + String.format(getContext().getString(R.string.range_range_is), "200~10000")); } @@ -135,11 +135,11 @@ public class SendRendPacketPopup extends CenterPopupView { totalConsumptionOfDrill.setText(String.format(getContext().getString(R.string.total_consumption_of_drill), "0")); } else { int numberInt = Integer.parseInt(number); - if (numberInt >= 1 && numberInt <= 100) { + if (numberInt >= 1 && numberInt < 101) { 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")); + total.setTextColor(Color.parseColor("#FF6F3C")); ToastUtil.show(getContext().getString(R.string.lucky_red_envelope_amount) + String.format(getContext().getString(R.string.range_range_is), "1~100")); }