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/NFCWreatActivityQHOline.java | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivityQHOline.java
similarity index 90%
rename from qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
rename to qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivityQHOline.java
index 47a4ea5..702a753 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivityQHOline.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();
});
}
}
--
Gitblit v1.8.0