From 25ccd2f5608a69127e3d01aca63b3792b341d163 Mon Sep 17 00:00:00 2001 From: guozhen <878631970@qq.com> Date: Thu, 28 Nov 2024 14:46:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=8B=E7=BB=AD=E8=B4=B9?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BD=AC=E8=B4=A6dialog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 5 +++-- .../redpack/TransferAccountsActivity.java | 18 +++++++++++++----- .../dskj/rbchat/wallet/WalletInfoFragment.java | 2 +- app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6c04cad..8c44882 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -23,6 +23,7 @@ android { // storePassword = "123456" // keyAlias = "key0" // keyPassword = "123456" + // } create("release") { storeFile = file("..\\dsjk_keystore.jks") @@ -84,8 +85,8 @@ android { "\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\"" ) //正式服 - manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 -// manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" + // manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 + manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" } diff --git a/app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java b/app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java index a2a6af1..408482e 100644 --- a/app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java +++ b/app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java @@ -187,11 +187,15 @@ public class TransferAccountsActivity extends BaseActivity { private void showPayCashDialog() { if (isJinBi) { +// payDialog = new PayCashDialog(TransferAccountsActivity.this, number + "", true, 0, walletBean, +// null, 2, String.format(getString(R.string.fukuangei_txt), userNickName)); payDialog = new PayCashDialog(TransferAccountsActivity.this, number + "", true, 0, walletBean, - null, 2, String.format(getString(R.string.fukuangei_txt), userNickName)); + null, 2, getString(R.string.shuruzhifumima_txt)); } else { +// payDialog = new PayCashDialog(TransferAccountsActivity.this, number + "", true, 0, walletBean, +// null, 2, String.format(getString(R.string.fukuangei_txt), userNickName), 1); payDialog = new PayCashDialog(TransferAccountsActivity.this, number + "", true, 0, walletBean, - null, 2, String.format(getString(R.string.fukuangei_txt), userNickName), 1); + null, 2, getString(R.string.shuruzhifumima_txt), 1); } payDialog.setOntoAlbumListener(new PayCashDialog.OnListItemClickListener() { @Override @@ -216,12 +220,16 @@ public class TransferAccountsActivity extends BaseActivity { private void showPayCashFingerDialog() { //Context context, String data, boolean showNumber, int payType, WalletBean walletBean, SelectPayTypeDialog.OnToTypeListener onToTypeListener, int isShowFinger if (isJinBi) { +// payCashFingerDialog = new PayCashFingerDialog(this, number + "", true, 0, +// walletBean, null, 2, String.format(getString(R.string.fukuangei_txt), +// viewBinding.userNameTv.getText().toString())); payCashFingerDialog = new PayCashFingerDialog(this, number + "", true, 0, - walletBean, null, 2, String.format(getString(R.string.fukuangei_txt), - viewBinding.userNameTv.getText().toString())); + walletBean, null, 2, getString(R.string.shuruzhifumima_txt)); } else { +// payCashFingerDialog = new PayCashFingerDialog(this, number + "", true, 0, walletBean, +// null, 2, String.format(getString(R.string.fukuangei_txt), viewBinding.userNameTv.getText().toString()), true); payCashFingerDialog = new PayCashFingerDialog(this, number + "", true, 0, walletBean, - null, 2, String.format(getString(R.string.fukuangei_txt), viewBinding.userNameTv.getText().toString()), true); + null, 2, getString(R.string.shuruzhifumima_txt), true); } payCashFingerDialog.setOntoAlbumListener(new PayCashFingerDialog.OnListItemClickListener() { diff --git a/app/src/main/java/com/dskj/rbchat/wallet/WalletInfoFragment.java b/app/src/main/java/com/dskj/rbchat/wallet/WalletInfoFragment.java index 8b407b2..389e134 100644 --- a/app/src/main/java/com/dskj/rbchat/wallet/WalletInfoFragment.java +++ b/app/src/main/java/com/dskj/rbchat/wallet/WalletInfoFragment.java @@ -283,7 +283,7 @@ public class WalletInfoFragment extends BaseFragment { } else { textView.setTextColor(getResources().getColor(R.color.black)); } - if (s.getTransferMoneyRecord() != null && s.getTransferMoneyRecord().getFeeAmount() != 0) { + if (s.getTransferMoneyRecord() != null && s.getTransferMoneyRecord().getFeeAmount() > 0 && s.getAmount()<0) { isShowRate = true; textView.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.mipmap.ic_transfer_tips), null, null, null); } else { diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 4e4baea..e2db677 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -658,6 +658,7 @@ Payment scanned successfully Payment successful Pay to %s + Please enter your payment password Forgot your password? Enter your mobile phone number to get the verification code to retrieve your password Forgot password diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index df6ef69..934c2cf 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -657,6 +657,7 @@ 支払いは正常にスキャンされました 支払いが成功しました %s に支払います + お支払いパスワードを入力してください パスワードをお忘れですか? 携帯電話番号を入力して、パスワードを取得するための確認コードを取得してください パスワードを忘れた diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 4b2ec4c..480655b 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -649,6 +649,7 @@ 收款扫码成功 支付成功 赠送%s + 请输入支付密码 忘记密码？ 输入您的手机号获取验证码来找回密码 忘记密码 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb1d938..dea6a6f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -652,6 +652,7 @@ 收款掃碼成功 支付成功 贈送%s + 請輸入支付密碼 忘記密碼？ 輸入您的手機號獲取驗證碼來找回密碼 忘記密碼