更新手续费查看按钮

修改转账dialog

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"] = "c38c8bbebf7d12992d2a361bfceb6c6f"   //正式
-//             manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
+       manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
 
         }
 

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),
+                    walletBean, null, 2, getString(R.string.shuruzhifumima_txt));
-                    viewBinding.userNameTv.getText().toString()));
         } 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() {

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 {

app/src/main/res/values-en/strings.xml

@@ -658,6 +658,7 @@
     <string name="shoukuanfasong_succ_txt">Payment scanned successfully</string>
     <string name="zhifuchengong_txt">Payment successful</string>
     <string name="fukuangei_txt">Pay to %s</string>
+    <string name="shuruzhifumima_txt">Please enter your payment password</string>
     <string name="wangjimima_txt">Forgot your password? </string>
     <string name="qsrndsjhhqyzmzhmm">Enter your mobile phone number to get the verification code to retrieve your password</string>
     <string name="wangjimima_title_txt">Forgot password</string>

app/src/main/res/values-ja/strings.xml

@@ -657,6 +657,7 @@
     <string name="shoukuanfasong_succ_txt">支払いは正常にスキャンされました</string>
     <string name="zhifuchengong_txt">支払いが成功しました</string>
     <string name="fukuangei_txt">%s に支払います</string>
+    <string name="shuruzhifumima_txt">お支払いパスワードを入力してください</string>
     <string name="wangjimima_txt">パスワードをお忘れですか? </string>
     <string name="qsrndsjhhqyzmzhmm">携帯電話番号を入力して、パスワードを取得するための確認コードを取得してください</string>
     <string name="wangjimima_title_txt">パスワードを忘れた</string>

app/src/main/res/values-zh/strings.xml

@@ -649,6 +649,7 @@
     <string name="shoukuanfasong_succ_txt">收款扫码成功</string>
     <string name="zhifuchengong_txt">支付成功</string>
     <string name="fukuangei_txt">赠送%s</string>
+    <string name="shuruzhifumima_txt">请输入支付密码</string>
     <string name="wangjimima_txt">忘记密码？</string>
     <string name="qsrndsjhhqyzmzhmm">输入您的手机号获取验证码来找回密码</string>
     <string name="wangjimima_title_txt">忘记密码</string>

app/src/main/res/values/strings.xml

@@ -652,6 +652,7 @@
     <string name="shoukuanfasong_succ_txt">收款掃碼成功</string>
     <string name="zhifuchengong_txt">支付成功</string>
     <string name="fukuangei_txt">贈送%s</string>
+    <string name="shuruzhifumima_txt">請輸入支付密碼</string>
     <string name="wangjimima_txt">忘記密碼？</string>
     <string name="qsrndsjhhqyzmzhmm">輸入您的手機號獲取驗證碼來找回密碼</string>
     <string name="wangjimima_title_txt">忘記密碼</string>