From feb7add1979c830e0d940286242a7c489f2f8f96 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 27 九月 2024 09:23:34 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
similarity index 92%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
index 52e0d04..4306e84 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.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();
}
--
Gitblit v1.8.0