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/RechargeActivityQHOline.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivityQHOline.java
similarity index 88%
rename from qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
rename to qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivityQHOline.java
index 967de28..5da9dc6 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivityQHOline.java
@@ -16,7 +16,6 @@
import com.dayu.qiheonlinelibrary.R;
import com.dayu.qiheonlinelibrary.bean.CardInfoResult;
import com.dayu.qiheonlinelibrary.bean.RechargeResult;
-import com.dayu.qiheonlinelibrary.card.UserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityRechargeQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
@@ -37,12 +36,12 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�肩晫闈�
*/
-public class RechargeActivity extends BaseNfcActivity {
+public class RechargeActivityQHOline extends QHOlineBaseNfcActivity {
Intent intent;
ActivityRechargeQhlBinding binding;
- public static RechargeActivity rechargeActivity;
+ public static RechargeActivityQHOline rechargeActivity;
String cardNumber = null;//瀹炰綋鍗″彿
@@ -71,7 +70,10 @@
}
}
- public void onNewIntent(Intent intent) {
+
+
+ @Override
+ public void onNfcBack(Intent intent) {
this.intent = intent;
try {
readAllData();
@@ -79,7 +81,6 @@
e.printStackTrace();
CrashReport.postCatchedException(e);
}
- super.onNewIntent(intent);
}
@@ -117,7 +118,7 @@
binding.redStatu.setTextColor(this.getResources().getColor(R.color.black));
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
setCardState("鏈埛鍗″叧娉�,褰撳墠涓嶅彲鍏呭��");
- TipUtil.show(RechargeActivity.this, "鏈埛鍗″叧娉�,褰撳墠涓嶅彲鍏呭��");
+ TipUtil.show(RechargeActivityQHOline.this, "鏈埛鍗″叧娉�,褰撳墠涓嶅彲鍏呭��");
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
setCardState("鍙犲姞鍏呭��");
} else {
@@ -160,7 +161,7 @@
if (!TextUtils.isEmpty(morny)) {
rechaege(morny);
} else {
- TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰�");
+ TipUtil.show(RechargeActivityQHOline.this, "璇疯緭鍏ュ厖鍊奸噾棰�");
}
});
}
@@ -231,7 +232,7 @@
int deductionMorny = MornyUtil.changeY2F(morny) + userCard.getBalance() - MornyUtil.changeY2F(balance);
if (MornyUtil.changeY2F(morny) < deductionMorny) {
- TipUtil.show(RechargeActivity.this, "褰撳墠鍏呭�奸噾棰濆皬浜庤ˉ鎵ｉ噾棰濓紝琛ユ墸閲戦涓�" + MornyUtil.changeF2Y(deductionMorny) + "鍏冿紝鍏呭�奸噾棰濆簲澶т簬琛ユ墸閲戦锛�");
+ TipUtil.show(RechargeActivityQHOline.this, "褰撳墠鍏呭�奸噾棰濆皬浜庤ˉ鎵ｉ噾棰濓紝琛ユ墸閲戦涓�" + MornyUtil.changeF2Y(deductionMorny) + "鍏冿紝鍏呭�奸噾棰濆簲澶т簬琛ユ墸閲戦锛�");
return;
}
@@ -268,16 +269,16 @@
userCard.setRechargeDate(calendar);
userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
if (deductionMorny == 0) {
- Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(RechargeActivityQHOline.this, NFCWreatActivityQHOline.class);
intent.putExtra("morny", morny);
intent.putExtra("userCard", userCard);
intent.putExtra("rechargeBean", rechargeBean);
startActivity(intent);
} else {
- TipUtil.show(RechargeActivity.this, "鎸傚け鍗″悗鏈夎ˉ浜ら噾棰濓紒琛ヤ氦閲戦涓猴細" + MornyUtil.changeF2Y(deductionMorny) + "鍏冿紝璇︽儏鍙湪骞冲彴鏌ヨ銆�", new TipUtil.TipListener() {
+ TipUtil.show(RechargeActivityQHOline.this, "鎸傚け鍗″悗鏈夎ˉ浜ら噾棰濓紒琛ヤ氦閲戦涓猴細" + MornyUtil.changeF2Y(deductionMorny) + "鍏冿紝璇︽儏鍙湪骞冲彴鏌ヨ銆�", new TipUtil.TipListener() {
@Override
public void onCancle() {
- Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(RechargeActivityQHOline.this, NFCWreatActivityQHOline.class);
intent.putExtra("morny", morny);
intent.putExtra("userCard", userCard);
intent.putExtra("rechargeBean", rechargeBean);
@@ -316,10 +317,10 @@
RechargeResult rechargeResult = t.getData();
startNfcActivity(morny, rechargeResult.getIccardBalanceMoney(), rechargeResult.getRechargeElectricAmount(), rechargeResult.getIccardBalanceElectric(), rechargeResult.getTotalRechargeMoney(), rechargeResult.getIccardRechargeRecordId());
} else {
- TipUtil.show(RechargeActivity.this, "鍏呭�煎け璐ヨ閲嶈瘯锛�");
+ TipUtil.show(RechargeActivityQHOline.this, "鍏呭�煎け璐ヨ閲嶈瘯锛�");
}
} else {
- TipUtil.show(RechargeActivity.this, t.getMsg());
+ TipUtil.show(RechargeActivityQHOline.this, t.getMsg());
}
}
});
@@ -350,22 +351,22 @@
cardInfoResult = t.getData();
setUserData(cardNumber, cardInfoResult.getPeasantName(), cardInfoResult.getLastRechargeTime());
} else {
- TipUtil.show(RechargeActivity.this, "璇诲彇鍗＄墖澶辫触锛岃閲嶆柊璐村崱");
+ TipUtil.show(RechargeActivityQHOline.this, "璇诲彇鍗＄墖澶辫触锛岃閲嶆柊璐村崱");
}
} else {
- TipUtil.show(RechargeActivity.this, "鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ TipUtil.show(RechargeActivityQHOline.this, "鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
}
} else if (t.getData().getIccardStatus() == 1) {
- TipUtil.show(RechargeActivity.this, "褰撳墠鍗″凡娉ㄩ攢");
+ TipUtil.show(RechargeActivityQHOline.this, "褰撳墠鍗″凡娉ㄩ攢");
} else {
- TipUtil.show(RechargeActivity.this, "褰撳墠鍗″凡鎸傚け");
+ TipUtil.show(RechargeActivityQHOline.this, "褰撳墠鍗″凡鎸傚け");
}
} else {
- TipUtil.show(RechargeActivity.this, "褰撳墠鍗＄墖閿欒锛屾湭鑳芥煡鍒拌鍗′俊鎭紒");
+ TipUtil.show(RechargeActivityQHOline.this, "褰撳墠鍗＄墖閿欒锛屾湭鑳芥煡鍒拌鍗′俊鎭紒");
}
} else {
- TipUtil.show(RechargeActivity.this, t.getMsg());
+ TipUtil.show(RechargeActivityQHOline.this, t.getMsg());
}
}
});
@@ -375,7 +376,7 @@
private void setCardState(String state) {
binding.rechargeLL.setVisibility(View.GONE);
binding.rechargeRegistBtn.setVisibility(View.GONE);
- binding.redStatu.setTextColor(RechargeActivity.this.getResources().getColor(com.dayu.baselibrary.R.color.red));
+ binding.redStatu.setTextColor(RechargeActivityQHOline.this.getResources().getColor(com.dayu.baselibrary.R.color.red));
binding.redStatu.setText(state);
}
--
Gitblit v1.8.0