From 1057af10a464e70d10b8a90315d0ecec6a7cb205 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 04 十二月 2023 11:19:26 +0800
Subject: [PATCH] 注释修改密码 密码现识别为ffffffffffff和010203040506
---
app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java | 3 ++-
app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java | 13 +++++++++----
local.properties | 2 +-
app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java | 1 -
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
index 1a7ec6a..d902320 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
@@ -224,7 +224,6 @@
userFlag = WriteCardUtils.setUser(intent, userCard);
}
if (cleanCard != null) {
- NFCWriteHelper.getInstence(intent).changePasword(1);
setClean(intent, cleanCard);
}
if (manageCard != null) {
diff --git a/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java b/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
index 806ebed..49e1fad 100644
--- a/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
+++ b/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
@@ -20,7 +20,7 @@
*/
public class BaseNFCHelper {
/**
- * 榛樿瀵嗙爜锛堢櫧鍗″瘑鐮侊級
+ * 榛樿瀵嗙爜锛堢櫧鍗″瘑鐮侊級ffffffffffff
*/
public byte[] defauleKey;
@@ -28,14 +28,16 @@
* 鍏徃瀵嗙爜
*/
public byte[] companyKey;
-
+ //瀵嗙爜a鍖�
String companyKeyA;
+ //瀵嗙爜B鍖�
String companyKeyB;
public BaseNFCHelper() {
// 瑙ｅ瘑瀛楃涓�
try {
+ //鍒濆瀵嗙爜
byte[] encryptedBytes = Base64.decode("orDiGzvueQqPpU+VQ3NEzQ==", Base64.DEFAULT);
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
byte[] encodedKey = {-117, -104, -100, 84, 111, -102, -29, -21, 72, -82, -105, 123, 77, 79, 17, -55, -102, -28, 50, 23, 67, 98, 0, -96, -10, -48, -60, 81, 113, 80, -32, -26};
@@ -43,16 +45,19 @@
byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
String decryptedText = new String(decryptedBytes, StandardCharsets.UTF_8);
defauleKey = HexUtil.hexToByteArray(decryptedText);
-
- byte[] encryptedBytes2 = Base64.decode("aYC9feYEOFOQHuzflLIXSw==", Base64.DEFAULT);
+ //鍒濆瀵嗙爜
+// byte[] encryptedBytes2 = Base64.decode("aYC9feYEOFOQHuzflLIXSw==", Base64.DEFAULT);
+ byte[] encryptedBytes2 = Base64.decode("qeg4DUWf0ni9JfRWtD2krA==", Base64.DEFAULT);
byte[] decryptedBytes2 = cipher.doFinal(encryptedBytes2);
companyKeyA = new String(decryptedBytes2, StandardCharsets.UTF_8);
companyKey = HexUtil.hexToByteArray(companyKeyA);
+ //淇敼鍚庣殑瀵嗙爜
byte[] encryptedBytes3 = Base64.decode("n+SSZFb4DHsreVav/Z5ftg==", Base64.DEFAULT);
byte[] decryptedBytes3 = cipher.doFinal(encryptedBytes3);
companyKeyB = new String(decryptedBytes3, StandardCharsets.UTF_8);
+
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
} catch (NoSuchPaddingException e) {
diff --git a/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java b/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
index 1dc2d29..120c3eb 100644
--- a/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
+++ b/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
@@ -75,7 +75,7 @@
public boolean writeData(byte[] str, int a, int b) {
Log.i("NFCWreatActivity", "writeData: a=" + a + " b=" + b);
//鍐欏崱鏃朵慨鏀规墍鏈夊瘑鐮�
- changePasword(a);
+// changePasword(a);
if (str.length <= 16) {
try {
MifareClassic mfc = MifareClassic.get(tag);
@@ -142,6 +142,7 @@
int count = mfc.getSectorCount();
boolean isOpen = mfc.authenticateSectorWithKeyA(a, defauleKey);
+
//楠岃瘉鏄惁鏄粯璁ゅ瘑鐮侊紝褰撻粯璁ゅ瘑鐮佹椂淇敼瀵嗙爜
if (isOpen) {
//灏嗗瘑鐮佽浆鎹负keyA
diff --git a/local.properties b/local.properties
index f059514..90aa526 100644
--- a/local.properties
+++ b/local.properties
@@ -5,4 +5,4 @@
# For customization when using a Version Control System, please read the
# header note.
#Sat Nov 11 20:12:34 CST 2023
-sdk.dir=D\:\\AndroidStudio\\sdk
+sdk.dir=D\:\\sdk
--
Gitblit v1.8.0