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/fragment/TcpFragment.java | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 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;
--
Gitblit v1.8.0