修改文案，计算手续费金额公式

app/src/main/java/com/dskj/rbchat/model/LoginBean.java

@@ -31,22 +31,22 @@ public class LoginBean extends RosterElementEntity {
     private Integer isFollow;
     private Integer allowGiftCoin;
     private Integer isBiz = 0;
-    private float cashFeeRate; //cash费率
+    private double cashFeeRate; //cash费率
-    private float silverFeeRate;//积分费率
+    private double silverFeeRate;//积分费率
 
-    public float getCashFeeRate() {
+    public double getCashFeeRate() {
         return cashFeeRate;
     }
 
-    public void setCashFeeRate(float cashFeeRate) {
+    public void setCashFeeRate(double cashFeeRate) {
         this.cashFeeRate = cashFeeRate;
     }
 
-    public float getSilverFeeRate() {
+    public double getSilverFeeRate() {
         return silverFeeRate;
     }
 
-    public void setSilverFeeRate(float silverFeeRate) {
+    public void setSilverFeeRate(double silverFeeRate) {
         this.silverFeeRate = silverFeeRate;
     }
 

app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java

@@ -69,7 +69,7 @@ public class TransferAccountsActivity extends BaseActivity {
     PayCashFingerDialog payCashFingerDialog;
     PayCashDialog payDialog;
     private boolean isJinBi = false;
-    private float feeRate;//费率
+    private double feeRate;//费率
 
     private ActivityTransferAccountsBinding viewBinding;
 
@@ -81,7 +81,7 @@ public class TransferAccountsActivity extends BaseActivity {
         viewBinding = ActivityTransferAccountsBinding.inflate(getLayoutInflater());
         setContentView(viewBinding.getRoot());
         isJinBi = getIntent().getBooleanExtra("type", isJinBi);
-        feeRate = isJinBi ? DataUtils.getLocUserInfo().getCashFeeRate() / 100 : DataUtils.getLocUserInfo().getSilverFeeRate() / 100;
+        feeRate = isJinBi ? DataUtils.getLocUserInfo().getCashFeeRate() : DataUtils.getLocUserInfo().getSilverFeeRate();
         initView();
         initListeners();
     }
@@ -527,7 +527,7 @@ public class TransferAccountsActivity extends BaseActivity {
             return;
         }
         int inputAmount = Integer.parseInt(inputStr);
-        int shouxufei = (int) (Math.ceil(inputAmount * feeRate));
+        int shouxufei = (int) (Math.ceil(inputAmount * feeRate / 100));
         int rateAmount = inputAmount + shouxufei;
         viewBinding.shouxufeiTv.setText(String.valueOf(shouxufei));
         viewBinding.totaljineTv.setText(String.valueOf(rateAmount));

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

@@ -373,8 +373,8 @@
     <string name="lipinjifenbuzu_txt">Current gift points balance is insufficient</string>
     <string name="transfer_instructions_hint_txt">(optional) Enter give away instructions</string>
     <string name="fqzz_txt">Initiate give away</string>
-    <string name="no_get_to_back_t_txt">If the payment is not received within 24 hours, the give away amount will be automatically collected</string>
+    <string name="no_get_to_back_t_txt">If not claimed within 24 hours, the gifted amount will be automatically collected</string>
-    <string name="timeout_transfer_tips_txt">If payment is not received within 24 hours, the give away amount will be automatically collected</string>
+    <string name="timeout_transfer_tips_txt">If not claimed within 24 hours, the gifted amount will be automatically collected</string>
     <string name="transfer_instructions_txt">Give away instructions</string>
     <string name="transfer_time_txt">Give away time</string>
     <string name="get_transfer_time_txt">Receipt time</string>
@@ -426,7 +426,7 @@
     <string name="tuihuan_txt">Return</string>
     <string name="ndqbbdj_txt">Your gold coins are frozen, please contact customer service if you need to unfreeze</string>
     <string name="lxkh_txt">Contact customer service</string>
-    <string name="zhuanzhang_tips1_txt">If the other party does not receive payment within 1 day, the give away amount will be automatically give away to the balance of the pay</string>
+    <string name="zhuanzhang_tips1_txt">If the recipient does not claim within 1 day, the gifted amount will automatically be credited to their balance</string>
     <string name="daishoukuan_txt">Waiting for %s to receive payment</string>
     <string name="yishoukuan_txt">%s has been paid</string>
     <string name="yzdsk_txt">%s has automatically received payment</string>
@@ -434,7 +434,7 @@
     <string name="yzdtk_txt">%s has been automatically refunded</string>
     <string name="ytkdye_txt">Refunded to balance</string>
     <string name="dfwbdsjhytkdye_txt">The other party has not bound a mobile phone number, and the balance has been refunded</string>
-    <string name="zhuangzhang_tips2_txt">If the payment is not received within 1 day, the give away amount will be automatically give away to the balance</string>
+    <string name="zhuangzhang_tips2_txt">If not claimed within 1 day, the gifted amount will automatically be credited to the balance</string>
     <string name="dainishoukuan_txt">Waiting for your payment</string>
     <string name="ninyishoukuan_txt">You have received payment</string>
     <string name="niyizdsk_txt">You have automatically received payment</string>

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

@@ -370,8 +370,8 @@
     <string name="lipinjifenbuzu_txt">現在のギフトポイント残高が不足しています</string>
     <string name="transfer_instructions_hint_txt">(オプション) 転送指示を入力します</string>
     <string name="fqzz_txt">転送を開始する</string>
-    <string name="no_get_to_back_t_txt">支払いが 24 時間以内に受け取られなかった場合、送金額は自動的に徴収されます</string>
+    <string name="no_get_to_back_t_txt">24時間以内に受け取らなかった場合、贈与金額は自動的に受け取られます</string>
-    <string name="timeout_transfer_tips_txt">24 時間以内に支払いが受け取られなかった場合、送金金額は自動的に徴収されます</string>
+    <string name="timeout_transfer_tips_txt">24時間以内に受け取らなかった場合、贈与金額は自動的に受け取られます</string>
     <string name="transfer_instructions_txt">転送指示</string>
     <string name="transfer_time_txt">転送時間</string>
     <string name="get_transfer_time_txt">受信時刻</string>
@@ -422,9 +422,9 @@
     <string name="nqdythzz_txt">送金を返金してもよろしいですか? </string>
     <string name="nqdythzz_txt1">%s の送金を返金してもよろしいですか? </string>
     <string name="tuihuan_txt">戻る</string>
-    <string name="ndqbbdj_txt">ゴールド コインは凍結されています。凍結を解除する必要がある場合は、カスタマー サービスにお問い合わせください。</string>
+    <string name="ndqbbdj_txt">ゴールド コインは凍結されています。凍結を解除する必要がある場合は、カスタマー サービスにお問い合わせください</string>
     <string name="lxkh_txt">カスタマーサービスにお問い合わせください</string>
-    <string name="zhuanzhang_tips1_txt">相手方が 1 日以内に支払いを受け取らなかった場合、送金金額は自動的に受取人の残高に送金されます。</string>
+    <string name="zhuanzhang_tips1_txt">受取人が1日以内に受け取らなかった場合、贈与金額は自動的に受取人の残高に加算されます</string>
     <string name="daishoukuan_txt">%s が支払いを受け取るのを待っています</string>
     <string name="yishoukuan_txt">%s は支払われました</string>
     <string name="yzdsk_txt">%s が自動的に支払いを受け取りました</string>
@@ -432,7 +432,7 @@
     <string name="yzdtk_txt">%s は自動的に返金されました</string>
     <string name="ytkdye_txt">残高を返金しました</string>
     <string name="dfwbdsjhytkdye_txt">相手は携帯電話番号を拘束しておらず、残高は返金されました</string>
-    <string name="zhuangzhang_tips2_txt">支払いが 1 日以内に受け取られなかった場合、送金金額は自動的に残高に送金されます</string>
+    <string name="zhuangzhang_tips2_txt">1日以内に受け取らなかった場合、贈与金額は自動的に残高に加算されます</string>
     <string name="dainishoukuan_txt">お支払いを待っています</string>
     <string name="ninyishoukuan_txt">支払いを受け取りました</string>
     <string name="niyizdsk_txt">支払いを自動的に受け取りました</string>

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

@@ -368,8 +368,8 @@
     <string name="lipinjifenbuzu_txt">当前礼品积分余额不足</string>
     <string name="transfer_instructions_hint_txt">（选填）输入赠送说明</string>
     <string name="fqzz_txt">发起赠送</string>
-    <string name="no_get_to_back_t_txt">24小时内未收款，赠送金额将被自动领取</string>
+    <string name="no_get_to_back_t_txt">24小时内未领取，赠送金额将被自动领取</string>
-    <string name="timeout_transfer_tips_txt">24小时内未收款，赠送金额将被自动领取</string>
+    <string name="timeout_transfer_tips_txt">24小时内未领取，赠送金额将被自动领取</string>
     <string name="transfer_instructions_txt">赠送说明</string>
     <string name="transfer_time_txt">赠送时间</string>
     <string name="get_transfer_time_txt">领取时间</string>
@@ -421,7 +421,7 @@
     <string name="tuihuan_txt">退还</string>
     <string name="ndqbbdj_txt">您的Cash被冻结，如需解冻请联系客服</string>
     <string name="lxkh_txt">联系客服</string>
-    <string name="zhuanzhang_tips1_txt">1天内对方未收款，赠送金额将自动打到收款方的余额</string>
+    <string name="zhuanzhang_tips1_txt">1天内对方未领取，赠送金额将自动打到对方的余额</string>
     <string name="daishoukuan_txt">待%s收款</string>
     <string name="yishoukuan_txt">%s已收款</string>
     <string name="yzdsk_txt">%s已自动领取</string>
@@ -429,7 +429,7 @@
     <string name="yzdtk_txt">%s已自动退还</string>
     <string name="ytkdye_txt">已退还到余额</string>
     <string name="dfwbdsjhytkdye_txt">对方未绑定手机号，已退还到余额</string>
-    <string name="zhuangzhang_tips2_txt">1天内未收款，赠送金额将自动打到余额</string>
+    <string name="zhuangzhang_tips2_txt">1天内未领取，赠送金额将自动打到余额</string>
     <string name="dainishoukuan_txt">待你收款</string>
     <string name="ninyishoukuan_txt">您已领取</string>
     <string name="niyizdsk_txt">您已自动领取</string>

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

@@ -367,8 +367,8 @@
     <string name="lipinjifenbuzu_txt">當前禮品積分餘額不足</string>
     <string name="transfer_instructions_hint_txt">（選填）輸入贈送說明</string>
     <string name="fqzz_txt">發起贈送</string>
-    <string name="no_get_to_back_t_txt">24小時內未收款，贈送金額將會自動領取</string>
+    <string name="no_get_to_back_t_txt">24小時內未領取，贈送金額將會自動領取</string>
-    <string name="timeout_transfer_tips_txt">24小時內未收款，贈送金額將會自動領取</string>
+    <string name="timeout_transfer_tips_txt">24小時內未領取，贈送金額將會自動領取</string>
     <string name="transfer_instructions_txt">贈送說明</string>
     <string name="transfer_time_txt">贈送時間</string>
     <string name="get_transfer_time_txt">領取時間</string>
@@ -420,7 +420,7 @@
     <string name="tuihuan_txt">退還</string>
     <string name="ndqbbdj_txt">您的Cash被凍結，如需解凍請聯絡客服</string>
     <string name="lxkh_txt">聯絡客服</string>
-    <string name="zhuanzhang_tips1_txt">1天內對方未收款，贈送金額將自動打到收款方的餘額</string>
+    <string name="zhuanzhang_tips1_txt">1天內對方未領取，贈送金額將自動打到對方的餘額</string>
     <string name="daishoukuan_txt">待%s收款</string>
     <string name="yishoukuan_txt">%s已收款</string>
     <string name="yzdsk_txt">%s已自動領取</string>
@@ -428,7 +428,7 @@
     <string name="yzdtk_txt">%s已自動退還</string>
     <string name="ytkdye_txt">已退還至餘額</string>
     <string name="dfwbdsjhytkdye_txt">對方未綁定手機號，已退還到餘額</string>
-    <string name="zhuangzhang_tips2_txt">1天內未收款，贈送金額將自動打到餘額</string>
+    <string name="zhuangzhang_tips2_txt">1天內未領取，贈送金額將自動打到餘額</string>
     <string name="dainishoukuan_txt">待你收款</string>
     <string name="ninyishoukuan_txt">您已領取</string>
     <string name="niyizdsk_txt">您已自動領取</string>