refactor(修改):

- 安全修改

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -24,7 +24,6 @@ import com.grkj.iscs.extentions.serialNo
 import com.grkj.iscs.extentions.startsWith
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.modbus.DockBean
-import com.grkj.iscs.modbus.MBFrame
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.modbus.ModBusController.dockList
 import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE

app/src/main/java/com/grkj/iscs/modbus/ModBusManager.kt

@@ -1,5 +1,6 @@
 package com.grkj.iscs.modbus
 
+import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.grkj.iscs.MyApplication
@@ -55,7 +56,9 @@ class ModBusManager(
             }
         }
         // 初始化地址池
-        SPUtils.getDockConfig(MyApplication.instance?.applicationContext!!)
+        val dockConfig = SPUtils.getDockConfig(MyApplication.instance?.applicationContext!!)
+        LogUtil.i("基座配置: ${dockConfig}")
+        dockConfig
             ?.takeIf { it.isNotEmpty() }
             ?.let { json ->
                 val type = object : TypeToken<List<DockTestFragment.DockTestBean>>() {}.type

app/src/main/java/com/grkj/iscs/modbus/PortManager.kt

@@ -3,6 +3,7 @@ package com.grkj.iscs.modbus
 import android.content.Context
 import androidx.annotation.WorkerThread
 import com.epton.sdk.SerialPort
+import com.google.android.datatransport.runtime.dagger.Reusable
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.ToastUtils
@@ -27,7 +28,7 @@ class PortManager private constructor(
     /**
      * 向串口发送数据
      */
-    fun send(data: ByteArray) : Boolean {
+    fun send(data: ByteArray): Boolean {
         try {
             output.write(data)
             output.flush()
@@ -38,7 +39,7 @@ class PortManager private constructor(
         }
     }
 
-    var t : Thread ? = null
+    var t: Thread? = null
 
     /**
      * 监听串口数据
@@ -75,7 +76,8 @@ class PortManager private constructor(
         try {
             input.close()
             output.close()
-        } catch (e: Exception) { }
+        } catch (e: Exception) {
+        }
     }
 
     companion object {
@@ -88,7 +90,7 @@ class PortManager private constructor(
          * @param bps 波特率，正整数
          */
         @WorkerThread
-        fun open(port: Int, bps: Int, usb: Boolean) : PortManager? {
+        fun open(port: Int, bps: Int, usb: Boolean): PortManager? {
             var blocked = true
             val thread = Thread.currentThread()
             Executor.delayOnMain(500) {
@@ -99,7 +101,7 @@ class PortManager private constructor(
                 }
             }
             try {
-                val file = File(if(usb) "/dev/ttyUSB${port}" else "/dev/ttyS${port}")
+                val file = File(if (usb) "/dev/ttyUSB${port}" else "/dev/ttyS${port}")
                 LogUtil.i("连接 port file")
                 SerialPort(file, bps, 0).run {
                     blocked = false
@@ -124,7 +126,10 @@ class PortManager private constructor(
          * @param bps 波特率，正整数
          */
         @WorkerThread
-        fun open(port: String?, bps: Int) : PortManager? {
+        fun open(port: String?, bps: Int): PortManager? {
+            if (port == null) {
+                return null
+            }
             var blocked = true
             val thread = Thread.currentThread()
             Executor.delayOnMain(500) {
@@ -155,7 +160,7 @@ class PortManager private constructor(
          * 打开主控板
          */
         @WorkerThread
-        fun openCtrlBord(ctx: Context) : PortManager? {
+        fun openCtrlBord(ctx: Context): PortManager? {
             // TODO 端口号待定：大屏调试设备-1，小屏调试设备-0
 //            val port = 4
 //            val bps = 115200