Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

5 小时以前 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3

 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) {