Improve serial port read-write timeout mechanism

bingfeng1225 · Dec 3, 2020 · f51a9cf · f51a9cf
1 parent 9d95809
commit f51a9cf
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 47 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,7 +24,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':pwc02incubatormodule')
-    implementation 'com.github.bingfeng1225:PWSerialPort:1.1.5'
+    implementation 'com.github.bingfeng1225:PWSerialPort:1.1.6'
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.2'

diff --git a/pwc02incubatormodule/build.gradle b/pwc02incubatormodule/build.gradle
@@ -25,6 +25,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.github.bingfeng1225:PWSerialPort:1.1.5'
+    implementation 'com.github.bingfeng1225:PWSerialPort:1.1.6'
     implementation group: 'io.netty', name: 'netty-all', version: '4.1.43.Final'
 }
diff --git a/...ubatormodule/src/main/java/cn/haier/bio/medical/incubator/c02/C02IncubatorSerialPort.java b/...ubatormodule/src/main/java/cn/haier/bio/medical/incubator/c02/C02IncubatorSerialPort.java
@@ -160,6 +160,58 @@ private boolean ignorePackage() {
         return result;
     }
 
+
+    private boolean processBytesBuffer() {
+        while (this.buffer.readableBytes() < 4) {
+            return true;
+        }
+        byte[] header = new byte[C02IncubatorTools.HEADER.length];
+        this.buffer.getBytes(0, header);
+        byte command = this.buffer.getByte(3);
+        if (!C02IncubatorTools.checkHeader(header)) {
+            return this.ignorePackage();
+        }
+        if (!C02IncubatorTools.checkCommand(command)) {
+            //当前指令不合法 丢掉正常的包头以免重复判断
+            this.buffer.resetReaderIndex();
+            this.buffer.skipBytes(2);
+            this.buffer.discardReadBytes();
+            return this.ignorePackage();
+        }
+
+        int frameLength = 0xFF & this.buffer.getByte(2) + 3;
+        if (this.buffer.readableBytes() < frameLength) {
+            return true;
+        }
+        this.buffer.markReaderIndex();
+        byte[] data = new byte[frameLength];
+        this.buffer.readBytes(data, 0, data.length);
+
+        if (!C02IncubatorTools.checkFrame(data)) {
+            this.buffer.resetReaderIndex();
+            //当前包不合法 丢掉正常的包头以免重复判断
+            this.buffer.skipBytes(2);
+            this.buffer.discardReadBytes();
+            return this.ignorePackage();
+        }
+        this.buffer.discardReadBytes();
+        if (!this.ready) {
+            this.ready = true;
+            if (null != this.listener && null != this.listener.get()) {
+                this.listener.get().onC02IncubatorReady();
+            }
+        }
+        this.switchWriteModel();
+        if (null != this.listener && null != this.listener.get()) {
+            this.listener.get().onC02IncubatorPrint("C02IncubatorSerialPort Recv:" + C02IncubatorTools.bytes2HexString(data, true, ", "));
+        }
+        Message msg = Message.obtain();
+        msg.obj = data;
+        msg.what = 0x01;
+        this.handler.sendMessage(msg);
+        return true;
+    }
+
     @Override
     public void onConnected(PWSerialPortHelper helper) {
         if (!this.isInitialized() || !helper.equals(this.helper)) {
@@ -205,53 +257,12 @@ public void onStateChanged(PWSerialPortHelper helper, PWSerialPortState state) {
     }
 
     @Override
-    public void onByteReceived(PWSerialPortHelper helper, byte[] buffer, int length) throws IOException {
+    public boolean onByteReceived(PWSerialPortHelper helper, byte[] buffer, int length) throws IOException {
         if (!this.isInitialized() || !helper.equals(this.helper)) {
-            return;
+            return false;
         }
         this.buffer.writeBytes(buffer, 0, length);
-        while (this.buffer.readableBytes() >= 4) {
-            byte[] header = new byte[C02IncubatorTools.HEADER.length];
-            this.buffer.getBytes(0, header);
-            byte command = this.buffer.getByte(3);
-            if (!C02IncubatorTools.checkHeader(header) || !C02IncubatorTools.checkCommand(command)) {
-                if (this.ignorePackage()) {
-                    continue;
-                } else {
-                    break;
-                }
-            }
-            int frameLength = 0xFF & this.buffer.getByte(2) + 3;
-            if (this.buffer.readableBytes() < frameLength) {
-                break;
-            }
-            this.buffer.markReaderIndex();
-            byte[] data = new byte[frameLength];
-            this.buffer.readBytes(data, 0, data.length);
-
-            if (!C02IncubatorTools.checkFrame(data)) {
-                this.buffer.resetReaderIndex();
-                //当前包不合法 丢掉正常的包头以免重复判断
-                this.buffer.skipBytes(4);
-                this.buffer.discardReadBytes();
-                continue;
-            }
-            this.buffer.discardReadBytes();
-            if (!this.ready) {
-                this.ready = true;
-                if (null != this.listener && null != this.listener.get()) {
-                    this.listener.get().onC02IncubatorReady();
-                }
-            }
-            this.switchWriteModel();
-            if (null != this.listener && null != this.listener.get()) {
-                this.listener.get().onC02IncubatorPrint("C02IncubatorSerialPort Recv:" + C02IncubatorTools.bytes2HexString(data, true, ", "));
-            }
-            Message msg = Message.obtain();
-            msg.obj = data;
-            msg.what = 0x01;
-            this.handler.sendMessage(msg);
-        }
+        return this.processBytesBuffer();
     }
 
 
@@ -274,7 +285,7 @@ public void handleMessage(Message msg) {
                 }
                 case 0x01:
                     if (null != C02IncubatorSerialPort.this.listener && null != C02IncubatorSerialPort.this.listener.get()) {
-                        C02IncubatorSerialPort.this.listener.get().onC02IncubatorPackageReceived( (byte[]) msg.obj);
+                        C02IncubatorSerialPort.this.listener.get().onC02IncubatorPackageReceived((byte[]) msg.obj);
                     }
                     break;
             }