From c1e964b330bf9ebff290ce993a55328ec63a8ab3 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 26 二月 2024 11:32:11 +0800
Subject: [PATCH] 开启修改密码
---
app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java | 9 +++++++--
app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java | 5 +++--
app/src/main/java/com/dayu/recharge/activity/BaseActivity.java | 4 ++++
app/src/androidTest/java/com/dayu/recharge/ExampleInstrumentedTest.java | 32 ++++++++++++++++----------------
app/build.gradle | 4 ++--
5 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index be4093b..390c27d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@
applicationId "com.dayu.recharge"
minSdk 23
targetSdk 26
- versionCode 1
- versionName "1.0"
+ versionCode 14
+ versionName "1.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/androidTest/java/com/dayu/recharge/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/dayu/recharge/ExampleInstrumentedTest.java
index dbe2ace..e8e504d 100644
--- a/app/src/androidTest/java/com/dayu/recharge/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/dayu/recharge/ExampleInstrumentedTest.java
@@ -2,25 +2,25 @@
import android.content.Context;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
+//import androidx.test.platform.app.InstrumentationRegistry;
+//import androidx.test.ext.junit.runners.AndroidJUnit4;
+//
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//
+//import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
- assertEquals("com.dayu.recharge", appContext.getPackageName());
- }
-}
\ No newline at end of file
+//@RunWith(AndroidJUnit4.class)
+//public class ExampleInstrumentedTest {
+// @Test
+// public void useAppContext() {
+// // Context of the app under test.
+// Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+// assertEquals("com.dayu.recharge", appContext.getPackageName());
+// }
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java b/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
index c7158e9..6247fed 100644
--- a/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
@@ -6,6 +6,7 @@
import android.content.pm.PackageManager;
import android.content.pm.Signature;
import android.os.Bundle;
+import android.util.Log;
import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
@@ -21,6 +22,7 @@
*/
public class BaseActivity extends AppCompatActivity {
+ private final String TAG = "BaseActivity";
public TitleBar titleBar = null;
//z涓荤嚎绋嬫煡璇�
@@ -34,7 +36,9 @@
super.onCreate(savedInstanceState);
baseDao = BaseDaoSingleton.getInstance(this);
asynchBaseDao = BaseDaoSingleton.getAsynchInstance(this);
+ Log.i(TAG, SIGN);
if (!isMyApp()) {
+ Log.i(TAG, "isMyApp");
this.finish();
}
}
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 71145f1..342e41b 100644
--- a/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
+++ b/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
@@ -58,14 +58,15 @@
// byte[] encryptedBytes2 = Base64.decode("aYC9feYEOFOQHuzflLIXSw==", Base64.DEFAULT);
byte[] encryptedBytes2 = Base64.decode("qeg4DUWf0ni9JfRWtD2krA==", Base64.DEFAULT);
byte[] decryptedBytes2 = cipher.doFinal(encryptedBytes2);
+ //decryptedBytes2 瀵瑰簲010203040506
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);
+ //decryptedBytes3 瀵瑰簲202311202048
+ companyKeyB = new String(decryptedBytes2, StandardCharsets.UTF_8);
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
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 a395c28..16a3046 100644
--- a/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
+++ b/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
@@ -66,7 +66,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,7 +142,7 @@
data[i] = dataA[i];
}
//杈撳叆鎺у埗浣�
- data[6] = (byte) 0xff;
+ data[6] = (byte) 0xFF;
data[7] = (byte) 0x07;
data[8] = (byte) 0x80;
data[9] = (byte) 0x69;
@@ -155,6 +155,11 @@
int bCount = mfc.getBlockCountInSector(a);
//鍐欏埌鎵囧尯鐨勬渶鍚庝竴涓潡
mfc.writeBlock(bIndex + bCount - 1, data);
+// byte[] dataa = mfc.readBlock(bIndex + bCount - 1);
+// // 淇敼瀵嗙爜 A
+// mfc.writeBlock(mfc.sectorToBlock(a) + 3, dataA);
+// // 淇敼瀵嗙爜 B
+// mfc.writeBlock(mfc.sectorToBlock(a) + 7, dataB);
}
return true;
} catch (Exception e) {
--
Gitblit v1.8.0