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

zuoxiao

2024-09-27 feb7add1979c830e0d940286242a7c489f2f8f96

 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java

File was renamed from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -47,7 +47,7 @@
 * Date: 2023-11-08 21:19
 * Description: nfc写卡界面
 */
public class NFCWreatActivity extends BaseNfcActivity {
public class NFCWreatActivityQHAlone  extends QHAloneBaseNfcActivity {

    RegisteredCard registeredCard;
    CleanUserCard cleanUserCard;
@@ -97,7 +97,7 @@
    //打印
    QHAloneApplication baseApp;

    public static NFCWreatActivity nfcWreatActivity;
    public static NFCWreatActivityQHAlone nfcWreatActivity;
    /**
     * 是否是用户卡，假如是用户卡的话需要检测卡片是否已经开过户，假如已开户则报错不能再写卡
     */
@@ -235,9 +235,9 @@
                binding.textView.setText("该卡已经写入用户信息，请更换卡片");
                binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
            } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR1)) {
                TipUtil.show(NFCWreatActivity.this, "请勿移动卡片，读卡失败请重试！！");
                TipUtil.show(NFCWreatActivityQHAlone.this, "请勿移动卡片，读卡失败请重试！！");
            } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
                TipUtil.show(NFCWreatActivity.this, "卡片未能识别，请检查卡片是否是本公司卡片");
                TipUtil.show(NFCWreatActivityQHAlone.this, "卡片未能识别，请检查卡片是否是本公司卡片");
            } else {
                Log.i("NFCWreatActivity", "olduserCard!=null  saveData");
                userCardBean.setCardNumber(cardNumber);
@@ -307,9 +307,9 @@
                            //用户卡
                            startDetailActivity(userCardBean.getUserName(), "终端写卡");
                        } else if (!TextUtils.isEmpty(morny)) {
                            TipUtil.show(NFCWreatActivity.this, "充值成功", () -> NFCWreatActivity.this.finish());
                            TipUtil.show(NFCWreatActivityQHAlone.this, "充值成功", () -> NFCWreatActivityQHAlone.this.finish());
                        } else {
                            TipUtil.show(NFCWreatActivity.this, "写卡成功", () -> NFCWreatActivity.this.finish());
                            TipUtil.show(NFCWreatActivityQHAlone.this, "写卡成功", () -> NFCWreatActivityQHAlone.this.finish());
                        }

                    } catch (Exception e) {
@@ -317,7 +317,7 @@
                        CrashReport.postCatchedException(e);
                    }
                } else {
                    TipUtil.show(NFCWreatActivity.this, "写卡失败");
                    TipUtil.show(NFCWreatActivityQHAlone.this, "写卡失败");
                }
                stopAnim();
            } else if (userCard == null && userCardBean != null) {
@@ -333,9 +333,9 @@
        }
    }


    @Override
    public void onNewIntent(Intent intent) {
        super.onNewIntent(intent);
    public void onNfcBack(Intent intent) {
        try {
            this.intent = intent;
//            startAnim();
@@ -443,13 +443,13 @@
                    setPrinterData(rechargeBean);
                    startDetailActivity(userName, "终端写卡");
                } else {
                    TipUtil.show(NFCWreatActivity.this, "写卡失败，请重新再试");
                    TipUtil.show(NFCWreatActivityQHAlone.this, "写卡失败，请重新再试");
                }
            } else {
                TipUtil.show(NFCWreatActivity.this, "读取的卡和充值的卡不一致");
                TipUtil.show(NFCWreatActivityQHAlone.this, "读取的卡和充值的卡不一致");
            }
        } catch (Exception e) {
            TipUtil.show(NFCWreatActivity.this, "读取错误，请重试");
            TipUtil.show(NFCWreatActivityQHAlone.this, "读取错误，请重试");
        }
    }

@@ -560,7 +560,7 @@


    private void startDetailActivity(String userName, String statu) {
        Intent detail = new Intent(this, RechargeDetailActivity.class);
        Intent detail = new Intent(this, RechargeDetailActivityQHAlone.class);
        detail.putExtra("userName", userName);
        detail.putExtra("statu", statu);
        detail.putExtra("userCard", userCard);
@@ -573,13 +573,13 @@
        }

        startActivity(detail);
        if (NewCardActivity.newCardActivity != null) {
            NewCardActivity.newCardActivity.finish();
        if (NewCardActivityQHAlone.newCardActivity != null) {
            NewCardActivityQHAlone.newCardActivity.finish();
        }
        if (RechargeActivity.rechargeActivity != null) {
            RechargeActivity.rechargeActivity.finish();
        if (RechargeActivityQHAlone.rechargeActivity != null) {
            RechargeActivityQHAlone.rechargeActivity.finish();
        }
        NFCWreatActivity.nfcWreatActivity.finish();
        NFCWreatActivityQHAlone.nfcWreatActivity.finish();
    }


@@ -605,15 +605,15 @@
    }

    private void back() {
        confirmDialog = new ConfirmDialog(NFCWreatActivity.this, v -> {
        confirmDialog = new ConfirmDialog(NFCWreatActivityQHAlone.this, v -> {
            confirmDialog.dismiss();
            if (NewCardActivity.newCardActivity != null) {
                NewCardActivity.newCardActivity.finish();
            if (NewCardActivityQHAlone.newCardActivity != null) {
                NewCardActivityQHAlone.newCardActivity.finish();
            }
            if (RechargeActivity.rechargeActivity != null) {
                RechargeActivity.rechargeActivity.finish();
            if (RechargeActivityQHAlone.rechargeActivity != null) {
                RechargeActivityQHAlone.rechargeActivity.finish();
            }
            NFCWreatActivity.nfcWreatActivity.finish();
            NFCWreatActivityQHAlone.nfcWreatActivity.finish();
        });
        confirmDialog.show();
    }