From 0944b3bddbf5a981886cd6b643782476095bcfc9 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 18 二月 2020 17:31:55 +0800
Subject: [PATCH] phone字段修改为sn号；修改注册消息为后缀消息ID，便于根据反射取得消息ID；重构协议基类
---
app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
index e10896b..a8d061d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java
@@ -30,7 +30,7 @@
{
this.messageNo = getMessageNo();
String message_name = this.getClass().getSimpleName();
- if(message_name.startsWith("JTMessage"))
+ if(message_name.startsWith("JKMessage"))
{
String message_id = message_name.substring(9,13);
if(message_id.equals("Unkn") ){
@@ -39,8 +39,6 @@
this.messageId= coder.decode(message_id);
}
this.setMultiPacket(false);
- this.registerDisableField("totalPacket");
- this.registerDisableField("packetNo");
}
@@ -89,14 +87,14 @@
public int head=0x7E;
@Order(2)
@Int8
- public int protocalVer=0x80;
+ public int protocalVer=0xEB;
@Order(3)
@Int16
public int messageId;
@Order(4)
@Length(2)
@com.safeluck.aykj.annotation.BitState
- public BitState props = new BitState((byte) 0);
+ public BitState props = new BitState((short) 0);
@Order(5)
@Phone
public String phone;
@@ -106,12 +104,12 @@
@Order(7)
@Int8
public int reserved = 0;
- @Order(8)
- @Int16
- public int totalPacket;
- @Order(9)
- @Int16
- public int packetNo;
+// @Order(8)
+// @Int16
+// public int totalPacket;
+// @Order(9)
+// @Int16
+// public int packetNo;
@Order(Integer.MAX_VALUE-10001)
--
Gitblit v1.8.0