From feb7add1979c830e0d940286242a7c489f2f8f96 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 27 九月 2024 09:23:34 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivityQHOline.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivityQHOline.java
similarity index 87%
rename from qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
rename to qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivityQHOline.java
index 2a47e87..ebb67a9 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivityQHOline.java
@@ -30,7 +30,7 @@
* Time: 20:10
* 澶囨敞锛� 璇诲彇绠＄悊鍗★紝浠庢帶鍒跺櫒璇诲崱鍚庡湪姝ょ晫闈㈣鍗�
*/
-public class ManagerReadActivity extends BaseNfcActivity {
+public class ManagerReadActivityQHOline extends QHOlineBaseNfcActivity {
ActivityManagerReadQhlBinding binding;
Intent intent;
@@ -55,19 +55,20 @@
private void initView() {
binding.managerNext.setOnClickListener(v -> {
if (isReadSuccess) {
- Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(ManagerReadActivityQHOline.this, NFCWreatActivityQHOline.class);
intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
startActivity(intent);
- ManagerReadActivity.this.finish();
+ ManagerReadActivityQHOline.this.finish();
} else {
- TipUtil.show(ManagerReadActivity.this, "璇峰埛绠＄悊鍗�");
+ TipUtil.show(ManagerReadActivityQHOline.this, "璇峰埛绠＄悊鍗�");
}
});
}
+
@Override
- public void onNewIntent(Intent intent) {
+ public void onNfcBack(Intent intent) {
this.intent = intent;
ProgressDialog.show(this);
if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
@@ -80,7 +81,7 @@
}
if (CardCommon.MANAGE_CRAD.equalsIgnoreCase(cardType)) {
- managerToUserCard = NfcReadHelper.getInstence(intent, this).getManagerToUserCardData();
+ managerToUserCard = NfcReadHelper.getInstence(intent, this).getManagerToUserCardData(new ManagerToUserCard());
if (managerToUserCard != null) {
if (QHOnLineApplication.getInstance().arerNumber.equalsIgnoreCase(String.valueOf(managerToUserCard.getArerNumber()))) {
String oldCardNumber = managerToUserCard.getOldCardNumber();
@@ -100,7 +101,6 @@
TipUtil.show(this, "褰撳墠鍗′笉鏄鐞嗗崱锛侊紒锛�");
}
}
- super.onNewIntent(intent);
}
/**
@@ -126,16 +126,16 @@
userCardBean.setAddressCode(cardInfoResult.getAdcd());
userCardBean.setAddressName(cardInfoResult.getAdcdName());
isReadSuccess = true;
- TipUtil.show(ManagerReadActivity.this, "璇诲崱鎴愬姛锛屼笅涓�姝ュ皢鍐欏崱锛�", () -> {
- Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
+ TipUtil.show(ManagerReadActivityQHOline.this, "璇诲崱鎴愬姛锛屼笅涓�姝ュ皢鍐欏崱锛�", () -> {
+ Intent intent = new Intent(ManagerReadActivityQHOline.this, NFCWreatActivityQHOline.class);
intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
intent.putExtra("userCardBean", userCardBean);
startActivity(intent);
- ManagerReadActivity.this.finish();
+ ManagerReadActivityQHOline.this.finish();
});
} else {
- TipUtil.show(ManagerReadActivity.this, "鏈煡璇㈠埌璇ュ崱淇℃伅锛岃妫�鏌ャ��");
+ TipUtil.show(ManagerReadActivityQHOline.this, "鏈煡璇㈠埌璇ュ崱淇℃伅锛岃妫�鏌ャ��");
}
}
}
--
Gitblit v1.8.0