diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index 9c25ed1..e61ea61 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -55,5 +55,6 @@ serialPorts.forEach { it.close() } + serialPorts.clear() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index 9c25ed1..e61ea61 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -55,5 +55,6 @@ serialPorts.forEach { it.close() } + serialPorts.clear() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt index a63bba9..eb84834 100644 --- a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt +++ b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt @@ -49,7 +49,7 @@ while (true) { var size: Int try { - val buffer = ByteArray(32) + val buffer = ByteArray(72) if (inStream == null) return@launch size = inStream!!.read(buffer) if (size > 0) { @@ -68,7 +68,7 @@ while (true) { var size: Int try { - val buffer = ByteArray(32) + val buffer = ByteArray(72) if (inStream1 == null) return@launch size = inStream1!!.read(buffer) if (size > 0) { @@ -87,7 +87,7 @@ while (true) { var size: Int try { - val buffer = ByteArray(32) + val buffer = ByteArray(72) if (inStream2 == null) return@launch size = inStream2!!.read(buffer) if (size > 0) { @@ -140,4 +140,9 @@ * 串口读数 * */ abstract fun onDataReceived(buffer: ByteArray?, size: Int) + + override fun onDestroy() { + BaseApplication.get().closeSerialPort() + super.onDestroy() + } } \ No newline at end of file