From 4e307b0d89c9a84916bbbc2119e41d34c6badc13 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 14 二月 2020 16:39:49 +0800
Subject: [PATCH] 修改平台协议文档；调通注册消息；

---
 app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java |  113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 110 insertions(+), 3 deletions(-)

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 52ac0ce..dbfff02 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/RegisterMessage.java
@@ -1,5 +1,12 @@
 package safeluck.drive.evaluation.bean;
 
+
+import android.text.TextUtils;
+
+import com.anyun.im_lib.util.ByteUtil;
+
+import static com.anyun.im_lib.util.ByteUtil.shortGetBytes;
+
 /**
  * 娉ㄥ唽娑堟伅
  * MyApplication2
@@ -9,7 +16,42 @@
  */
 public class RegisterMessage extends DriveExamProtocol {
 
-    private static final int BODY_LENGTH = 2;
+    /**
+     * 1.1.1	缁堢娉ㄥ唽
+     * 娑堟伅ID锛�0x0100銆�
+     * 璧峰瀛楄妭
+     * 瀛楁
+     * 鏁版嵁绫诲瀷
+     * 鎻忚堪鍙婅姹�
+     * 0
+     * 鐪佸煙ID
+     * WORD
+     * 缁堢鎵�鍦ㄥ湴鐪両D
+     * 2
+     * 甯傚幙鍩烮D
+     * WORD
+     * 缁堢鎵�鍦ㄥ湴甯侷D
+     * 4
+     * 缁堢鍨嬪彿
+     * BYTE[20]
+     * 20涓瓧鑺傦紝姝ょ粓绔瀷鍙风敱鍒堕�犲晢鑷瀹氫箟锛屼綅鏁颁笉瓒�20浣嶇殑锛屽悗琛モ��0X00鈥�
+     * 24
+     * 缁堢鍑哄巶搴忓垪鍙�
+     * BYTE[8]
+     * 8涓瓧鑺傦紝鐢卞ぇ鍐欏瓧姣嶅拰鏁板瓧缁勬垚锛屾缁堢ID鐢卞埗閫犲晢鑷瀹氫箟锛屼綅鏁颁笉瓒虫椂锛屽悗琛モ��0X00鈥�
+     * 32
+     * IMEI
+     * BYTE[15]
+     * 鍥介檯绉诲姩璁惧鏍囪瘑锛孉SCII鐮�
+     */
+    private static final int BODY_LENGTH = 55;
+
+    private short proviceId;
+    private short cityid;
+    private String model;//缁堢鍨嬪彿
+    private String sn;//鍑哄巶搴忓垪鍙�
+    private String imei;//
+
     /**
      * 鏋勯�犲嚱鏁�
      *
@@ -17,6 +59,50 @@
      */
     public RegisterMessage(short msg_id) {
         super(msg_id);
+    }
+
+    public static int getBodyLength() {
+        return BODY_LENGTH;
+    }
+
+    public short getProviceId() {
+        return proviceId;
+    }
+
+    public void setProviceId(short proviceId) {
+        this.proviceId = proviceId;
+    }
+
+    public short getCityid() {
+        return cityid;
+    }
+
+    public void setCityid(short cityid) {
+        this.cityid = cityid;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getImei() {
+        return imei;
+    }
+
+    public void setImei(String imei) {
+        this.imei = imei;
     }
 
     @Override
@@ -27,9 +113,30 @@
 
     @Override
     protected byte[] createMessageBody() {
+        int pos = 0;
         byte[] messageBody = new byte[BODY_LENGTH];
-        messageBody[0] = 0x65;
-        messageBody[1] = 0x67;
+        //鐪佸煙ID
+        byte[] provinceIdBytes = ByteUtil.shortGetBytes(proviceId);
+        System.arraycopy(provinceIdBytes,0,messageBody,pos,provinceIdBytes.length);
+        pos += provinceIdBytes.length;
+        //甯傚煙ID
+        byte[] cityIdBytes = ByteUtil.shortGetBytes(cityid);
+        System.arraycopy(cityIdBytes,0,messageBody,pos,cityIdBytes.length);
+        pos += cityIdBytes.length;
+        //model
+        byte[] modelBytes = !TextUtils.isEmpty(model)?model.getBytes():"".getBytes();
+        System.arraycopy(modelBytes,0,messageBody,pos,modelBytes.length);
+        pos += 20;
+
+        //sn
+        byte[] snBytes = !TextUtils.isEmpty(sn)?sn.getBytes():"".getBytes();
+        System.arraycopy(snBytes,0,messageBody,pos,snBytes.length);
+        pos += 16;
+
+        //IMEI
+        byte[] imeiBytes = !TextUtils.isEmpty(imei)?imei.getBytes():"".getBytes();
+        System.arraycopy(imeiBytes,0,messageBody,pos,imeiBytes.length);
+
         return messageBody;
     }
 }

--
Gitblit v1.8.0