From d12bcd5acd046d5021072587b4e95c020948e0be Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 10:57:20 +0800
Subject: [PATCH] 平台消息基类取电话号码，删除子类取电话号码的操作；训练模式只发送注册鉴权位置消息，其他不发送；Netty TCP增加重置TCP连接接口；收到单片机sn更新的时候重置tcp
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 4527745..79ede48 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -130,7 +130,6 @@
String icStr = jsSpeed.getString("serialno");
if (result == 0) {
JKMessage0201 jkMessage0201 = new JKMessage0201();
- jkMessage0201.phone = ExamPlatformData.getInstance().getPhone();
if (exam_type==Constant.Chang_di){
jkMessage0201.currentExam = 0;
}else{
@@ -498,7 +497,6 @@
currTotalScore = 100;
//TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
final JKMessage0202 jkMessage0202 = new JKMessage0202();
- jkMessage0202.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0202.timeBCD = new Date();
jkMessage0202.ID = ExamPlatformData.getInstance().getID();
@@ -595,7 +593,14 @@
private void stopExam() {
MyLog.i(TAG,"缁撴潫鑰冭瘯");
-
+ //TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
+ JKMessage0204 jkMessage0204 = new JKMessage0204();
+ jkMessage0204.timeBCD = new Date();
+ jkMessage0204.score = currTotalScore;
+ jkMessage0204.stop = JKMessage0204.SUCC_STOP;
+ jkMessage0204.ID = ExamPlatformData.getInstance().getID();
+ jkMessage0204.exam_id = ExamPlatformData.getInstance().getExam_id();
+ MessageProcessor.getInstance().sendMessage(jkMessage0204);
//璁剧疆妯″紡涓篘ONE 0
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
//鎭㈠鍒濆鏁版嵁
@@ -612,15 +617,7 @@
ExamPlatformData.getInstance().getTTS().speak("缁撴潫鑰冭瘯");
examStatusViewModel.updateStartExam(Constant.NONE_BEEN_START_EXAM);
sendExamJson(0,0);//缁撴潫鑰冭瘯 exstart=0
- //TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
- JKMessage0204 jkMessage0204 = new JKMessage0204();
- jkMessage0204.phone = ExamPlatformData.getInstance().getPhone();
- jkMessage0204.timeBCD = new Date();
- jkMessage0204.score = 10;
- jkMessage0204.stop = JKMessage0204.SUCC_STOP;
- jkMessage0204.ID = ExamPlatformData.getInstance().getID();
- jkMessage0204.exam_id = ExamPlatformData.getInstance().getExam_id();
- MessageProcessor.getInstance().sendMessage(jkMessage0204);
+
}
private ICEventListener icEventListener = new ICEventListener() {
--
Gitblit v1.8.0