diff --git a/app/src/main/cpp/serial_port.cpp b/app/src/main/cpp/serial_port.cpp index 174420a..c84cd3f 100644 --- a/app/src/main/cpp/serial_port.cpp +++ b/app/src/main/cpp/serial_port.cpp @@ -161,7 +161,7 @@ jclass serial_port_class = env->GetObjectClass(thiz); jclass file_descriptor_class = env->FindClass("java/io/FileDescriptor"); - // fd 对应SerialPortKit里面的 fd + // fd 对应SerialPort里面的 fd char fd_buffer[4] = {0}; strcat(fd_buffer, "fd"); jfieldID fd_field_id = env->GetFieldID(serial_port_class, fd_buffer, diff --git a/app/src/main/cpp/serial_port.cpp b/app/src/main/cpp/serial_port.cpp index 174420a..c84cd3f 100644 --- a/app/src/main/cpp/serial_port.cpp +++ b/app/src/main/cpp/serial_port.cpp @@ -161,7 +161,7 @@ jclass serial_port_class = env->GetObjectClass(thiz); jclass file_descriptor_class = env->FindClass("java/io/FileDescriptor"); - // fd 对应SerialPortKit里面的 fd + // fd 对应SerialPort里面的 fd char fd_buffer[4] = {0}; strcat(fd_buffer, "fd"); jfieldID fd_field_id = env->GetFieldID(serial_port_class, fd_buffer, diff --git a/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt b/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt index 1abddc6..c9deea6 100644 --- a/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt +++ b/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt @@ -34,7 +34,7 @@ } fd = open(device.absolutePath, baudRate, flags) if (fd == null) { - Log.e(kTag, "SerialPortKit open returns null") + Log.e(kTag, "SerialPort open return null") throw IOException() } inputStream = FileInputStream(fd) diff --git a/app/src/main/cpp/serial_port.cpp b/app/src/main/cpp/serial_port.cpp index 174420a..c84cd3f 100644 --- a/app/src/main/cpp/serial_port.cpp +++ b/app/src/main/cpp/serial_port.cpp @@ -161,7 +161,7 @@ jclass serial_port_class = env->GetObjectClass(thiz); jclass file_descriptor_class = env->FindClass("java/io/FileDescriptor"); - // fd 对应SerialPortKit里面的 fd + // fd 对应SerialPort里面的 fd char fd_buffer[4] = {0}; strcat(fd_buffer, "fd"); jfieldID fd_field_id = env->GetFieldID(serial_port_class, fd_buffer, diff --git a/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt b/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt index 1abddc6..c9deea6 100644 --- a/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt +++ b/app/src/main/java/com/casic/detector/common/uart/SerialPort.kt @@ -34,7 +34,7 @@ } fd = open(device.absolutePath, baudRate, flags) if (fd == null) { - Log.e(kTag, "SerialPortKit open returns null") + Log.e(kTag, "SerialPort open return null") throw IOException() } inputStream = FileInputStream(fd) diff --git a/app/src/main/java/com/casic/detector/common/view/MainActivity.kt b/app/src/main/java/com/casic/detector/common/view/MainActivity.kt index 93535d2..a2fe3af 100644 --- a/app/src/main/java/com/casic/detector/common/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/MainActivity.kt @@ -1681,8 +1681,16 @@ binding.energyTipsView.setTextColor(Color.parseColor("#428d00")) binding.energyTipsView.setBackgroundResource(R.mipmap.bg_large_text_green) - markerPoints.sortBy(MarkerDistanceData::distance) - val nearestPoint = markerPoints.first() + if (markerPoints.isEmpty()) { + Log.d(kTag, "bindingValue: markerPoints.isEmpty()") + return + } + + //需要转一下,不然会有并发问题 + val temp = ArrayList() + temp.addAll(markerPoints) + temp.sortBy(MarkerDistanceData::distance) + val nearestPoint = temp.first() markerId = nearestPoint.markerId handleMarker() } else {