From 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 07 五月 2024 11:04:45 +0800
Subject: [PATCH] 1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 88 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
similarity index 85%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
index 2d1e1a1..59d571b 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -1,6 +1,7 @@
package com.dayu.qihealonelibrary.activity;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -8,6 +9,7 @@
import android.widget.Toast;
import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qihealonelibrary.QHAloneApplication;
@@ -36,7 +38,7 @@
* Date: 2023-11-08 21:19
* Description: nfc鍐欏崱鐣岄潰
*/
-public class NFCWreatActivityQHAlone extends BaseNfcActivityQHAlone {
+public class NFCWreatActivity extends BaseNfcActivity {
boolean cleanFlag = false;
@@ -77,7 +79,7 @@
//鎵撳嵃
QHAloneApplication baseApp;
- public static NFCWreatActivityQHAlone nfcWreatActivity;
+ public static NFCWreatActivity nfcWreatActivity;
/**
* 鏄惁鏄敤鎴峰崱锛屽亣濡傛槸鐢ㄦ埛鍗＄殑璇濋渶瑕佹娴嬪崱鐗囨槸鍚﹀凡缁忓紑杩囨埛锛屽亣濡傚凡寮�鎴峰垯鎶ラ敊涓嶈兘鍐嶅啓鍗�
*/
@@ -85,9 +87,11 @@
//鏄惁鏄厖鍊艰繃绋�
boolean isRecharge = false;
- //鍏呭�奸�氫俊鏄惁瀹屾垚
- boolean rechargeIsOk = false;
+
ActivityWriteTextQhaBinding binding;
+
+ //褰撳墠鍗＄殑鐗╃悊鍗″彿
+ String cardNumber;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -173,19 +177,33 @@
*/
private void checkHasUser() {
- String cardType = NfcReadHelper.getInstence(intent, this).getCradType();
- Log.i("NFCWreatActivity", "cardType=" + cardType);
- if (cardType.equals(CardCommon.USER_CARD_TYPE_1) ||
- cardType.equals(CardCommon.USER_CARD_TYPE_2) ||
- cardType.equals(CardCommon.USER_CARD_TYPE_3)
- ) {
- binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
- binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
- } else if (cardType.equals("-1")) {
- TipUtil.show(NFCWreatActivityQHAlone.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
- } else {
- Log.i("NFCWreatActivity", "olduserCard!=null saveData");
- saveData();
+ try {
+ String cardType = NfcReadHelper.getInstence(intent, this).getCradTypeAndCardNumber();
+
+ String[] cardTypes = cardType.split(",");
+ if (cardTypes != null && cardTypes.length == 2) {
+ cardNumber = cardType.split(",")[0];
+ cardType = cardType.split(",")[1];
+ }
+ Log.i("NFCWreatActivity", "cardType=" + cardType);
+ if (cardType.equals(CardCommon.USER_CARD_TYPE_1) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_2) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_3)
+ ) {
+ 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, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
+ TipUtil.show(NFCWreatActivity.this, "鍗＄墖鏈兘璇嗗埆锛岃妫�鏌ュ崱鐗囨槸鍚︽槸鏈叕鍙稿崱鐗�");
+ } else {
+ Log.i("NFCWreatActivity", "olduserCard!=null saveData");
+ userCardBean.setCardNumber(cardNumber);
+ baseDao.userCardDao().insert(userCardBean);
+ saveData();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
stopAnim();
@@ -201,7 +219,6 @@
|| configureDeviceRegistrationCrad != null
|| configurationPowerCard != null) {
if (userCard != null && TextUtils.isEmpty(morny)) {
-
userFlag = WriteCardUtils.setUser(intent, userCard, this);
}
if (cleanCard != null) {
@@ -234,9 +251,9 @@
//鐢ㄦ埛鍗�
startDetailActivity(userCardBean.getUserName(), "鍚敤");
} else if (!TextUtils.isEmpty(morny)) {
- TipUtil.show(NFCWreatActivityQHAlone.this, "鍏呭�兼垚鍔�", () -> NFCWreatActivityQHAlone.this.finish());
+ TipUtil.show(NFCWreatActivity.this, "鍏呭�兼垚鍔�", () -> NFCWreatActivity.this.finish());
} else {
- TipUtil.show(NFCWreatActivityQHAlone.this, "鍐欏崱鎴愬姛", () -> NFCWreatActivityQHAlone.this.finish());
+ TipUtil.show(NFCWreatActivity.this, "鍐欏崱鎴愬姛", () -> NFCWreatActivity.this.finish());
}
} catch (Exception e) {
@@ -244,7 +261,7 @@
CrashReport.postCatchedException(e);
}
} else {
- TipUtil.show(NFCWreatActivityQHAlone.this, "鍐欏崱澶辫触");
+ TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触");
}
stopAnim();
} else if (userCard == null && userCardBean != null) {
@@ -268,15 +285,13 @@
startAnim();
Log.i("NFCWreatActivity", "isUser:" + isUser);
if (isUser) {
+ //鏂板崱娉ㄥ唽閫昏緫
checkHasUser();
} else if (isRecharge) {
- if (rechargeIsOk) {
- rechargeWrratCard();
- } else {
- Toast.makeText(this, "姝ｅ湪閫氫俊璇风◢鍚�", Toast.LENGTH_SHORT).show();
- }
-
+ //鍏呭�奸�昏緫
+ rechargeWrratCard();
} else {
+ //鍏朵粬绠＄悊鍗￠�昏緫
saveData();
}
} catch (Exception e) {
@@ -312,7 +327,7 @@
AidlUtil.getInstance().printText(data.toString(), size, true, false);
AidlUtil.getInstance().print3Line();
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace();
}
} catch (Exception e) {
@@ -330,7 +345,6 @@
binding.avi.hide();
// or avi.smoothToHide();
}
-
//寰�鍗″唴鍐欏厖鍊煎悗鐨勬暟鎹�
@@ -434,23 +448,25 @@
private void startDetailActivity(String userName, String statu) {
- Intent detail = new Intent(this, RechargeDetail.class);
+ Intent detail = new Intent(this, RechargeDetailActivity.class);
detail.putExtra("userName", userName);
detail.putExtra("statu", statu);
detail.putExtra("userCard", userCard);
if (!TextUtils.isEmpty(morny)) {
detail.putExtra("morny", morny);
}
+ if (!TextUtils.isEmpty(cardNumber)) {
+ detail.putExtra("cardNumber", cardNumber);
+ }
startActivity(detail);
- if (NewCardActivityQHAlone.newCardActivity != null) {
- NewCardActivityQHAlone.newCardActivity.finish();
+ if (NewCardActivity.newCardActivity != null) {
+ NewCardActivity.newCardActivity.finish();
}
- if (RechargeActivityQHAlone.rechargeActivity != null) {
- RechargeActivityQHAlone.rechargeActivity.finish();
+ if (RechargeActivity.rechargeActivity != null) {
+ RechargeActivity.rechargeActivity.finish();
}
- NFCWreatActivityQHAlone.nfcWreatActivity.finish();
+ NFCWreatActivity.nfcWreatActivity.finish();
}
-
protected void onDestroy() {
--
Gitblit v1.8.0