优化NFC模块架构，将一些方法抽调到父类中。

zuoxiao

2024-09-27 feb7add1979c830e0d940286242a7c489f2f8f96

 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivityQHOline.java

File was renamed from qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
@@ -16,7 +16,6 @@
import com.dayu.qiheonlinelibrary.R;
import com.dayu.qiheonlinelibrary.bean.CardInfoResult;
import com.dayu.qiheonlinelibrary.bean.RechargeResult;
import com.dayu.qiheonlinelibrary.card.UserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityRechargeQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
@@ -37,12 +36,12 @@
 * Date: 2023-11-5 09:52
 * Description: 充值界面
 */
public class RechargeActivity extends BaseNfcActivity {
public class RechargeActivityQHOline extends QHOlineBaseNfcActivity {

    Intent intent;

    ActivityRechargeQhlBinding binding;
    public static RechargeActivity rechargeActivity;
    public static RechargeActivityQHOline rechargeActivity;


    String cardNumber = null;//实体卡号
@@ -71,7 +70,10 @@
        }
    }

    public void onNewIntent(Intent intent) {


    @Override
    public void onNfcBack(Intent intent) {
        this.intent = intent;
        try {
            readAllData();
@@ -79,7 +81,6 @@
            e.printStackTrace();
            CrashReport.postCatchedException(e);
        }
        super.onNewIntent(intent);
    }


@@ -117,7 +118,7 @@
            binding.redStatu.setTextColor(this.getResources().getColor(R.color.black));
        } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
            setCardState("未刷卡关泵,当前不可充值");
            TipUtil.show(RechargeActivity.this, "未刷卡关泵,当前不可充值");
            TipUtil.show(RechargeActivityQHOline.this, "未刷卡关泵,当前不可充值");
        } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
            setCardState("叠加充值");
        } else {
@@ -160,7 +161,7 @@
            if (!TextUtils.isEmpty(morny)) {
                rechaege(morny);
            } else {
                TipUtil.show(RechargeActivity.this, "请输入充值金额");
                TipUtil.show(RechargeActivityQHOline.this, "请输入充值金额");
            }
        });
    }
@@ -231,7 +232,7 @@
        int deductionMorny = MornyUtil.changeY2F(morny) + userCard.getBalance() - MornyUtil.changeY2F(balance);

        if (MornyUtil.changeY2F(morny) < deductionMorny) {
            TipUtil.show(RechargeActivity.this, "当前充值金额小于补扣金额，补扣金额为" + MornyUtil.changeF2Y(deductionMorny) + "元，充值金额应大于补扣金额！");
            TipUtil.show(RechargeActivityQHOline.this, "当前充值金额小于补扣金额，补扣金额为" + MornyUtil.changeF2Y(deductionMorny) + "元，充值金额应大于补扣金额！");
            return;
        }

@@ -268,16 +269,16 @@
        userCard.setRechargeDate(calendar);
        userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
        if (deductionMorny == 0) {
            Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
            Intent intent = new Intent(RechargeActivityQHOline.this, NFCWreatActivityQHOline.class);
            intent.putExtra("morny", morny);
            intent.putExtra("userCard", userCard);
            intent.putExtra("rechargeBean", rechargeBean);
            startActivity(intent);
        } else {
            TipUtil.show(RechargeActivity.this, "挂失卡后有补交金额！补交金额为：" + MornyUtil.changeF2Y(deductionMorny) + "元，详情可在平台查询。", new TipUtil.TipListener() {
            TipUtil.show(RechargeActivityQHOline.this, "挂失卡后有补交金额！补交金额为：" + MornyUtil.changeF2Y(deductionMorny) + "元，详情可在平台查询。", new TipUtil.TipListener() {
                @Override
                public void onCancle() {
                    Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
                    Intent intent = new Intent(RechargeActivityQHOline.this, NFCWreatActivityQHOline.class);
                    intent.putExtra("morny", morny);
                    intent.putExtra("userCard", userCard);
                    intent.putExtra("rechargeBean", rechargeBean);
@@ -316,10 +317,10 @@
                        RechargeResult rechargeResult = t.getData();
                        startNfcActivity(morny, rechargeResult.getIccardBalanceMoney(), rechargeResult.getRechargeElectricAmount(), rechargeResult.getIccardBalanceElectric(), rechargeResult.getTotalRechargeMoney(), rechargeResult.getIccardRechargeRecordId());
                    } else {
                        TipUtil.show(RechargeActivity.this, "充值失败请重试！");
                        TipUtil.show(RechargeActivityQHOline.this, "充值失败请重试！");
                    }
                } else {
                    TipUtil.show(RechargeActivity.this, t.getMsg());
                    TipUtil.show(RechargeActivityQHOline.this, t.getMsg());
                }
            }
        });
@@ -350,22 +351,22 @@
                                    cardInfoResult = t.getData();
                                    setUserData(cardNumber, cardInfoResult.getPeasantName(), cardInfoResult.getLastRechargeTime());
                                } else {
                                    TipUtil.show(RechargeActivity.this, "读取卡片失败，请重新贴卡");
                                    TipUtil.show(RechargeActivityQHOline.this, "读取卡片失败，请重新贴卡");
                                }
                            } else {
                                TipUtil.show(RechargeActivity.this, "卡片识别错误,请重试！");
                                TipUtil.show(RechargeActivityQHOline.this, "卡片识别错误,请重试！");
                            }
                        } else if (t.getData().getIccardStatus() == 1) {
                            TipUtil.show(RechargeActivity.this, "当前卡已注销");
                            TipUtil.show(RechargeActivityQHOline.this, "当前卡已注销");
                        } else {
                            TipUtil.show(RechargeActivity.this, "当前卡已挂失");
                            TipUtil.show(RechargeActivityQHOline.this, "当前卡已挂失");
                        }
                    } else {
                        TipUtil.show(RechargeActivity.this, "当前卡片错误，未能查到该卡信息！");
                        TipUtil.show(RechargeActivityQHOline.this, "当前卡片错误，未能查到该卡信息！");
                    }

                } else {
                    TipUtil.show(RechargeActivity.this, t.getMsg());
                    TipUtil.show(RechargeActivityQHOline.this, t.getMsg());
                }
            }
        });
@@ -375,7 +376,7 @@
    private void setCardState(String state) {
        binding.rechargeLL.setVisibility(View.GONE);
        binding.rechargeRegistBtn.setVisibility(View.GONE);
        binding.redStatu.setTextColor(RechargeActivity.this.getResources().getColor(com.dayu.baselibrary.R.color.red));
        binding.redStatu.setTextColor(RechargeActivityQHOline.this.getResources().getColor(com.dayu.baselibrary.R.color.red));
        binding.redStatu.setText(state);
    }