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

zuoxiao

2024-09-27 feb7add1979c830e0d940286242a7c489f2f8f96

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

File was renamed from qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
@@ -9,9 +9,7 @@
import android.view.View;

import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.AidlUtil;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.DeviceUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
@@ -50,7 +48,6 @@
import com.tencent.bugly.crashreport.CrashReport;

import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

@@ -60,7 +57,7 @@
 * Date: 2023-11-08 21:19
 * Description: nfc写卡界面
 */
public class NFCWreatActivity extends BaseNfcActivity {
public class NFCWreatActivityQHOline extends QHOlineBaseNfcActivity {

    RegisteredCard registeredCard;
    CleanUserCard cleanUserCard;
@@ -102,7 +99,7 @@
    //打印
    QHOnLineApplication baseApp;

    public static NFCWreatActivity nfcWreatActivity;
    public static NFCWreatActivityQHOline nfcWreatActivity;
    /**
     * 是否是用户卡，假如是用户卡的话需要检测卡片是否已经开过户，假如已开户则报错不能再写卡
     */
@@ -132,9 +129,9 @@
            binding = ActivityWriteTextQhlBinding.inflate(LayoutInflater.from(this));
            setContentView(binding.getRoot());
            nfcWreatActivity = this;
            titleBack();
            baseApp = QHOnLineApplication.getInstance();
            getData();
            titleBack();
        } catch (Exception e) {
            e.printStackTrace();
            CrashReport.postCatchedException(e);
@@ -262,9 +259,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(NFCWreatActivityQHOline.this, "请勿移动卡片，读卡失败请重试！！");
            } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
                TipUtil.show(NFCWreatActivity.this, "卡片未能识别，请检查卡片是否是本公司卡片");
                TipUtil.show(NFCWreatActivityQHOline.this, "卡片未能识别，请检查卡片是否是本公司卡片");
            } else {
                //读卡成功
                Log.i("NFCWreatActivity", "olduserCard!=null  saveData");
@@ -323,9 +320,9 @@
                if (electricPriceFlag || passwordFlag || regionFlag || configPowerFlag || configDeviceRegiestFlag || domainCrdFlag || cleanFlag || manageCardFlag || registeredFlag || administrativeCardFlag || cleanUserCardFlag) {
                    try {
                        if (!TextUtils.isEmpty(morny)) {
                            TipUtil.show(NFCWreatActivity.this, "充值成功", () -> NFCWreatActivity.this.finish());
                            TipUtil.show(NFCWreatActivityQHOline.this, "充值成功", () -> NFCWreatActivityQHOline.this.finish());
                        } else {
                            TipUtil.show(NFCWreatActivity.this, "写卡成功", () -> NFCWreatActivity.this.finish());
                            TipUtil.show(NFCWreatActivityQHOline.this, "写卡成功", () -> NFCWreatActivityQHOline.this.finish());
                        }

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


    @Override
    public void onNewIntent(Intent intent) {
        super.onNewIntent(intent);
    public void onNfcBack(Intent intent) {
        try {
            this.intent = intent;
            if (isUser) {
@@ -395,18 +392,18 @@
                if (WriteCardUtils.setUser(intent, userCard, this)) {
                    confromRecharge(rechargeBean.getOrderId(), 0);
                } else {
                    TipUtil.show(NFCWreatActivity.this, "写卡失败，请重新再试");
                    TipUtil.show(NFCWreatActivityQHOline.this, "写卡失败，请重新再试");
                }
            } else {
                TipUtil.show(NFCWreatActivity.this, "读取的卡和充值的卡不一致");
                TipUtil.show(NFCWreatActivityQHOline.this, "读取的卡和充值的卡不一致");
            }
        } catch (Exception e) {
            TipUtil.show(NFCWreatActivity.this, "读取错误，请重试");
            TipUtil.show(NFCWreatActivityQHOline.this, "读取错误，请重试");
        }
    }

    private void startDetailActivity(String statu) {
        Intent detail = new Intent(this, RechargeDetailActivity.class);
        Intent detail = new Intent(this, RechargeDetailActivityQHOline.class);
        detail.putExtra("statu", statu);
        detail.putExtra("userCard", userCard);
        if (!TextUtils.isEmpty(morny)) {
@@ -416,13 +413,13 @@
            detail.putExtra("userCardBean", userCardBean);
        }
        startActivity(detail);
        if (NewCardActivity.newCardActivity != null) {
            NewCardActivity.newCardActivity.finish();
        if (NewCardActivityQHOline.newCardActivity != null) {
            NewCardActivityQHOline.newCardActivity.finish();
        }
        if (RechargeActivity.rechargeActivity != null) {
            RechargeActivity.rechargeActivity.finish();
        if (RechargeActivityQHOline.rechargeActivity != null) {
            RechargeActivityQHOline.rechargeActivity.finish();
        }
        NFCWreatActivity.nfcWreatActivity.finish();
        NFCWreatActivityQHOline.nfcWreatActivity.finish();
    }


@@ -448,15 +445,15 @@
    }

    private void back() {
        confirmDialog = new ConfirmDialog(NFCWreatActivity.this, v -> {
        confirmDialog = new ConfirmDialog(NFCWreatActivityQHOline.this, v -> {
            confirmDialog.dismiss();
            if (NewCardActivity.newCardActivity != null) {
                NewCardActivity.newCardActivity.finish();
            if (NewCardActivityQHOline.newCardActivity != null) {
                NewCardActivityQHOline.newCardActivity.finish();
            }
            if (RechargeActivity.rechargeActivity != null) {
                RechargeActivity.rechargeActivity.finish();
            if (RechargeActivityQHOline.rechargeActivity != null) {
                RechargeActivityQHOline.rechargeActivity.finish();
            }
            NFCWreatActivity.nfcWreatActivity.finish();
            NFCWreatActivityQHOline.nfcWreatActivity.finish();
        });
        confirmDialog.show();
    }
@@ -495,7 +492,7 @@
                    userCard.setUserCodeNumber(Integer.valueOf(userCode.substring(12, 16)));
                    userCardBean.setCardNumber(cardNumber);
                    userCardBean.setUserCode(userCode);
                    if (WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this)) {
                    if (WriteCardUtils.setUser(intent, userCard, NFCWreatActivityQHOline.this)) {
                        confromOpenCard(t.getData().getIccardRechargeRecordId(), 0);
                    } else {
                        confromOpenCard(t.getData().getIccardRechargeRecordId(), 2);
@@ -530,7 +527,7 @@
                        baseDao.userCardDao().insert(userCardBean);
                        startDetailActivity("终端写卡");
                    } else {
                        TipUtil.show(NFCWreatActivity.this, "写卡失败请重新贴卡！");
                        TipUtil.show(NFCWreatActivityQHOline.this, "写卡失败请重新贴卡！");
                    }
                }
            }
@@ -565,7 +562,7 @@
                        PrintUtils.printerData(rechargeBean);
                        startDetailActivity("终端写卡");
                    } else {
                        TipUtil.show(NFCWreatActivity.this, "写卡失败请重新贴卡！");
                        TipUtil.show(NFCWreatActivityQHOline.this, "写卡失败请重新贴卡！");
                    }
                } else {
                    ToastUtil.show(t.getMsg());
@@ -582,7 +579,7 @@
        if (replaceType == BaseCommon.REPLACE_NO_CARD) {
            replaceCardPost("", "");
        } else if (replaceType == BaseCommon.REPLACE_HAS_CARD) {
            managerToUserCard = NfcReadHelper.getInstence(intent, NFCWreatActivity.this).getManagerToUserCardData();
            managerToUserCard = NfcReadHelper.getInstence(intent, NFCWreatActivityQHOline.this).getManagerToUserCardData(new ManagerToUserCard());
            //判断是否已经在控制器端刷卡
            if (managerToUserCard.getCardWriteState() == 1) {
                replaceCardPost(MornyUtil.changeF2Y(managerToUserCard.getBalance()), MornyUtil.changeF2Y(managerToUserCard.getSurplusElecticity()));
@@ -629,14 +626,14 @@
                    userCard.setTotalMorny(MornyUtil.changeY2F(replaceCardResult.getTotalRechargeMoney()));
                    userCard.setRechargeDate(Calendar.getInstance());
                    userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
                    if (WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this)) {
                    if (WriteCardUtils.setUser(intent, userCard, NFCWreatActivityQHOline.this)) {
                        userCardBean.setCardNumber(cardNumber);
                        userCardBean.setUserCode(userCode);
                        userCardBean.setDate(System.currentTimeMillis());
                        baseDao.userCardDao().insert(userCardBean);
                        confromReplaceCard(replaceCardResult.getIccardRechargeRecordId(), 0);
                    } else {
                        TipUtil.show(NFCWreatActivity.this, "写卡失败，请重试");
                        TipUtil.show(NFCWreatActivityQHOline.this, "写卡失败，请重试");
                    }
                    //   打印相关
//                    setPrinterData(rechargeBean);
@@ -665,12 +662,12 @@
            @Override
            public void onNext(BaseResponse<LoginResult> t) {
                if (t.isSuccess()) {
                    TipUtil.show(NFCWreatActivity.this, "补卡成功！", () -> {
                        if (UserSearchActivity.userSearchActivity != null) {
                            UserSearchActivity.userSearchActivity.finish();
                            UserSearchActivity.userSearchActivity = null;
                    TipUtil.show(NFCWreatActivityQHOline.this, "补卡成功！", () -> {
                        if (UserSearchActivityQHOline.userSearchActivity != null) {
                            UserSearchActivityQHOline.userSearchActivity.finish();
                            UserSearchActivityQHOline.userSearchActivity = null;
                        }
                        NFCWreatActivity.this.finish();
                        NFCWreatActivityQHOline.this.finish();
                    });
                }
            }