From f57f42ee7f4a1a84967b154f9075b8499e5dfdcf Mon Sep 17 00:00:00 2001 From: dxl <64101226@qq.com> Date: Wed, 6 May 2020 18:48:48 +0800 Subject: [PATCH] No response bug fixed. --- app_main/build.gradle | 2 +- .../java/cn/rrg/rdv/fragment/base/AppMainDevicesFragment.java | 1 - chameleon/build.gradle | 2 +- communication/build.gradle | 2 +- pm3flasher/build.gradle | 2 +- pm3rdv4rrg/build.gradle | 2 +- pm3rdv4rrg/src/main/cpp/proxmark3 | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app_main/build.gradle b/app_main/build.gradle index d18e4787..444ba949 100644 --- a/app_main/build.gradle +++ b/app_main/build.gradle @@ -56,7 +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:ComBridge:1.0.1' implementation 'com.github.xianglin1998:nfc_console:1.0' implementation project(':utils') diff --git a/app_main/src/main/java/cn/rrg/rdv/fragment/base/AppMainDevicesFragment.java b/app_main/src/main/java/cn/rrg/rdv/fragment/base/AppMainDevicesFragment.java index 8212d9f1..81c3f1e0 100644 --- a/app_main/src/main/java/cn/rrg/rdv/fragment/base/AppMainDevicesFragment.java +++ b/app_main/src/main/java/cn/rrg/rdv/fragment/base/AppMainDevicesFragment.java @@ -268,7 +268,6 @@ public class AppMainDevicesFragment extends BaseFragment { //如果是横屏动作,那我们就没必要全部销毁。 if (isBackPressed) { AppUtil.getInstance().finishAll(); - System.exit(0); } Context context = getContext(); if (context != null) { diff --git a/chameleon/build.gradle b/chameleon/build.gradle index 5dc88255..51bc5b9e 100644 --- a/chameleon/build.gradle +++ b/chameleon/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.github.xianglin1998:mfkey:1.1' implementation 'com.github.xianglin1998:nfctag:1.0' - implementation 'com.github.xianglin1998:ComBridge:1.0' + implementation 'com.github.xianglin1998:ComBridge:1.0.1' implementation project(path: ':utils') implementation project(path: ':communication') diff --git a/communication/build.gradle b/communication/build.gradle index 0af48653..98a19795 100644 --- a/communication/build.gradle +++ b/communication/build.gradle @@ -23,6 +23,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.github.felHR85:UsbSerial:6.1.0' - implementation 'com.github.xianglin1998:ComBridge:1.0' + implementation 'com.github.xianglin1998:ComBridge:1.0.1' implementation 'androidx.annotation:annotation:1.1.0' } diff --git a/pm3flasher/build.gradle b/pm3flasher/build.gradle index 2ab54b27..cdd24f54 100644 --- a/pm3flasher/build.gradle +++ b/pm3flasher/build.gradle @@ -42,5 +42,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':communication') - implementation 'com.github.xianglin1998:ComBridge:1.0' + implementation 'com.github.xianglin1998:ComBridge:1.0.1' } diff --git a/pm3rdv4rrg/build.gradle b/pm3rdv4rrg/build.gradle index 9234b9ee..7859c811 100644 --- a/pm3rdv4rrg/build.gradle +++ b/pm3rdv4rrg/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.github.xianglin1998:nfctag:1.0' implementation 'com.github.xianglin1998:nfc_console:1.0' - implementation 'com.github.xianglin1998:ComBridge:1.0' + implementation 'com.github.xianglin1998:ComBridge:1.0.1' implementation project(':communication') implementation project(path: ':utils') diff --git a/pm3rdv4rrg/src/main/cpp/proxmark3 b/pm3rdv4rrg/src/main/cpp/proxmark3 index d55a147c..0c233590 160000 --- a/pm3rdv4rrg/src/main/cpp/proxmark3 +++ b/pm3rdv4rrg/src/main/cpp/proxmark3 @@ -1 +1 @@ -Subproject commit d55a147ca960d11c41eade0d99b24741105157e5 +Subproject commit 0c233590a56df9d2de3ccc40bd19288de574bbda