客户端可能使用多个串口，因此不可使用单例

Sheedon · Apr 26, 2020 · 87a4e6e · 87a4e6e
1 parent 6c71774
commit 87a4e6e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/serial/build.gradle b/serial/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 7
-        versionName "1.2.3"
+        versionCode 8
+        versionName "1.2.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/serial/src/main/java/org/sheedon/serial/serialport/SafeThread.java b/serial/src/main/java/org/sheedon/serial/serialport/SafeThread.java
@@ -13,7 +13,6 @@
  * @Date: 2020/4/26 10:34
  */
 public class SafeThread {
-    private final static SafeThread INSTANCE = new SafeThread();
 
     private Thread thread;
     private int interval;
@@ -23,12 +22,6 @@ public class SafeThread {
 
     private OnThreadHandleListener listener;
 
-    private SafeThread() {
-    }
-
-    public static SafeThread getInstance() {
-        return INSTANCE;
-    }
 
     public void initConfig(int interval, OnThreadHandleListener listener) {
         this.interval = interval;

diff --git a/serial/src/main/java/org/sheedon/serial/serialport/SerialPort.java b/serial/src/main/java/org/sheedon/serial/serialport/SerialPort.java
@@ -31,6 +31,7 @@ public class SerialPort implements SafeThread.OnThreadHandleListener{
     private SafetyByteBuffer serialData = new SafetyByteBuffer();
 
     private int interval;
+    private SafeThread safeThread;
 
     /**
      * 构建 创建客户端
@@ -56,7 +57,8 @@ public SerialPort(String path, int baudRate, int flags, int interval,
         inputStream = serialPort.getInputStream();
         outputStream = serialPort.getOutputStream();
 
-        SafeThread.getInstance().initConfig(interval,this);
+        safeThread = new SafeThread();
+        safeThread.initConfig(interval,this);
 
     }