From 0541bc0b2ce4c0de43688ecc23cf2d433bac8630 Mon Sep 17 00:00:00 2001 From: dxl <64101226@qq.com> Date: Thu, 13 Aug 2020 18:04:09 +0800 Subject: [PATCH] Select the advanced view of enabling PM3 according to the SDK version. --- .../connect/Proxmark3Rdv4RRGConnectActivity.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app_main/src/main/java/cn/rrg/rdv/activities/connect/Proxmark3Rdv4RRGConnectActivity.java b/app_main/src/main/java/cn/rrg/rdv/activities/connect/Proxmark3Rdv4RRGConnectActivity.java index c646c323..46349153 100644 --- a/app_main/src/main/java/cn/rrg/rdv/activities/connect/Proxmark3Rdv4RRGConnectActivity.java +++ b/app_main/src/main/java/cn/rrg/rdv/activities/connect/Proxmark3Rdv4RRGConnectActivity.java @@ -4,6 +4,7 @@ import android.Manifest; import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import androidx.annotation.Nullable; @@ -11,6 +12,7 @@ import androidx.appcompat.app.AlertDialog; import cn.rrg.rdv.R; import cn.rrg.rdv.activities.main.PM3FlasherMainActivity; +import cn.rrg.rdv.activities.proxmark3.rdv4_rrg.Proxmark3Rdv4RRGRedTeamConsoleActivity; import cn.rrg.rdv.activities.tools.DeviceConnectActivity; import cn.rrg.rdv.activities.proxmark3.rdv4_rrg.Proxmark3NewTerminalInitActivity; import cn.rrg.rdv.callback.ConnectFailedCtxCallback; @@ -20,9 +22,6 @@ import cn.rrg.rdv.models.Proxmark3Rdv4UsbModel; import cn.dxl.common.util.PermissionUtil; /** - * 专供RDV4连接设备 - * 可以使用USB 与 SPP两种方式连接设备 - * * @author DXL */ public class Proxmark3Rdv4RRGConnectActivity @@ -48,7 +47,11 @@ public class Proxmark3Rdv4RRGConnectActivity @Override public Class getTarget() { - return Proxmark3NewTerminalInitActivity.class; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + return Proxmark3NewTerminalInitActivity.class; + } else { + return Proxmark3Rdv4RRGRedTeamConsoleActivity.class; + } } @Override