diff --git a/app_main/build.gradle b/app_main/build.gradle
index 8b6a4f0f..b409da6d 100644
--- a/app_main/build.gradle
+++ b/app_main/build.gradle
@@ -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')
diff --git a/app_main/src/main/AndroidManifest.xml b/app_main/src/main/AndroidManifest.xml
index 8ac19efb..24d5e6a2 100644
--- a/app_main/src/main/AndroidManifest.xml
+++ b/app_main/src/main/AndroidManifest.xml
@@ -60,14 +60,6 @@
-
-
-
-
diff --git a/app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey32ConsoleActivity.java b/app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey32ConsoleActivity.java
deleted file mode 100644
index 22415a4c..00000000
--- a/app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey32ConsoleActivity.java
+++ /dev/null
@@ -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);
- }
-}
diff --git a/app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey64ConsoleActivity.java b/app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey64ConsoleActivity.java
deleted file mode 100644
index 48fe7c3c..00000000
--- a/app_main/src/main/java/cn/rrg/rdv/activities/tools/MfKey64ConsoleActivity.java
+++ /dev/null
@@ -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);
- }
-}
diff --git a/app_main/src/main/java/cn/rrg/rdv/fragment/tools/ToolsAccessFragment.java b/app_main/src/main/java/cn/rrg/rdv/fragment/tools/ToolsAccessFragment.java
index 5d6f1d49..2b0dfce7 100644
--- a/app_main/src/main/java/cn/rrg/rdv/fragment/tools/ToolsAccessFragment.java
+++ b/app_main/src/main/java/cn/rrg/rdv/fragment/tools/ToolsAccessFragment.java
@@ -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));
diff --git a/app_main/src/main/res/layout/act_common_tools.xml b/app_main/src/main/res/layout/act_common_tools.xml
index 94a0614c..440e4569 100644
--- a/app_main/src/main/res/layout/act_common_tools.xml
+++ b/app_main/src/main/res/layout/act_common_tools.xml
@@ -21,33 +21,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
-