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

Merge pull request #7 from RfidResearchGroup/master

Browse Source 
Removed module "mfkey" to maven(gitpack.io)
This commit is contained in:
DXL
2020-04-06 23:54:50 +08:00
committed by GitHub
parent e2d9e47575 01f4f0eed0
commit 664c3f6e6e
8 changed files with 2 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app_main/build.gradle
-1
View File
@@ -57,7 +57,6 @@ dependencies {
implementation 'com.github.xianglin1998:Crapto1:1.2'
implementation project(':utils')
implementation project(':mfkey_32_64')
implementation project(':libnfc_pn53x')
implementation project(':console')
implementation project(':chameleon')
app_main/src/main/AndroidManifest.xml
-8
View File
@@ -60,14 +60,6 @@
<activity android:name=".activities.px53x.NfcListConsoleActivity" />
<activity android:name=".activities.px53x.HardnestedConsoleActivity" />
<activity
android:name=".activities.tools.MfKey32ConsoleActivity"
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout" />
<activity
android:name=".activities.tools.MfKey64ConsoleActivity"
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout" />
<activity
android:name=".activities.proxmark3.rdv4_rrg.Proxmark3Rdv4RRGConsoleActivity"
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout" />
app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey32ConsoleActivity.java
-11
View File
@@ -1,11 +0,0 @@
package cn.rrg.rdv.activities.tools;
import cn.rrg.console.define.ICommandTools;
import cn.rrg.mfkey.NativeMfKey;
public class MfKey32ConsoleActivity extends CommonConsoleActivity {
@Override
protected ICommandTools initCMD() {
return new NativeMfKey(false);
}
}
app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey64ConsoleActivity.java
-11
View File
@@ -1,11 +0,0 @@
package cn.rrg.rdv.activities.tools;
import cn.rrg.console.define.ICommandTools;
import cn.rrg.mfkey.NativeMfKey;
public class MfKey64ConsoleActivity extends CommonConsoleActivity {
@Override
protected ICommandTools initCMD() {
return new NativeMfKey(true);
}
}
app_main/src/main/java/cn/rrg/rdv/fragment/tools/ToolsAccessFragment.java
-16
View File
@@ -13,15 +13,11 @@ import android.view.ViewGroup;
import android.widget.Button;
import cn.rrg.rdv.R;
import cn.rrg.rdv.activities.tools.DumpEditActivity;
import cn.rrg.rdv.activities.tools.DumpEqualActivity;
import cn.rrg.rdv.activities.tools.DumpListActivity;
import cn.rrg.rdv.activities.tools.FileListActivity;
import cn.rrg.rdv.activities.tools.FormatCovertActivity;
import cn.rrg.rdv.activities.tools.KeyFileEditActivity;
import cn.rrg.rdv.activities.tools.KeyFileListActivity;
import cn.rrg.rdv.activities.tools.MfKey32ConsoleActivity;
import cn.rrg.rdv.activities.tools.MfKey64ConsoleActivity;
import cn.rrg.rdv.fragment.base.BaseFragment;
public class ToolsAccessFragment
@@ -29,11 +25,8 @@ public class ToolsAccessFragment
private Button btnDataEditor = null;
private Button btnKeyEditor = null;
private Button btnUnionKeyEditor = null;
private Button btnFormatCovert = null;
private Button btnDiffTools = null;
private Button btnMfKey32 = null;
private Button btnMfKey64 = null;
@Nullable
@Override
@@ -52,20 +45,11 @@ public class ToolsAccessFragment
private void initViews(View view) {
btnDataEditor = view.findViewById(R.id.btnDumpEditor);
btnKeyEditor = view.findViewById(R.id.btnKeyEditor);
btnUnionKeyEditor = view.findViewById(R.id.btnUnionKeyEditor);
btnFormatCovert = view.findViewById(R.id.btnConvertFormat);
btnDiffTools = view.findViewById(R.id.btnDiffTool);
btnMfKey32 = view.findViewById(R.id.btnMfKey32);
btnMfKey64 = view.findViewById(R.id.btnMfKey64);
}
private void initActions(Context context) {
//mfkey32工具的跳转!
btnMfKey32.setOnClickListener(v -> startActivity(new Intent(context, MfKey32ConsoleActivity.class)));
//mfkey64工具的跳转!
btnMfKey64.setOnClickListener(v -> startActivity(new Intent(context, MfKey64ConsoleActivity.class)));
//设置数据编辑的按钮的接口实现
btnDataEditor.setOnClickListener(v -> {
startActivity(new Intent(context, DumpListActivity.class).putExtra("mode", DumpListActivity.MODE.EDIT));
app_main/src/main/res/layout/act_common_tools.xml
-27
View File
@@ -21,33 +21,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/btnMfKey32"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/btn_selectot_white"
android:gravity="start|center"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:text="MfKey32"
android:textAllCaps="false" />
<Button
android:id="@+id/btnMfKey64"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/btn_selectot_white"
android:gravity="start|center"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:text="Mfkey64"
android:textAllCaps="false" />
<Button
android:id="@+id/btnDumpEditor"
android:layout_width="match_parent"
chameleon/build.gradle
+1 -1
View File
@@ -21,7 +21,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(path: ':mfkey_32_64')
implementation 'com.github.xianglin1998:mfkey:1.0'
implementation project(path: ':utils')
implementation 'androidx.appcompat:appcompat:1.1.0'
settings.gradle
+1 -1
View File
@@ -1,2 +1,2 @@
include ':app_main', ':utils', ':mfkey_32_64', ':console', ':chameleon', ':communication', ':libnfc_pn53x', ':pm3official', ':pm3iceman', ':pm3rdv4rrg', ':mifaretag'
include ':app_main', ':utils', ':console', ':chameleon', ':communication', ':libnfc_pn53x', ':pm3official', ':pm3iceman', ':pm3rdv4rrg', ':mifaretag'
include ':pm3flasher'