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

Communication rebuild finished.

Browse Source
This commit is contained in:
dxl
2020-04-17 18:14:57 +08:00
parent 7d94d3f9e8
commit 477c07514b
49 changed files with 94 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app_main/build.gradle
+1
View File
@@ -56,6 +56,7 @@ dependencies {
implementation 'com.github.xianglin1998:IORedirector:1.0'
implementation 'com.github.xianglin1998:Crapto1:1.3'
implementation 'com.github.xianglin1998:nfctag:1.0'
implementation 'com.github.xianglin1998:ComBridge:1.0'
implementation 'com.github.xianglin1998:nfc_console:1.0'
implementation project(':utils')
app_main/src/main/java/cn/rrg/rdv/activities/chameleon/ChameleonGUIActivity.java
+1 -1
View File
@@ -18,6 +18,7 @@ import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView;
import com.iobridges.com.Communication;
import com.proxgrind.xmodem.XModem128;
import java.io.ByteArrayInputStream;
@@ -46,7 +47,6 @@ import cn.rrg.chameleon.defined.ResultCallback;
import cn.rrg.rdv.activities.main.BaseActivity;
import cn.rrg.rdv.activities.tools.ChameleonSoltAliasesActivity;
import cn.rrg.rdv.application.Properties;
import cn.dxl.com.Communication;
import cn.rrg.rdv.R;
import cn.rrg.rdv.callback.DumpCallback;
import cn.rrg.rdv.models.DumpModel;
app_main/src/main/java/cn/rrg/rdv/activities/main/AppMain.java
+1 -1
View File
@@ -9,8 +9,8 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.iobridges.com.LocalComBridgeAdapter;
import cn.dxl.com.LocalComBridgeAdapter;
import cn.dxl.common.util.DisplayUtil;
import cn.dxl.common.util.FragmentUtil;
import cn.dxl.common.util.LogUtils;
app_main/src/main/java/cn/rrg/rdv/activities/main/PM3FlasherMainActivity.java
+3 -3
View File
@@ -8,13 +8,13 @@ import android.widget.Button;
import androidx.annotation.Nullable;
import com.iobridges.com.LocalComBridgeAdapter;
import com.proxgrind.pm3flasher.Proxmark3Flasher;
import com.proxgrind.pm3flasher.Target;
import cn.dxl.com.LocalComBridgeAdapter;
import cn.dxl.common.widget.ToastUtil;
import cn.rrg.com.DevCallback;
import cn.rrg.com.UsbSerialControl;
import cn.proxgrind.com.DevCallback;
import cn.proxgrind.com.UsbSerialControl;
import cn.rrg.rdv.R;
import cn.rrg.rdv.util.Paths;
app_main/src/main/java/cn/rrg/rdv/activities/main/PN53XNfcMain.java
+2 -2
View File
@@ -9,8 +9,8 @@ import android.widget.Button;
import androidx.annotation.Nullable;
import cn.dxl.com.LocalComBridgeAdapter;
import cn.rrg.devices.PN53X;
import com.iobridges.com.LocalComBridgeAdapter;
import cn.rrg.rdv.R;
import cn.rrg.rdv.activities.px53x.HardnestedConsoleActivity;
import cn.rrg.rdv.activities.px53x.MfcukConsoleActivity;
app_main/src/main/java/cn/rrg/rdv/driver/StandardDriver.java
+2 -3
View File
@@ -8,14 +8,13 @@ import android.content.IntentFilter;
import android.nfc.NfcAdapter;
import android.util.Log;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import cn.dxl.common.util.AppUtil;
import cn.dxl.mifare.StdMifareIntent;
import cn.rrg.com.DevCallback;
import cn.rrg.com.DriverInterface;
import cn.proxgrind.com.DevCallback;
import cn.proxgrind.com.DriverInterface;
public class StandardDriver implements DriverInterface<String, NfcAdapter> {
app_main/src/main/java/cn/rrg/rdv/fragment/connect/DeviceConnectNewFragment.java
+1 -2
View File
@@ -3,8 +3,7 @@ package cn.rrg.rdv.fragment.connect;
import java.util.ArrayList;
import java.util.List;
import cn.rrg.com.DevCallback;
import cn.rrg.rdv.R;
import cn.proxgrind.com.DevCallback;
import cn.rrg.rdv.javabean.DevBean;
import cn.rrg.rdv.models.AbstractDeviceModel;
import cn.rrg.rdv.presenter.DeviceAttachPresenter;
app_main/src/main/java/cn/rrg/rdv/models/AbsUsb2UartModel.java
+3 -3
View File
@@ -6,9 +6,9 @@ import android.hardware.usb.UsbManager;
import android.util.Log;
import cn.dxl.common.util.AppUtil;
import cn.rrg.com.DevCallback;
import cn.rrg.com.DriverInterface;
import cn.rrg.com.UsbSerialControl;
import cn.proxgrind.com.DevCallback;
import cn.proxgrind.com.DriverInterface;
import cn.proxgrind.com.UsbSerialControl;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.javabean.DevBean;
import cn.rrg.rdv.util.Commons;
app_main/src/main/java/cn/rrg/rdv/models/AbstractDeviceModel.java
+4 -3
View File
@@ -3,6 +3,8 @@ package cn.rrg.rdv.models;
import android.content.Context;
import android.util.Log;
import com.iobridges.com.DeviceChecker;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
@@ -10,10 +12,9 @@ import java.util.List;
import cn.dxl.common.util.IOUtils;
import cn.dxl.common.util.LogUtils;
import cn.rrg.com.DevCallback;
import cn.rrg.com.DriverInterface;
import cn.proxgrind.com.DevCallback;
import cn.proxgrind.com.DriverInterface;
import cn.dxl.com.DeviceChecker;
import cn.rrg.rdv.javabean.DevBean;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.callback.InitNfcCallback;
app_main/src/main/java/cn/rrg/rdv/models/AbstractSppDeviceModel.java
+1 -1
View File
@@ -5,7 +5,7 @@ import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.util.Log;
import cn.rrg.com.DevCallback;
import cn.proxgrind.com.DevCallback;
import cn.rrg.rdv.javabean.DevBean;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.util.Commons;
app_main/src/main/java/cn/rrg/rdv/models/Acr122uUsbRawModel.java
+5 -4
View File
@@ -5,11 +5,12 @@ import android.content.Intent;
import android.hardware.usb.UsbManager;
import android.util.Log;
import com.iobridges.com.DeviceChecker;
import cn.dxl.common.util.AppUtil;
import cn.rrg.com.DevCallback;
import cn.dxl.com.DeviceChecker;
import cn.rrg.com.DriverInterface;
import cn.rrg.com.UsbAcr122Raw;
import cn.proxgrind.com.DevCallback;
import cn.proxgrind.com.DriverInterface;
import cn.proxgrind.com.UsbAcr122Raw;
import cn.rrg.devices.PN53X;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.javabean.DevBean;
app_main/src/main/java/cn/rrg/rdv/models/ChameleonUsb2UartModel.java
+3 -2
View File
@@ -2,11 +2,12 @@ package cn.rrg.rdv.models;
import android.util.Log;
import com.iobridges.com.DeviceChecker;
import cn.rrg.chameleon.defined.IChameleonExecutor;
import cn.rrg.chameleon.executor.ChameleonExecutor;
import cn.rrg.chameleon.executor.ExecutorImpl;
import cn.dxl.com.DeviceChecker;
import cn.rrg.devices.EmptyDeivce;
import cn.proxgrind.devices.EmptyDeivce;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.callback.InitNfcCallback;
import cn.rrg.rdv.util.Commons;
app_main/src/main/java/cn/rrg/rdv/models/PN532SppUartModel.java
+4 -3
View File
@@ -3,9 +3,10 @@ package cn.rrg.rdv.models;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import cn.rrg.com.DriverInterface;
import cn.dxl.com.DeviceChecker;
import cn.rrg.com.SppHasBlock;
import com.iobridges.com.DeviceChecker;
import cn.proxgrind.com.DriverInterface;
import cn.proxgrind.com.SppHasBlock;
import cn.rrg.devices.PN53X;
/*
app_main/src/main/java/cn/rrg/rdv/models/PN532Usb2UartModel.java
+2 -1
View File
@@ -1,6 +1,7 @@
package cn.rrg.rdv.models;
import cn.dxl.com.DeviceChecker;
import com.iobridges.com.DeviceChecker;
import cn.rrg.devices.PN53X;
public class PN532Usb2UartModel extends AbsUsb2UartModel {
app_main/src/main/java/cn/rrg/rdv/models/Proxmark3Rdv4SppModel.java
+4 -3
View File
@@ -3,9 +3,10 @@ package cn.rrg.rdv.models;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import cn.rrg.com.DriverInterface;
import cn.dxl.com.DeviceChecker;
import cn.rrg.com.SppNonBlock;
import com.iobridges.com.DeviceChecker;
import cn.proxgrind.com.DriverInterface;
import cn.proxgrind.com.SppNonBlock;
import cn.rrg.devices.Proxmark3RRGRdv4;
/*
app_main/src/main/java/cn/rrg/rdv/models/Proxmark3Rdv4UsbModel.java
+2 -1
View File
@@ -1,6 +1,7 @@
package cn.rrg.rdv.models;
import cn.dxl.com.DeviceChecker;
import com.iobridges.com.DeviceChecker;
import cn.rrg.devices.Proxmark3RRGRdv4;
public class Proxmark3Rdv4UsbModel extends AbsUsb2UartModel {
app_main/src/main/java/cn/rrg/rdv/models/StandardNFCDeviceModel.java
+5 -4
View File
@@ -4,11 +4,12 @@ import android.content.Context;
import android.content.Intent;
import android.nfc.NfcAdapter;
import cn.rrg.com.DevCallback;
import cn.rrg.com.DriverInterface;
import com.iobridges.com.DeviceChecker;
import cn.proxgrind.com.DevCallback;
import cn.proxgrind.com.DriverInterface;
import cn.rrg.rdv.driver.StandardDriver;
import cn.dxl.com.DeviceChecker;
import cn.rrg.devices.EmptyDeivce;
import cn.proxgrind.devices.EmptyDeivce;
import cn.rrg.rdv.javabean.DevBean;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.callback.InitNfcCallback;
app_main/src/main/java/cn/rrg/rdv/models/UniversalBulkPN53XRawModel.java
+5 -4
View File
@@ -5,11 +5,12 @@ import android.content.Intent;
import android.hardware.usb.UsbManager;
import android.util.Log;
import com.iobridges.com.DeviceChecker;
import cn.dxl.common.util.AppUtil;
import cn.rrg.com.DevCallback;
import cn.dxl.com.DeviceChecker;
import cn.rrg.com.DriverInterface;
import cn.rrg.com.UsbBulkTransfer;
import cn.proxgrind.com.DevCallback;
import cn.proxgrind.com.DriverInterface;
import cn.proxgrind.com.UsbBulkTransfer;
import cn.rrg.devices.PN53X;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.javabean.DevBean;
app_main/src/main/java/cn/rrg/rdv/presenter/DeviceAttachPresenter.java
+1 -3
View File
@@ -1,8 +1,6 @@
package cn.rrg.rdv.presenter;
import android.content.Context;
import cn.rrg.com.DevCallback;
import cn.proxgrind.com.DevCallback;
import cn.rrg.rdv.javabean.DevBean;
import cn.rrg.rdv.models.AbstractDeviceModel;
import cn.rrg.rdv.view.DeviceAttachView;
app_main/src/main/java/cn/rrg/rdv/presenter/DevicePresenter.java
+1 -1
View File
@@ -2,7 +2,7 @@ package cn.rrg.rdv.presenter;
import android.content.Context;
import cn.rrg.com.DevCallback;
import cn.proxgrind.com.DevCallback;
import cn.rrg.rdv.javabean.DevBean;
import cn.rrg.rdv.callback.ConnectCallback;
import cn.rrg.rdv.callback.InitNfcCallback;

Some files were not shown because too many files have changed in this diff Show More