From 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 10 十二月 2025 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SerialPortModel.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SerialPortModel.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SerialPortModel.java
index f79b81a..4535510 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SerialPortModel.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SerialPortModel.java
@@ -1,6 +1,5 @@
package com.doumee.keyCabinet.utils.i485;
-import android.serialport.SerialPort;
import android.util.Log;
import java.io.File;
@@ -11,6 +10,8 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+
+import android_serialport_api.SerialPort;
public class SerialPortModel {
@@ -46,12 +47,7 @@
public boolean open() {
try {
File device = new File(serialPortPath);
- serialPort = SerialPort
- .newBuilder(device, baudrate)
- .dataBits(dataBits)
- .stopBits(stopBits)
- .parity(parity)
- .build();
+ serialPort = new SerialPort(device, baudrate, 0);
scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
singleThreadExecutor = Executors.newSingleThreadExecutor();
} catch (IOException e) {
--
Gitblit v1.9.3