From 8c57cb70cc165d21fdda9385966e8ae65d36cc1d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 10 五月 2024 11:39:49 +0800
Subject: [PATCH] 1.修复16进制字符串转byte时的bug
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index b409ef6..bfae435 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -12,6 +12,7 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.MornyUtil;
@@ -253,11 +254,11 @@
) {
binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
- } else if (cardType.equals("-1")) {
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR1)) {
TipUtil.show(NFCWreatActivity.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
- } else if (cardType.equals("-2")) {
- TipUtil.show(NFCWreatActivity.this, "璇诲崱澶辫触,璇锋鏌ュ崱鏄惁鏄敤鎴峰崱");
- } else {
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
+ TipUtil.show(NFCWreatActivity.this, "锛屽崱鐗囨湭鑳借瘑鍒紝璇锋鏌ュ崱鐗囨槸鍚︽槸鏈叕鍙稿崱鐗�");
+ } else {
Log.i("NFCWreatActivity", "olduserCard!=null saveData");
saveData();
}
@@ -640,7 +641,7 @@
//榛樿鏄�1鍏�
userCard.setElectricityPrice(1.000f);
}
- userCard.setSwipeNumber((short) 0);
+ userCard.setSwipeNumber( 0);
userCard.setState("00");
userCard.setBalance(0);
userCard.setAddressCode(adminData.getAddressCode());
--
Gitblit v1.8.0