From 2f5311a7f088f7da4742de3036d33c9abd99c23f Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 13 二月 2020 21:06:36 +0800
Subject: [PATCH] 增加消息体长度

---
 app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java |    4 +++-
 app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java   |   12 ++++++++++--
 app/src/main/java/safeluck/drive/evaluation/bean/KeepaliveMessage.java  |    9 ++++++++-
 app/src/main/java/safeluck/drive/evaluation/bean/GainStuMessage.java    |   16 +++++++++-------
 app/src/main/java/safeluck/drive/evaluation/bean/StartExamMessage.java  |   11 ++++++++++-
 5 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java b/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java
index 5bbf99a..22b9760 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/DriveExamProtocol.java
@@ -79,7 +79,7 @@
      * @return
      */
     public byte[] toBytes(){
-        byte[] desBytes = new byte[1+16+2+1+1];
+        byte[] desBytes = new byte[1+16+msgBodyLength()+1+1];
         int pos = 0;
 
 
@@ -133,4 +133,6 @@
         return tranferbytes;
     }
 
+    protected abstract int msgBodyLength();
+
 }
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/GainStuMessage.java b/app/src/main/java/safeluck/drive/evaluation/bean/GainStuMessage.java
index 74960fd..a37e9fa 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/GainStuMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/GainStuMessage.java
@@ -8,19 +8,21 @@
  * All Rights Saved! Chongqing AnYun Tech co. LTD
  */
 public class GainStuMessage extends DriveExamProtocol {
-    // TODO: 2019/12/19
-    /**
-     * 鏋勯�犲嚱鏁�
-     *
-     * @param msg_id 娑堟伅ID
-     */
+
+    private static final int BODY_LENGTH = 0;
+
     public GainStuMessage(short msg_id) {
         super(msg_id);
     }
 
     @Override
+    protected int msgBodyLength() {
+        return BODY_LENGTH;
+    }
+
+    @Override
     protected byte[] createMessageBody() {
 
-        return new byte[0];
+        return new byte[BODY_LENGTH];
     }
 }
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/KeepaliveMessage.java b/app/src/main/java/safeluck/drive/evaluation/bean/KeepaliveMessage.java
index f04f4e1..7667772 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/KeepaliveMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/KeepaliveMessage.java
@@ -9,6 +9,8 @@
  */
 public class KeepaliveMessage extends DriveExamProtocol {
 
+
+    private static final int BODY_LENGTH = 0;
 // TODO: 2019/12/19  
 
     public KeepaliveMessage(short msg_id) {
@@ -16,7 +18,12 @@
     }
 
     @Override
+    protected int msgBodyLength() {
+        return BODY_LENGTH;
+    }
+
+    @Override
     protected byte[] createMessageBody() {
-        return new byte[0];
+        return new byte[BODY_LENGTH];
     }
 }
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java b/app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java
index 5565ee1..e92fca3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java
@@ -8,6 +8,8 @@
  * All Rights Saved! Chongqing AnYun Tech co. LTD
  */
 public class RegisterMessage extends DriveExamProtocol {
+
+    private static final int BODY_LENGTH = 3;
     /**
      * 鏋勯�犲嚱鏁�
      *
@@ -18,9 +20,15 @@
     }
 
     @Override
+    protected int msgBodyLength() {
+        return BODY_LENGTH;
+    }
+
+
+    @Override
     protected byte[] createMessageBody() {
-        byte[] messageBody = new byte[2];
-        messageBody[0] = 0x65;
+        byte[] messageBody = new byte[BODY_LENGTH];
+        messageBody[0] = 0x7E;
         messageBody[1] = 0x66;
         return messageBody;
     }
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/StartExamMessage.java b/app/src/main/java/safeluck/drive/evaluation/bean/StartExamMessage.java
index 37794ff..bf0adb3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/StartExamMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/StartExamMessage.java
@@ -8,6 +8,10 @@
  * All Rights Saved! Chongqing AnYun Tech co. LTD
  */
 public class StartExamMessage extends DriveExamProtocol {
+
+
+
+    private static final int BODY_LENGTH = 0;
 // TODO: 2019/12/19  
     /**
      * 鏋勯�犲嚱鏁�
@@ -19,7 +23,12 @@
     }
 
     @Override
+    protected int msgBodyLength() {
+        return BODY_LENGTH;
+    }
+
+    @Override
     protected byte[] createMessageBody() {
-        return new byte[0];
+        return new byte[BODY_LENGTH];
     }
 }

--
Gitblit v1.8.0