rfidrig/RFIDtools
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/RFIDtools.git synced 2026-05-12 11:19:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Resource cleanup.

Browse Source
This commit is contained in:
dxl
2020-04-07 12:17:11 +08:00
parent 664c3f6e6e
commit aff9752f0e
16 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app_main/build.gradle
+1 -1
View File
@@ -54,7 +54,7 @@ dependencies {
// This my project maven from github release!
implementation 'com.github.xianglin1998:IORedirector:1.0'
implementation 'com.github.xianglin1998:Crapto1:1.2'
implementation 'com.github.xianglin1998:Crapto1:1.3'
implementation project(':utils')
implementation project(':libnfc_pn53x')
communication/src/main/java/cn/rrg/com/StandardDriver.java → app_main/src/main/java/cn/rrg/rdv/driver/StandardDriver.java
+3 -1
View File
@@ -1,4 +1,4 @@
package cn.rrg.com;
package cn.rrg.rdv.driver;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -10,6 +10,8 @@ import android.util.Log;
import java.io.IOException;
import cn.dxl.mifare.StdMifareIntent;
import cn.rrg.com.DevCallback;
import cn.rrg.com.DriverInterface;
public class StandardDriver implements DriverInterface<String, NfcAdapter> {
app_main/src/main/java/cn/rrg/rdv/models/AbsUsb2UartModel.java
-2
View File
@@ -6,8 +6,6 @@ import android.hardware.usb.UsbManager;
import android.util.Log;
import cn.dxl.common.util.AppUtil;
import cn.rrg.com.ContextCallback;
import cn.rrg.com.ContextHandle;
import cn.rrg.com.DevCallback;
import cn.rrg.com.DriverInterface;
import cn.rrg.com.UsbSerialControl;
app_main/src/main/java/cn/rrg/rdv/models/DriverSource.java
+1 -1
View File
@@ -5,7 +5,7 @@ import android.util.SparseArray;
import cn.rrg.com.DriverInterface;
import cn.rrg.com.SppHasBlock;
import cn.rrg.com.SppNonBlock;
import cn.rrg.com.StandardDriver;
import cn.rrg.rdv.driver.StandardDriver;
import cn.rrg.com.UniversalBulkTransfer;
import cn.rrg.com.UsbAcr122Raw;
import cn.rrg.com.UsbSerialControl;
app_main/src/main/java/cn/rrg/rdv/models/StandardNFCDeviceModel.java
+1 -1
View File
@@ -6,7 +6,7 @@ import android.nfc.NfcAdapter;
import cn.rrg.com.DevCallback;
import cn.rrg.com.DriverInterface;
import cn.rrg.com.StandardDriver;
import cn.rrg.rdv.driver.StandardDriver;
import cn.rrg.com.Device;
import cn.rrg.devices.EmptyDeivce;
import cn.rrg.rdv.javabean.DevBean;
app_main/src/main/res/values-en/arrays.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<item>Slot 5</item>
<item>Slot 6</item>
<item>Slot 7</item>
<item>Slot 9</item>
<item>Slot 8</item>
</string-array>
<!--变色龙支持模式-->
app_main/src/main/res/values/arrays.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<item>Slot 5</item>
<item>Slot 6</item>
<item>Slot 7</item>
<item>Slot 9</item>
<item>Slot 8</item>
</string-array>
<!--变色龙支持模式-->
chameleon/build.gradle
+1 -1
View File
@@ -21,7 +21,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.github.xianglin1998:mfkey:1.0'
implementation 'com.github.xianglin1998:mfkey:1.1'
implementation project(path: ':utils')
implementation 'androidx.appcompat:appcompat:1.1.0'
chameleon/src/main/java/cn/rrg/chameleon/javabean/DetectionDatas.java
+1 -1
View File
@@ -1,6 +1,6 @@
package cn.rrg.chameleon.javabean;
import cn.rrg.mfkey.Nonce32;
import com.dxl.mfkey.Nonce32;
public class DetectionDatas {
//数据对应的UID
chameleon/src/main/java/cn/rrg/chameleon/utils/ChameleonDetection.java
+3 -2
View File
@@ -1,12 +1,13 @@
package cn.rrg.chameleon.utils;
import com.dxl.mfkey.NativeMfKey32;
import com.dxl.mfkey.Nonce32;
import java.util.List;
import cn.dxl.mifare.MifareUtils;
import cn.rrg.chameleon.javabean.ResultBean;
import cn.rrg.chameleon.javabean.DetectionDatas;
import cn.rrg.mfkey.NativeMfKey32;
import cn.rrg.mfkey.Nonce32;
import cn.dxl.common.util.HexUtil;
/**
chameleon/src/main/java/cn/rrg/chameleon/utils/DetectionResult.java
+2 -1
View File
@@ -1,12 +1,13 @@
package cn.rrg.chameleon.utils;
import com.dxl.mfkey.Nonce32;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import cn.dxl.mifare.MifareUtils;
import cn.rrg.chameleon.javabean.DetectionDatas;
import cn.rrg.mfkey.Nonce32;
import cn.dxl.common.util.HexUtil;
/**
communication/src/main/java/cn/dxl/com/Com.java
+25 -2
View File
@@ -1,5 +1,7 @@
package cn.dxl.com;
import android.util.Log;
import java.io.IOException;
import java.io.Serializable;
import java.nio.ByteBuffer;
@@ -57,15 +59,26 @@ public final class Com implements Serializable {
* @return init communication, true is successful or false is error!sss
*/
public static boolean initCom(Communication communication, Device dev) {
if (communication == null) throw new RuntimeException("The communication impl is null.");
if (dev == null) throw new RuntimeException("The device impl is null.");
//初始化通信实现
mCommunication = communication;
//判断端口是否正常初始化
boolean ret = false;
try {
return dev.working();
ret = dev.working();
} catch (IOException e) {
e.printStackTrace();
return false;
}
// open failed, we need
if (!ret) {
try {
dev.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return ret;
}
/**
@@ -75,6 +88,7 @@ public final class Com implements Serializable {
* @throws IOException IOException in write error.
*/
private static int write() throws IOException {
logCommunicationNonnull();
if (mCommunication == null) return -1;
//加上偏移值
//try {
@@ -93,6 +107,7 @@ public final class Com implements Serializable {
* @throws IOException IOException in read error.
*/
private static int read() throws IOException {
logCommunicationNonnull();
if (mCommunication == null) return -1;
//try {
return mCommunication.read(recv_buffer.array(),
@@ -107,6 +122,7 @@ public final class Com implements Serializable {
* flush data, clear buffer!
*/
private static void flush() throws IOException {
logCommunicationNonnull();
if (mCommunication == null) return;
//try {
mCommunication.flush();
@@ -127,6 +143,13 @@ public final class Com implements Serializable {
//}
}
private static void logCommunicationNonnull() {
if (mCommunication == null) {
Log.e("Com", "Error: the communication interface implement cannot null!");
Log.e("Com", "错误: Communication接口的实现不可以为空，否则数据传输将不起作用!");
}
}
/*
* author DXL
* some communication native function
communication/src/main/java/cn/rrg/com/ContextCallback.java
-8
View File
@@ -1,8 +0,0 @@
package cn.rrg.com;
import android.content.Context;
public interface ContextCallback {
//留一个接口进行上下文获取!
Context getContext();
}
communication/src/main/java/cn/rrg/com/ContextHandle.java
-16
View File
@@ -1,16 +0,0 @@
package cn.rrg.com;
import android.content.Context;
public class ContextHandle implements ContextCallback {
private ContextCallback callback;
public void setContextCallback(ContextCallback callback) {
this.callback = callback;
}
@Override
public Context getContext() {
return callback.getContext();
}
}
libnfc_pn53x/src/main/cpp/mfcuk/mfcuk.c
+1
View File
@@ -861,6 +861,7 @@ static bool mfcuk_darkside_select_tag(nfc_device *pnd, int iSleepAtFieldOFF, int
return true;
}
// check nack
static bool
valid_prng_check(nfc_device *pnd, nfc_target_info *target) {
libnfc_pn53x/src/main/java/cn/rrg/natives/MfcukTools.java
+1 -1
View File
@@ -8,7 +8,7 @@ public class MfcukTools implements ICommandTools {
* */
static {
System.loadLibrary("mfcuk");
}
}
@Override
public native int startExecute(String cmd);