From 96b16608fd27f7f84e928c0aad33e0b6d41bc690 Mon Sep 17 00:00:00 2001
From: JOETION <1322874562@qq.com>
Date: Fri, 15 Jan 2021 16:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=BF=AE=E6=94=B9=E5=85=89?=
=?UTF-8?q?=E5=A4=A7pda=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/encodings.xml | 8 +++++
app/build.gradle | 2 +-
app/src/main/AndroidManifest.xml | 7 -----
.../android_serialport_api/SerialPort.java | 7 +++++
.../com/device/zk_r322a/ZKR322AControl.java | 20 ++++++------
.../main/java/com/util/GlobalApplication.java | 31 +++++++++++++++++++
.../java/map/baidu/com/BMapManagerUtil.java | 5 +++
7 files changed, 62 insertions(+), 18 deletions(-)
create mode 100644 app/src/main/java/com/util/GlobalApplication.java
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index b1415f4..b94aa26 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,13 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index beb519e..85c6167 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
minSdkVersion 8
targetSdkVersion 15
versionCode 1
- versionName "V1.078"
+ versionName "V1.079"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f0d319..003a660 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,8 +23,6 @@
-
-
@@ -125,11 +123,6 @@
-
-
-
-
-
-->
diff --git a/app/src/main/java/android_serialport_api/SerialPort.java b/app/src/main/java/android_serialport_api/SerialPort.java
index 2274fa7..1721f76 100644
--- a/app/src/main/java/android_serialport_api/SerialPort.java
+++ b/app/src/main/java/android_serialport_api/SerialPort.java
@@ -1,6 +1,10 @@
package android_serialport_api;
+import android.app.Application;
import android.util.Log;
+import com.util.DialogUtil;
+import com.util.GlobalApplication;
+import map.baidu.com.BMapManagerUtil;
import java.io.*;
@@ -22,10 +26,12 @@ public class SerialPort {
su.getOutputStream().write(cmd.getBytes());
if ((su.waitFor() != 0) || !device.canRead() || !device.canWrite()) {
+ DialogUtil.builder(BMapManagerUtil.getGlobalApplicationContext(),"获取su命令权限失败","系统或许未root",15);
throw new SecurityException();
}
} catch (Exception e) {
e.printStackTrace();
+ DialogUtil.builder(BMapManagerUtil.getGlobalApplicationContext(),"获取root权限失败",e.toString(),15);
throw new SecurityException();
}
}
@@ -33,6 +39,7 @@ public class SerialPort {
Log.i("info", "open device!!");
if (mFd == null) {
Log.e(TAG, "native open returns null");
+ DialogUtil.builder(BMapManagerUtil.getGlobalApplicationContext(),"获取文件描述符失败","native open returns null",15);
throw new IOException();
}
mFileInputStream = new FileInputStream(mFd);
diff --git a/app/src/main/java/com/device/zk_r322a/ZKR322AControl.java b/app/src/main/java/com/device/zk_r322a/ZKR322AControl.java
index e2a1bb7..58b9d03 100644
--- a/app/src/main/java/com/device/zk_r322a/ZKR322AControl.java
+++ b/app/src/main/java/com/device/zk_r322a/ZKR322AControl.java
@@ -13,7 +13,7 @@ public class ZKR322AControl {
private SerialPort mSerialPort = null;
private OutputStream mOutputStream = null;
private InputStream mInputStream = null;
- //private boolean readVal = false;
+ private boolean readVal = false;
public ZKR322AControl() throws SecurityException, IOException {
mSerialPort = new SerialPort(new File("/dev/ttyS4"), 115200, 8, 'N', 1,0);
@@ -37,18 +37,18 @@ public class ZKR322AControl {
}
public void start() {
- //readVal = true;
- // GpioJNI.gpio_switch_scan_trig(1);
+ readVal = true;
+ GpioJNI.gpio_switch_scan_trig(1);
}
public void stop() {
- //readVal = false;
- // GpioJNI.gpio_switch_scan_trig(0);
+ readVal = false;
+ GpioJNI.gpio_switch_scan_trig(0);
}
- //public boolean isRead() {
- // return readVal;
- //}
+ public boolean isRead() {
+ return readVal;
+ }
public void close() {
if (mSerialPort != null) {
@@ -58,7 +58,7 @@ public class ZKR322AControl {
public void initScan() {
- // GpioJNI.gpio_switch_scan_rf_ired(0);
- // GpioJNI.gpio_switch_scan_power(1);
+ GpioJNI.gpio_switch_scan_rf_ired(0);
+ GpioJNI.gpio_switch_scan_power(1);
}
}
diff --git a/app/src/main/java/com/util/GlobalApplication.java b/app/src/main/java/com/util/GlobalApplication.java
new file mode 100644
index 0000000..868790a
--- /dev/null
+++ b/app/src/main/java/com/util/GlobalApplication.java
@@ -0,0 +1,31 @@
+package com.util;
+
+/*
+ **********************************************
+ * DATE PERSON REASON
+ * 2021-01-15 FXY Created
+ **********************************************
+ */
+
+
+import android.app.Application;
+import android.content.Context;
+
+/**
+ * 全局上下文，可以用来弹出无依赖的对话框等
+ */
+public class GlobalApplication extends Application {
+
+ private static Context context;//全局上下文
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ context = getApplicationContext();
+ }
+
+ //获取全局的上下文
+ public static Context getContext() {
+ return context;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/map/baidu/com/BMapManagerUtil.java b/app/src/main/java/map/baidu/com/BMapManagerUtil.java
index 9b0af7c..8aba451 100644
--- a/app/src/main/java/map/baidu/com/BMapManagerUtil.java
+++ b/app/src/main/java/map/baidu/com/BMapManagerUtil.java
@@ -1,6 +1,7 @@
package map.baidu.com;
import android.app.Application;
+import android.content.Context;
import android.widget.Toast;
import com.baidu.mapapi.BMapManager;
import com.baidu.mapapi.MKEvent;
@@ -57,5 +58,9 @@ public class BMapManagerUtil extends Application {
}
super.onTerminate();
}
+
+ public static Context getGlobalApplicationContext(){
+ return bMapManagerUtil.getApplicationContext();
+ }
}