From d6cf4a19786d4b481f85c952de9f48a90a0c5aa4 Mon Sep 17 00:00:00 2001
From: sunxudong <sumx4ever@163.com>
Date: Thu, 23 Apr 2020 10:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0backNameC?=
 =?UTF-8?q?ode=EF=BC=8C=E4=BD=9C=E4=B8=BA=E4=B8=AD=E4=BB=8B=E9=94=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=85=85=E5=BD=93=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=9A=84Key=20=E5=8F=8D=E9=A6=88=E5=86=85=E5=AE=B9String?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BAbyte[],=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E4=B8=AD=E9=97=B4=E8=BD=AC=E5=8C=96=E4=BA=A7=E7=94=9F=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E6=B6=88=E8=80=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/inspectionProfiles/Project_Default.xml  |   1 +
 app/build.gradle                              |   1 +
 .../java/org/sheedon/demo/MainActivity.java   |  58 +++------
 .../converters/CallbackRuleConverter.java     |  19 ++-
 .../demo/converters/CheckDataConverter.java   |  72 +++++------
 .../demo/converters/DataConverterFactory.java |   5 +-
 serial/build.gradle                           |   4 +-
 .../org/sheedon/serial/AsyncCallImpl.java     |   3 +
 .../org/sheedon/serial/DataConverter.java     |   2 +-
 .../sheedon/serial/DataConverterFactory.java  |   2 +-
 .../java/org/sheedon/serial/Dispatcher.java   |  70 +++++------
 .../java/org/sheedon/serial/ReadyTask.java    |  10 +-
 .../java/org/sheedon/serial/RealCall.java     |   5 +
 .../org/sheedon/serial/RealObservable.java    |  10 +-
 .../main/java/org/sheedon/serial/Request.java |  29 +++++
 .../java/org/sheedon/serial/ResponseBody.java |  32 ++---
 .../org/sheedon/serial/SafetyByteBuffer.java  | 114 ++++++++++++++++++
 .../org/sheedon/serial/SerialRunnable.java    |  10 +-
 .../sheedon/serial/internal/CharsUtils.java   |  41 ++++++-
 .../sheedon/serial/serialport/SerialPort.java |  19 ++-
 20 files changed, 341 insertions(+), 166 deletions(-)
 create mode 100644 serial/src/main/java/org/sheedon/serial/SafetyByteBuffer.java

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 01de7ef..fb47f26 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="FieldCanBeLocal" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="IgnoreResultOfCall" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_reportAllNonLibraryCalls" value="false" />
       <option name="callCheckString" value="java.io.File,.*,java.io.InputStream,read|skip|available|markSupported,java.io.Reader,read|skip|ready|markSupported,java.lang.Boolean,.*,java.lang.Byte,.*,java.lang.Character,.*,java.lang.Double,.*,java.lang.Float,.*,java.lang.Integer,.*,java.lang.Long,.*,java.lang.Math,.*,java.lang.Object,equals|hashCode|toString,java.lang.Short,.*,java.lang.StrictMath,.*,java.lang.String,.*,java.lang.Thread,interrupted,java.math.BigInteger,.*,java.math.BigDecimal,.*,java.net.InetAddress,.*,java.net.URI,.*,java.util.Arrays,.*,java.util.List,of,java.util.Set,of,java.util.Map,of|ofEntries|entry,java.util.Collections,(?!addAll).*,java.util.UUID,.*,java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparentBounds|hasAnchoringBounds|hitEnd|requireEnd,java.util.regex.Pattern,.*,java.util.stream.BaseStream,.*" />
diff --git a/app/build.gradle b/app/build.gradle
index 086f223..4704274 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,6 +13,7 @@ android {
     }
     buildTypes {
         release {
+            debuggable true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
diff --git a/app/src/main/java/org/sheedon/demo/MainActivity.java b/app/src/main/java/org/sheedon/demo/MainActivity.java
index f6bd7c0..851a19d 100644
--- a/app/src/main/java/org/sheedon/demo/MainActivity.java
+++ b/app/src/main/java/org/sheedon/demo/MainActivity.java
@@ -24,57 +24,35 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         final SerialClient client = new SerialClient.Builder()
-                .path("/dev/ttyS2")
+                .path("/dev/ttyS1")
                 .baudRate(115200)
                 .name("115200")
                 .addConverterFactory(DataConverterFactory.create())
                 .callback(this)
                 .build();
 
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                while (true){
-                    Request request = new RequestBuilder()
-                            .backName("0007")
-                            .data("7A07000006BC7C")
-                            .build();
+        Request request = new RequestBuilder()
+                .backName("01FF")
+                .data("")
+                .build();
 
-                    Call call = client.newCall(request);
-                    call.enqueue(new Callback<Response>() {
-                        @Override
-                        public void onFailure(Throwable e) {
 
-                        }
 
-                        @Override
-                        public void onResponse(Response response) {
 
-                        }
-                    });
+        Call call = client.newCall(request);
+        Observable observable = client.newObservable(request);
+        observable.subscribe(new Callback<Response>() {
+            @Override
+            public void onFailure(Throwable e) {
+                System.out.println(e);
+            }
 
-                    try {
-                        Thread.sleep(3000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
+            @Override
+            public void onResponse(Response response) {
+                ResponseBody body = response.body();
+                System.out.println(body == null ? "" : body.getBody());
             }
-        }).start();
-//        Call call = client.newCall(request);
-//        Observable observable = client.newObservable(request);
-//        observable.subscribe(new Callback<Response>() {
-//            @Override
-//            public void onFailure(Throwable e) {
-//                System.out.println(e);
-//            }
-//
-//            @Override
-//            public void onResponse(Response response) {
-//                ResponseBody body = response.body();
-//                System.out.println(body == null ? "" : body.getBody());
-//            }
-//        });
+        });
 
 //        call.enqueue(new Callback() {
 //            @Override
@@ -98,6 +76,6 @@ public void onResponse(Response response) {
 
     @Override
     public void onCallback(ResponseBody data) {
-        Log.v("SXD",data.getBody());
+        Log.v("SXD",data.toString());
     }
 }
diff --git a/app/src/main/java/org/sheedon/demo/converters/CallbackRuleConverter.java b/app/src/main/java/org/sheedon/demo/converters/CallbackRuleConverter.java
index 5f933e7..a27edbd 100644
--- a/app/src/main/java/org/sheedon/demo/converters/CallbackRuleConverter.java
+++ b/app/src/main/java/org/sheedon/demo/converters/CallbackRuleConverter.java
@@ -2,6 +2,9 @@
 
 
 import org.sheedon.serial.DataConverter;
+import org.sheedon.serial.internal.CharsUtils;
+
+import java.util.Arrays;
 
 /**
  * @Description: java类作用描述
@@ -9,7 +12,7 @@
  * @Email: sheedonsun@163.com
  * @Date: 2020/3/11 0:45
  */
-public class CallbackRuleConverter implements DataConverter<String, String> {
+public class CallbackRuleConverter implements DataConverter<byte[], Long> {
 
     CallbackRuleConverter() {
 
@@ -19,10 +22,16 @@ public class CallbackRuleConverter implements DataConverter<String, String> {
     // 协议头  数据长度位  子控设备地址  命令类型    消息体    CRC16校验
     // 7A      0800         01              03         01       B07A
     @Override
-    public String convert(String value) {
-        if(value == null || value.isEmpty() || value.length()<10)
-            return "";
+    public Long convert(byte[] value) {
+        if (value == null || value.length < 3)
+            return -1L;
+
+        return (long) (byteToHex(value[1]) * 16 * 16 + byteToHex(value[2]));
+    }
 
-        return value.substring(6,10);
+    private int byteToHex(byte b) {
+        if (b < 0)
+            return b & 0xff;
+        return b;
     }
 }
diff --git a/app/src/main/java/org/sheedon/demo/converters/CheckDataConverter.java b/app/src/main/java/org/sheedon/demo/converters/CheckDataConverter.java
index 816d6c9..0fb6af1 100644
--- a/app/src/main/java/org/sheedon/demo/converters/CheckDataConverter.java
+++ b/app/src/main/java/org/sheedon/demo/converters/CheckDataConverter.java
@@ -1,11 +1,12 @@
 package org.sheedon.demo.converters;
 
-
 import org.sheedon.serial.DataCheckBean;
 import org.sheedon.serial.DataConverter;
 import org.sheedon.serial.ResponseBody;
-import org.sheedon.serial.utils.CRC16M;
-import org.sheedon.serial.utils.CRC_16;
+import org.sheedon.serial.SafetyByteBuffer;
+import org.sheedon.serial.internal.CharsUtils;
+
+import java.util.Arrays;
 
 /**
  * 反馈内容解析器
@@ -14,10 +15,10 @@
  * @Email: sheedonsun@163.com
  * @Date: 2020/3/11 0:45
  */
-public class CheckDataConverter implements DataConverter<StringBuffer, DataCheckBean> {
+public class CheckDataConverter implements DataConverter<SafetyByteBuffer, DataCheckBean> {
 
-    private static final String STARTBIT = "7A";
-    private static final String ENDBIT = "";
+    private static final byte STARTBIT = (byte) 0xBB;
+    private static final byte ENDBIT = 0x7E;
 
     CheckDataConverter() {
 
@@ -27,7 +28,7 @@ public class CheckDataConverter implements DataConverter<StringBuffer, DataCheck
     // 协议头  数据长度位  子控设备地址  命令类型    消息体    CRC16校验
     // 7A      0800         01              03         01       B07A
     @Override
-    public DataCheckBean convert(StringBuffer value) {
+    public DataCheckBean convert(SafetyByteBuffer value) {
         if (value == null || value.length() == 0) {
             return DataCheckBean.build(null, 0);
         }
@@ -37,28 +38,32 @@ public DataCheckBean convert(StringBuffer value) {
             return DataCheckBean.build(null, 0);
         }
 
-        if (index + 6 >= value.length()) {
+        if (index + 5 >= value.length()) {
             return DataCheckBean.build(null, index);
         }
 
         // 一个内容到总长度
-        String lengthStr = value.substring(index + 2, index + 6);
-        int length = calcLength(lengthStr) * 2;
-        if (length < 0 || index + length > value.length()) {
+        byte[] lengthStr = value.substring(index + 3, index + 5);
+        int length = calcLength(lengthStr);
+        if (length < 0 || index + length + 7 > value.length()) {
             return DataCheckBean.build(null, index);
         }
 
-        String content = value.substring(index, index + length);
+        byte[] content = value.substring(index + 1, index + length + 6);
         boolean check = checkContent(content);
         if (check) {
-            ResponseBody body = ResponseBody.build(STARTBIT,
-                    content.substring(STARTBIT.length(), content.length() - 4),
-                    content.substring(content.length() - 4),
-                    ENDBIT, content);
 
-            return DataCheckBean.build(body, index + length);
+            byte[] startBit = new byte[]{STARTBIT};
+            byte[] messageBit = Arrays.copyOf(content, content.length - 1);
+            byte[] parityBit = Arrays.copyOfRange(content, content.length - 1, content.length);
+            byte[] endBit = new byte[]{ENDBIT};
+
+            ResponseBody body = ResponseBody.build(startBit, messageBit, parityBit, endBit,
+                    value.substring(index, index + length + 7));
+
+            return DataCheckBean.build(body, index + length + 7);
         } else {
-            return DataCheckBean.build(null, index + length);
+            return DataCheckBean.build(null, index + length + 7);
         }
     }
 
@@ -67,12 +72,12 @@ public DataCheckBean convert(StringBuffer value) {
      *
      * @param str 字符
      */
-    private int calcLength(String str) {
-        String lowPosition = str.substring(0, 2);
-        String highPosition = str.substring(2, 4);
+    private int calcLength(byte[] str) {
+        byte highPosition = str[0];
+        byte lowPosition = str[1];
 
-        int low = Integer.parseInt(lowPosition, 16);
-        int high = Integer.parseInt(highPosition, 16);
+        int high = highPosition & 0xFF;
+        int low = lowPosition & 0xFF;
 
         return high * 16 * 16 + low;
 
@@ -81,24 +86,21 @@ private int calcLength(String str) {
 
     /**
      * 核实内容校验码
-     * 拿到校验码 后四位
-     * 拿到内容 除了后四位外的数据
+     * 拿到校验码 后两位
+     * 拿到内容 除了后两位外的数据
      *
      * @param content 内容
      * @return 校验是否一致
      */
-    private boolean checkContent(String content) {
-        if (content.length() <= 4)
+    private boolean checkContent(byte[] content) {
+        if (content.length <= 1)
             return false;
 
-        String checkStr = content.substring(content.length() - 4);
-        String contentStr = content.substring(0, content.length() - 4);
-        StringBuilder checkResult = new StringBuilder(CRC16M.getBufHexStr(CRC_16.getSendBuf(contentStr)));
-        checkResult = checkResult.delete(0, content.length() - 4);
-        for (int index = checkResult.length(); index < 4; index++) {
-            checkResult.insert(0, "0");
-        }
+        byte checkByte = content[content.length - 1];
+        byte[] contentBytes = Arrays.copyOf(content, content.length - 1);
+        byte checkResult = CharsUtils.sumCheck(contentBytes);
 
-        return checkResult.toString().equalsIgnoreCase(checkStr);
+        return checkByte == checkResult;
     }
+
 }
diff --git a/app/src/main/java/org/sheedon/demo/converters/DataConverterFactory.java b/app/src/main/java/org/sheedon/demo/converters/DataConverterFactory.java
index eda55ff..3fee8a3 100644
--- a/app/src/main/java/org/sheedon/demo/converters/DataConverterFactory.java
+++ b/app/src/main/java/org/sheedon/demo/converters/DataConverterFactory.java
@@ -5,6 +5,7 @@
 
 import org.sheedon.serial.DataCheckBean;
 import org.sheedon.serial.DataConverter;
+import org.sheedon.serial.SafetyByteBuffer;
 
 /**
  * @Description: java类作用描述
@@ -28,13 +29,13 @@ private DataConverterFactory() {
 
     @Nullable
     @Override
-    public DataConverter<String, String> callbackNameConverter(String data) {
+    public DataConverter<byte[], Long> callbackNameCodeConverter(byte[] data) {
         return ruleConverter == null ? ruleConverter = new CallbackRuleConverter() : ruleConverter;
     }
 
     @Nullable
     @Override
-    public DataConverter<StringBuffer, DataCheckBean> checkDataConverter() {
+    public DataConverter<SafetyByteBuffer, DataCheckBean> checkDataConverter() {
         return checkConverter == null ? checkConverter = new CheckDataConverter() : checkConverter;
     }
 }
diff --git a/serial/build.gradle b/serial/build.gradle
index 66a921a..9d03e43 100644
--- a/serial/build.gradle
+++ b/serial/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 4
-        versionName "1.1.2"
+        versionCode 5
+        versionName "1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/serial/src/main/java/org/sheedon/serial/AsyncCallImpl.java b/serial/src/main/java/org/sheedon/serial/AsyncCallImpl.java
index 1a223b5..b217873 100644
--- a/serial/src/main/java/org/sheedon/serial/AsyncCallImpl.java
+++ b/serial/src/main/java/org/sheedon/serial/AsyncCallImpl.java
@@ -22,4 +22,7 @@ public interface AsyncCallImpl {
 
     // 反馈名称
     String backName();
+
+    // 反馈名称Code
+    long backNameCode();
 }
diff --git a/serial/src/main/java/org/sheedon/serial/DataConverter.java b/serial/src/main/java/org/sheedon/serial/DataConverter.java
index ad19798..afdc38f 100644
--- a/serial/src/main/java/org/sheedon/serial/DataConverter.java
+++ b/serial/src/main/java/org/sheedon/serial/DataConverter.java
@@ -13,7 +13,7 @@ public interface DataConverter<F, T> {
     T convert(F value);
 
     abstract class Factory {
-        public @Nullable DataConverter<String, String> callbackNameConverter(String topic) {
+        public @Nullable DataConverter<byte[], Long> callbackNameCodeConverter(byte[] topic) {
             return null;
         }
 
diff --git a/serial/src/main/java/org/sheedon/serial/DataConverterFactory.java b/serial/src/main/java/org/sheedon/serial/DataConverterFactory.java
index 6fee132..8519226 100644
--- a/serial/src/main/java/org/sheedon/serial/DataConverterFactory.java
+++ b/serial/src/main/java/org/sheedon/serial/DataConverterFactory.java
@@ -11,7 +11,7 @@
  */
 public abstract class DataConverterFactory extends DataConverter.Factory {
     public @Nullable
-    DataConverter<StringBuffer, DataCheckBean> checkDataConverter() {
+    DataConverter<SafetyByteBuffer, DataCheckBean> checkDataConverter() {
         return null;
     }
 }
diff --git a/serial/src/main/java/org/sheedon/serial/Dispatcher.java b/serial/src/main/java/org/sheedon/serial/Dispatcher.java
index 1be4dff..22dd807 100644
--- a/serial/src/main/java/org/sheedon/serial/Dispatcher.java
+++ b/serial/src/main/java/org/sheedon/serial/Dispatcher.java
@@ -4,13 +4,13 @@
 import androidx.annotation.Nullable;
 
 import java.util.ArrayDeque;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.DelayQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -35,10 +35,10 @@ public class Dispatcher {
 
 
     // 数据反馈处理集合
-    private final Map<String, Deque<String>> dataCalls = new LinkedHashMap<>();
+    private final Map<Long, Deque<String>> dataCalls = new LinkedHashMap<>();
 
     // 额外反馈集合
-    private final Map<String, Callback> callbacks = new ConcurrentHashMap<>();
+    private final Map<Long, Callback> callbacks = new ConcurrentHashMap<>();
 
     // 超时处理
     private TimeOutRunnable timeOut = new TimeOutRunnable(this);
@@ -61,26 +61,26 @@ public void setConverterFactories(List<DataConverter.Factory> converterFactories
      *
      * @param topic 主题
      */
-    public DataConverter<String, String> callbackNameConverter(String topic) {
-        return nextCallbackNameConverter(null, topic);
+    public DataConverter<byte[], Long> callbackNameCodeConverter(byte[] topic) {
+        return nextCallbackNameCodeConverter(null, topic);
     }
 
-    private DataConverter<String, String> nextCallbackNameConverter(
-            @Nullable DataConverter.Factory skipPast, String topic) {
+    private DataConverter<byte[], Long> nextCallbackNameCodeConverter(
+            @Nullable DataConverter.Factory skipPast, byte[] topic) {
         if (converterFactories == null || converterFactories.size() == 0)
             throw new IllegalStateException("converterFactories == null");
 
         int start = converterFactories.indexOf(skipPast) + 1;
         for (int i = start, count = converterFactories.size(); i < count; i++) {
-            DataConverter<String, String> converter =
-                    converterFactories.get(i).callbackNameConverter(topic);
+            DataConverter<byte[], Long> converter =
+                    converterFactories.get(i).callbackNameCodeConverter(topic);
             if (converter != null) {
                 return converter;
             }
         }
 
         StringBuilder builder = new StringBuilder("Could not locate ResponseBody converter for ")
-                .append(topic)
+                .append(Arrays.toString(topic))
                 .append(".\n");
         if (skipPast != null) {
             builder.append("  Skipped:");
@@ -109,18 +109,18 @@ synchronized void enqueueSerialCallback(String name, ResponseBody data) {
     /**
      * 核实数据转化器
      */
-    public DataConverter<StringBuffer, DataCheckBean> checkDataConverter() {
+    public DataConverter<SafetyByteBuffer, DataCheckBean> checkDataConverter() {
         return nextCheckDataConverter(null);
     }
 
-    private DataConverter<StringBuffer, DataCheckBean> nextCheckDataConverter(
+    private DataConverter<SafetyByteBuffer, DataCheckBean> nextCheckDataConverter(
             @Nullable DataConverter.Factory skipPast) {
         if (converterFactories == null || converterFactories.size() == 0)
             throw new IllegalStateException("converterFactories == null");
 
         int start = converterFactories.indexOf(skipPast) + 1;
         for (int i = start, count = converterFactories.size(); i < count; i++) {
-            DataConverter<StringBuffer, DataCheckBean> converter =
+            DataConverter<SafetyByteBuffer, DataCheckBean> converter =
                     ((DataConverterFactory) converterFactories.get(i)).checkDataConverter();
             if (converter != null) {
                 return converter;
@@ -152,12 +152,12 @@ public synchronized void enqueue(Runnable call) {
         publishService.execute(call);
     }
 
-    public void addCallback(String backName, Callback callback) {
-        callbacks.put(backName, callback);
+    public void addCallback(long backNameCode, Callback callback) {
+        callbacks.put(backNameCode, callback);
     }
 
-    public void removeCallback(String backName) {
-        callbacks.remove(backName);
+    public void removeCallback(long backNameCode) {
+        callbacks.remove(backNameCode);
     }
 
 
@@ -176,10 +176,10 @@ synchronized DelayEvent addTaskAndNetCall(AsyncCallImpl call) {
         DelayEvent event = DelayEvent.build(call.id(), call.delayDate());
 
         // 添加准备反馈任务集合
-        readyCalls.put(call.id(), ReadyTask.build(call.id(), call.backName(), call.callback(), event));
+        readyCalls.put(call.id(), ReadyTask.build(call.id(), call.backNameCode(), call.callback(), event));
 
         // 添加网络反馈集合
-        dataCalls.put(call.backName(), getNetCallDeque(call.backName(), call.id()));
+        dataCalls.put(call.backNameCode(), getNetCallDeque(call.backNameCode(), call.id()));
 
         return event;
     }
@@ -204,12 +204,12 @@ public synchronized void addLocalTimeOutCall(DelayEvent event) {
     /**
      * 填充反馈集合
      *
-     * @param name 反馈主题
+     * @param code 反馈主题Code
      * @param id   UUID
      * @return Deque<String>
      */
-    private Deque<String> getNetCallDeque(String name, String id) {
-        Deque<String> callbacks = dataCalls.get(name);
+    private Deque<String> getNetCallDeque(long code, String id) {
+        Deque<String> callbacks = dataCalls.get(code);
         if (callbacks == null)
             callbacks = new ArrayDeque<>();
 
@@ -225,9 +225,13 @@ private Deque<String> getNetCallDeque(String name, String id) {
      *
      * @param id 请求UUID
      */
-    public synchronized void finishedByNet(String id, String backName, Response response) {
+    public synchronized void finishedByNet(String id, long backNameCode, Response response) {
 
-        noticeCallback(backName, response);
+        noticeCallback(backNameCode, response);
+
+        if (id == null) {
+            return;
+        }
 
         ReadyTask task = distributeTask(id);
         if (task == null)
@@ -251,14 +255,14 @@ public synchronized void finishedByNet(String id, String backName, Response resp
     /**
      * 反馈通知
      *
-     * @param backName 反馈名
+     * @param backNameCode 反馈名Code
      * @param response 反馈结果
      */
-    private void noticeCallback(String backName, Response response) {
-        if (backName == null)
+    private void noticeCallback(long backNameCode, Response response) {
+        if (backNameCode == -1)
             return;
 
-        Callback callback = callbacks.get(backName);
+        Callback callback = callbacks.get(backNameCode);
 
         if (callback == null)
             return;
@@ -309,26 +313,24 @@ private ReadyTask distributeTask(String id) {
     private synchronized void removeCall(@NonNull ReadyTask task) {
 
         // 移除网络反馈监听
-        Deque<String> deque = dataCalls.get(task.getBackName());
+        Deque<String> deque = dataCalls.get(task.getBackNameCode());
 
         if (deque != null && deque.size() > 0)
             deque.remove(task.getId());
 
         readyCalls.remove(task.getId());
-
-
     }
 
 
     /**
      * 通过反馈名称得到网络集合中第一个数据，并且移除
      *
-     * @param backName 反馈名称
+     * @param backNameCode 反馈名称Code
      * @return uuid
      */
-    public String findNetByBackNameToFirst(String backName) {
+    public String findNetByBackNameToFirst(long backNameCode) {
         synchronized (dataCalls) {
-            Deque<String> deque = dataCalls.get(backName);
+            Deque<String> deque = dataCalls.get(backNameCode);
             if (deque == null || deque.size() == 0)
                 return null;
 
diff --git a/serial/src/main/java/org/sheedon/serial/ReadyTask.java b/serial/src/main/java/org/sheedon/serial/ReadyTask.java
index e7c37a5..16dfefb 100644
--- a/serial/src/main/java/org/sheedon/serial/ReadyTask.java
+++ b/serial/src/main/java/org/sheedon/serial/ReadyTask.java
@@ -8,16 +8,16 @@
  */
 public class ReadyTask {
     private String id;// 任务UUID
-    private String backName; // 反馈名称
+    private long backNameCode; // 反馈名称编号
     private Callback callback;// 反馈监听器
     private DelayEvent event;// 超时处理事件
 
 
-    public static ReadyTask build(String id, String backName,
+    public static ReadyTask build(String id, long backNameCode,
                                   Callback callback, DelayEvent event) {
         ReadyTask task = new ReadyTask();
         task.id = id;
-        task.backName = backName;
+        task.backNameCode = backNameCode;
         task.callback = callback;
         task.event = event;
         return task;
@@ -27,8 +27,8 @@ public String getId() {
         return id;
     }
 
-    public String getBackName() {
-        return backName;
+    public long getBackNameCode() {
+        return backNameCode;
     }
 
     public Callback getCallback() {
diff --git a/serial/src/main/java/org/sheedon/serial/RealCall.java b/serial/src/main/java/org/sheedon/serial/RealCall.java
index 04d17e3..4914df8 100644
--- a/serial/src/main/java/org/sheedon/serial/RealCall.java
+++ b/serial/src/main/java/org/sheedon/serial/RealCall.java
@@ -103,6 +103,11 @@ public String backName() {
             return originalRequest.backName();
         }
 
+        @Override
+        public long backNameCode() {
+            return originalRequest.backNameCode();
+        }
+
 
         public Callback callback() {
             return responseCallback;
diff --git a/serial/src/main/java/org/sheedon/serial/RealObservable.java b/serial/src/main/java/org/sheedon/serial/RealObservable.java
index f495ced..978c758 100644
--- a/serial/src/main/java/org/sheedon/serial/RealObservable.java
+++ b/serial/src/main/java/org/sheedon/serial/RealObservable.java
@@ -43,13 +43,12 @@ public Request request() {
     @Override
     public void subscribe(Callback callback) {
         if (originalRequest == null
-                || originalRequest.backName() == null
-                || originalRequest.backName().isEmpty()
+                || originalRequest.backNameCode() == -1
                 || callback == null) {
             return;
         }
 
-        client.dispatcher().addCallback(originalRequest.backName(), callback);
+        client.dispatcher().addCallback(originalRequest.backNameCode(), callback);
     }
 
     /**
@@ -58,11 +57,10 @@ public void subscribe(Callback callback) {
     @Override
     public void cancel() {
         if (originalRequest == null
-                || originalRequest.backName() == null
-                || originalRequest.backName().isEmpty()) {
+                || originalRequest.backNameCode() == -1) {
             return;
         }
-        client.dispatcher().removeCallback(originalRequest.backName());
+        client.dispatcher().removeCallback(originalRequest.backNameCode());
     }
 
     @Override
diff --git a/serial/src/main/java/org/sheedon/serial/Request.java b/serial/src/main/java/org/sheedon/serial/Request.java
index 6731363..38e8adc 100644
--- a/serial/src/main/java/org/sheedon/serial/Request.java
+++ b/serial/src/main/java/org/sheedon/serial/Request.java
@@ -1,5 +1,7 @@
 package org.sheedon.serial;
 
+import org.sheedon.serial.internal.CharsUtils;
+
 /**
  * @Description: 串口请求类
  * @Author: sheedon
@@ -13,6 +15,7 @@ public final class Request {
     final String backName;
     final Object tag;
 
+    private long backNameCode = -1;
 
 
     public int delayMilliSecond() {
@@ -23,6 +26,32 @@ public String backName() {
         return backName;
     }
 
+    /**
+     * 反馈名Code
+     */
+    public long backNameCode() {
+        if (backNameCode != -1)
+            return backNameCode;
+
+        if (backName == null || backName.isEmpty())
+            return -1;
+
+        return calcBackNameCode(CharsUtils.hexStringToBytes(backName));
+    }
+
+    /**
+     * 计算反馈名Code
+     *
+     * @param nameBytes 反馈名字节数组
+     */
+    private long calcBackNameCode(byte[] nameBytes) {
+        long code = 0;
+        for (byte nameByte : nameBytes) {
+            code = code * 256 + nameByte & 0xFF;
+        }
+        return code;
+    }
+
     public Request(RequestBuilder builder) {
         this.body = builder.body;
         this.delayMilliSecond = builder.delayMilliSecond;
diff --git a/serial/src/main/java/org/sheedon/serial/ResponseBody.java b/serial/src/main/java/org/sheedon/serial/ResponseBody.java
index f0d373e..4bc3156 100644
--- a/serial/src/main/java/org/sheedon/serial/ResponseBody.java
+++ b/serial/src/main/java/org/sheedon/serial/ResponseBody.java
@@ -11,14 +11,14 @@
  */
 public class ResponseBody {
 
-    private String startBit;
-    private String messageBit;
-    private String parityBit;
-    private String endBit;
-    private String info;
+    private byte[] startBit;
+    private byte[] messageBit;
+    private byte[] parityBit;
+    private byte[] endBit;
+    private byte[] info;
 
-    public static ResponseBody build(String startBit, String messageBit,
-                                     String parityBit, String endBit, String info) {
+    public static ResponseBody build(byte[] startBit, byte[] messageBit,
+                                     byte[] parityBit, byte[] endBit, byte[] info) {
         ResponseBody body = new ResponseBody();
         body.startBit = startBit;
         body.messageBit = messageBit;
@@ -28,39 +28,39 @@ public static ResponseBody build(String startBit, String messageBit,
         return body;
     }
 
-    public String getStartBit() {
+    public byte[] getStartBit() {
         return startBit;
     }
 
-    public void setStartBit(String startBit) {
+    public void setStartBit(byte[] startBit) {
         this.startBit = startBit;
     }
 
-    public String getMessageBit() {
+    public byte[] getMessageBit() {
         return messageBit;
     }
 
-    public void setMessageBit(String messageBit) {
+    public void setMessageBit(byte[] messageBit) {
         this.messageBit = messageBit;
     }
 
-    public String getParityBit() {
+    public byte[] getParityBit() {
         return parityBit;
     }
 
-    public void setParityBit(String parityBit) {
+    public void setParityBit(byte[] parityBit) {
         this.parityBit = parityBit;
     }
 
-    public String getEndBit() {
+    public byte[] getEndBit() {
         return endBit;
     }
 
-    public void setEndBit(String endBit) {
+    public void setEndBit(byte[] endBit) {
         this.endBit = endBit;
     }
 
-    public String getBody() {
+    public byte[] getBody() {
         return info;
     }
 
diff --git a/serial/src/main/java/org/sheedon/serial/SafetyByteBuffer.java b/serial/src/main/java/org/sheedon/serial/SafetyByteBuffer.java
new file mode 100644
index 0000000..688e436
--- /dev/null
+++ b/serial/src/main/java/org/sheedon/serial/SafetyByteBuffer.java
@@ -0,0 +1,114 @@
+package org.sheedon.serial;
+
+import java.util.Arrays;
+
+/**
+ * 线程安全可变字符序列
+ *
+ * @Author: sheedon
+ * @Email: sheedonsun@163.com
+ * @Date: 2020/4/22 21:45
+ */
+public class SafetyByteBuffer {
+
+    byte[] bytes;
+
+    private transient byte[] toBytesCache;
+
+    int count;
+
+    public SafetyByteBuffer() {
+        this(0);
+    }
+
+    public SafetyByteBuffer(int capacity) {
+        bytes = new byte[capacity];
+    }
+
+
+    public synchronized int length() {
+        return count;
+    }
+
+    /**
+     * 添加字节
+     *
+     * @param b 字节
+     * @return SafetyByteBuffer
+     */
+    public synchronized SafetyByteBuffer append(byte b) {
+        return append(new byte[]{b});
+    }
+
+    /**
+     * 添加字节数组
+     *
+     * @param newBytes 添加的字符数组内容
+     * @return SafetyByteBuffer
+     */
+    public synchronized SafetyByteBuffer append(byte[] newBytes) {
+        toBytesCache = null;
+        int newLenght = newBytes.length;
+        int allLenght = count + newLenght;
+        byte[] copy = new byte[allLenght];
+        System.arraycopy(bytes, 0, copy, 0, count);
+        System.arraycopy(newBytes, 0, copy, count, newLenght);
+        bytes = copy;
+        count = allLenght;
+        return this;
+    }
+
+    public synchronized SafetyByteBuffer delete(int start, int end) {
+        toBytesCache = null;
+        if (start < 0)
+            throw new StringIndexOutOfBoundsException(start);
+        if (end > count)
+            end = count;
+        if (start > end)
+            throw new StringIndexOutOfBoundsException();
+        int len = end - start;
+        if (len > 0) {
+            System.arraycopy(bytes, start + len, bytes, start, count - end);
+            count -= len;
+        }
+        return this;
+    }
+
+
+    public synchronized byte[] substring(int start, int end) {
+        if (start < 0)
+            throw new StringIndexOutOfBoundsException(start);
+        if (end > count)
+            throw new StringIndexOutOfBoundsException(end);
+        if (start > end)
+            throw new StringIndexOutOfBoundsException(end - start);
+        return Arrays.copyOfRange(bytes, start, end);
+    }
+
+    public int indexOf(byte b) {
+        return indexOf(b, 0);
+    }
+
+    public int indexOf(byte b, int fromIndex) {
+        if (fromIndex >= count) {
+            return -1;
+        }
+
+        for (int index = fromIndex; index < count; index++) {
+            if (bytes[index] == b) {
+                return index;
+            }
+        }
+
+        return -1;
+    }
+
+    public synchronized byte[] getBytes() {
+        if (toBytesCache == null) {
+            toBytesCache = Arrays.copyOfRange(bytes, 0, count);
+        }
+
+        return toBytesCache;
+    }
+
+}
diff --git a/serial/src/main/java/org/sheedon/serial/SerialRunnable.java b/serial/src/main/java/org/sheedon/serial/SerialRunnable.java
index 55c239a..128afa6 100644
--- a/serial/src/main/java/org/sheedon/serial/SerialRunnable.java
+++ b/serial/src/main/java/org/sheedon/serial/SerialRunnable.java
@@ -29,20 +29,20 @@ public class SerialRunnable extends NamedRunnable {
     protected void execute() {
 
         // 设置反馈名称和类型的默认值
-        String backName = name;
+        long backNameCode = -1;
 
         // 借助具体客户端工具转化反馈名
-        DataConverter<String, String> converter = dispatcher.callbackNameConverter(data.getBody());
+        DataConverter<byte[], Long> converter = dispatcher.callbackNameCodeConverter(data.getBody());
         if (converter != null) {
-            backName = converter.convert(data.getBody());
+            backNameCode = converter.convert(data.getBody());
         }
 
 
         // 获取UUID
-        String id = dispatcher.findNetByBackNameToFirst(backName);
+        String id = dispatcher.findNetByBackNameToFirst(backNameCode);
 
         // 结束网络调度
-        dispatcher.finishedByNet(id, backName, getResponse(data));
+        dispatcher.finishedByNet(id, backNameCode, getResponse(data));
     }
 
     /**
diff --git a/serial/src/main/java/org/sheedon/serial/internal/CharsUtils.java b/serial/src/main/java/org/sheedon/serial/internal/CharsUtils.java
index 3d5a65d..5618902 100644
--- a/serial/src/main/java/org/sheedon/serial/internal/CharsUtils.java
+++ b/serial/src/main/java/org/sheedon/serial/internal/CharsUtils.java
@@ -139,13 +139,12 @@ public static String byte2HexStr(byte[] b) {
      *
      * @return String 每个Byte值之间空格分隔
      */
-    public static String byte2HexStr2(byte[] b) {
+    public static String byte2HexStrNotEmpty(byte[] b) {
         String stmp;
         StringBuilder sb = new StringBuilder();
         for (byte value : b) {
-            stmp = Integer.toHexString(value);
+            stmp = Integer.toHexString(value & 0xFF);
             sb.append((stmp.length() == 1) ? "0" + stmp : stmp);
-            sb.append(" ");
         }
         return sb.toString().toUpperCase().trim();
     }
@@ -194,6 +193,42 @@ public static String convertHexToString(String hex){
         return sb.toString();
     }
 
+    /**
+     * 求校验和的算法
+     *
+     * @param msg 需要求校验和的字节数组
+     * @return 校验和
+     */
+    public static byte sumCheck(byte[] msg) {
+        long sum = 0;
+
+        /* 逐Byte添加位数和 */
+        for (byte byteMsg : msg) {
+            if (byteMsg < 0) {
+                sum += byteMsg & 0xff;
+            } else {
+                sum += byteMsg;
+            }
+
+            if (sum > 0xff) {
+                sum &= 0xff;
+            }
+        }
+
+        return (byte) (sum & 0xff);
+    }
+
+    public static String sumCheckToHexStr(byte[] msg) {
+        byte b = sumCheck(msg);
+        return byteToHex(b);
+    }
 
+    public static String byteToHex(byte b) {
+        String hex = Integer.toHexString(b & 0xFF);
+        if (hex.length() < 2) {
+            hex = "0" + hex;
+        }
+        return hex.toUpperCase().trim();
+    }
 
 }
diff --git a/serial/src/main/java/org/sheedon/serial/serialport/SerialPort.java b/serial/src/main/java/org/sheedon/serial/serialport/SerialPort.java
index 3144cae..82703f0 100644
--- a/serial/src/main/java/org/sheedon/serial/serialport/SerialPort.java
+++ b/serial/src/main/java/org/sheedon/serial/serialport/SerialPort.java
@@ -1,10 +1,10 @@
 package org.sheedon.serial.serialport;
 
-
 import org.sheedon.serial.DataCheckBean;
 import org.sheedon.serial.DataConverter;
 import org.sheedon.serial.Dispatcher;
 import org.sheedon.serial.NamedRunnable;
+import org.sheedon.serial.SafetyByteBuffer;
 import org.sheedon.serial.Util;
 import org.sheedon.serial.internal.CharsUtils;
 
@@ -28,8 +28,8 @@ public class SerialPort {
 
     private SerialRealCallback callback;
 
-    private DataConverter<StringBuffer, DataCheckBean> converter;
-    private StringBuffer serialData = new StringBuffer();
+    private DataConverter<SafetyByteBuffer, DataCheckBean> converter;
+    private SafetyByteBuffer serialData = new SafetyByteBuffer();
 
     private Thread thread;
 
@@ -93,14 +93,11 @@ protected void execute() {
          */
         private void readThread() {
 
-            final byte[] data = getDataByte();
+            byte[] data = getDataByte();
             if (data == null || callback == null)
                 return;
 
-            String info = CharsUtils.byte2HexStr(data)
-                    .replace(" ", "");
-
-            serialData.append(info);
+            serialData.append(data);
             dealWithData();
         }
     }
@@ -183,15 +180,15 @@ public void closeSerialPort() {
             serialPort = null;
         }
 
-        if(inputStream != null){
+        if (inputStream != null) {
             inputStream = null;
         }
 
-        if(outputStream != null){
+        if (outputStream != null) {
             outputStream = null;
         }
 
-        if(thread != null){
+        if (thread != null) {
             thread.interrupt();
             thread = null;
         }