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/JKMessage0100.java | 2
im_lib/src/main/java/com/anyun/im_lib/netty/TCPReadHandler.java | 8 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 38 +++++-------------
app/src/main/java/safeluck/drive/evaluation/platformMessage/JK2019MessageBase.java | 20 ++++-----
4 files changed, 25 insertions(+), 43 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index fac1003..50165f4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -30,12 +30,12 @@
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.GainStuMessage;
import safeluck.drive.evaluation.platformMessage.JKClientCommonMessage;
+import safeluck.drive.evaluation.platformMessage.JKMessage0100;
import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.platformMessage.JKMessage0201;
import safeluck.drive.evaluation.platformMessage.JKMessage0202;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
-import safeluck.drive.evaluation.platformMessage.JKRegisterMessage;
import safeluck.drive.evaluation.platformMessage.RegisterMessage;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
@@ -161,13 +161,9 @@
String strbcd=ByteUtil.bcd2Str(ByteUtil.str2Bcd("13021245"));
Log.i(TAG, "onClick: strbcd="+strbcd);
-// JKRegisterMessage jkRegisterMessage = new JKRegisterMessage();
-// jkRegisterMessage.setMessageLen(55);
-//// jkRegisterMessage.phone = "13021245";
-// jkRegisterMessage.phone = "0008618513021245";
+// JKMessage0100 jkRegisterMessage = new JKMessage0100();
+// jkRegisterMessage.phone = "0314200100000004";
// jkRegisterMessage.proviceid = 23;
-// jkRegisterMessage.messageId = 0x100;
-// jkRegisterMessage.protocalVer = 235;
// jkRegisterMessage.cityid = 1;
// jkRegisterMessage.imei = "460123874561";
// jkRegisterMessage.model = "123";
@@ -200,12 +196,10 @@
break;
case R.id.btn_register:
- JKRegisterMessage jkRegisterMessage = new JKRegisterMessage();
- jkRegisterMessage.setMessageLen(55);
- jkRegisterMessage.phone = "0008618513021245";
+ JKMessage0100 jkRegisterMessage = new JKMessage0100();
+// jkRegisterMessage.setMessageLen(55);
+ jkRegisterMessage.phone = "0314200100000004";
jkRegisterMessage.proviceid = 23;
- jkRegisterMessage.messageId = 0x100;
- jkRegisterMessage.protocalVer = 235;
jkRegisterMessage.cityid = 1;
jkRegisterMessage.imei = "460123874561";
jkRegisterMessage.model = "123";
@@ -218,9 +212,7 @@
break;
case R.id.btn_auth:
JKMessage0101 jkMessage0101 = new JKMessage0101();
- jkMessage0101.messageId = 0x0101;
- jkMessage0101.phone = "0008618513021245";
- jkMessage0101.protocalVer = 235;
+ jkMessage0101.phone = "0314200100000004";
jkMessage0101.des ="0102030405060708";
jkMessage0101.timestamp = (int) System.currentTimeMillis();
byte[] jjk0101 = jkMessage0101.toBytes();
@@ -228,19 +220,15 @@
break;
case R.id.btn_gain:
JKMessage0201 jkMessage0201 = new JKMessage0201();
- jkMessage0201.protocalVer = 235;
- jkMessage0201.phone = "0008618513021245";
- jkMessage0201.messageId = 0x0201;
+ jkMessage0201.phone = "0314200100000004";
jkMessage0201.currentExam = 1;
jkMessage0201.id = "123456789";
MessageProcessor.getInstance().sendMessage(jkMessage0201.toBytes());
break;
case R.id.btn_start_exam:
JKMessage0202 jkMessage0202 = new JKMessage0202();
- jkMessage0202.protocalVer = 235;
- jkMessage0202.phone = "0008618513021245";
+ jkMessage0202.phone = "0314200100000004";
jkMessage0202.timeBCD = new Date();
- jkMessage0202.messageId = 0x0202;
jkMessage0202.curr_exam = 1;
jkMessage0202.ID = "123456789";
jkMessage0202.exam_id = 123456;
@@ -248,9 +236,7 @@
break;
case R.id.btn_fail:
JKMessage0203 jkMessage0203 = new JKMessage0203();
- jkMessage0203.messageId = 0x0203;
- jkMessage0203.phone = "0008618513021245";
- jkMessage0203.protocalVer = 235;
+ jkMessage0203.phone = "0314200100000004";
jkMessage0203.timeBCD = new Date();
jkMessage0203.fail_item_id = 4;
jkMessage0203.fail_score = 10;
@@ -263,9 +249,7 @@
break;
case R.id.btn_stop_exam:
JKMessage0204 jkMessage0204 = new JKMessage0204();
- jkMessage0204.messageId = 0x0204;
- jkMessage0204.protocalVer = 235;
- jkMessage0204.phone = "0008618513021245";
+ jkMessage0204.phone = "0314200100000004";
jkMessage0204.timeBCD = new Date();
jkMessage0204.score = 10;
jkMessage0204.stop = JKMessage0204.SUCC_STOP;
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)
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKRegisterMessage.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0100.java
similarity index 89%
rename from app/src/main/java/safeluck/drive/evaluation/platformMessage/JKRegisterMessage.java
rename to app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0100.java
index 28684cb..d0dc0fd 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKRegisterMessage.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0100.java
@@ -6,7 +6,7 @@
import com.safeluck.aykj.annotation.Length;
import com.safeluck.aykj.annotation.Order;
-public class JKRegisterMessage extends JK2019MessageBase {
+public class JKMessage0100 extends JK2019MessageBase {
@Order(1)
@Int16
diff --git a/im_lib/src/main/java/com/anyun/im_lib/netty/TCPReadHandler.java b/im_lib/src/main/java/com/anyun/im_lib/netty/TCPReadHandler.java
index ff2bec0..4b1717f 100644
--- a/im_lib/src/main/java/com/anyun/im_lib/netty/TCPReadHandler.java
+++ b/im_lib/src/main/java/com/anyun/im_lib/netty/TCPReadHandler.java
@@ -66,10 +66,10 @@
req[0] = 0x7E;
req[len+1] = 0x7e;
Log.i(TAG, "channelRead hex str: "+ ByteUtil.byte2HexStr(req));
-// if (req!=null && req.length>0){
-//
-// imsClient.getMsgDispatcher().receivedMsg( req );
-// }
+ if (req!=null && req.length>0){
+
+ imsClient.getMsgDispatcher().receivedMsg( req );
+ }
}
}
--
Gitblit v1.8.0