From 7d2ab4d46ea7ff92b77070be18ead8376b0d71e9 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 31 三月 2020 17:53:37 +0800
Subject: [PATCH] 提交0203 exam-id
---
app/src/main/java/safeluck/drive/evaluation/app.java | 1 +
app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt | 8 ++++----
app/src/main/java/safeluck/drive/evaluation/util/Utils.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java | 1 +
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 10 ++++++----
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 5 +++--
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 01c37fd..6cfdaf9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -229,6 +229,7 @@
}
Date date = new Date(Utils.utc2NetWorkTime(utc));
jkMessage0203.timeBCD = date;
+ jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
MyLog.i(String.format("鏀跺埌杩滅▼鏈嶅姟缁欑殑璇勫垽娑堟伅 timeBCD=%s",Utils.formatTimeYYMMDDHHmmSS(jkMessage0203.timeBCD.getTime())));
MessageProcessor.getInstance().sendMessage(jkMessage0203);
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 551316e..5da3de4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -362,8 +362,9 @@
MyLog.i("璺�冨綋鍓嶅緱鍒嗭細"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i("璺�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
- ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
- stopExam();
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+ stopExam();
+
}
MyLog.i("璺�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
@@ -408,8 +409,9 @@
MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i("鍦鸿�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
- ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
- stopExam();
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+ stopExam();
+
}
MyLog.i("鍦鸿�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
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 5902847..6564fe4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -32,6 +32,7 @@
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import safeluck.drive.evaluation.DB.criterias.viewmodel.CriteriaIViewModel;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.AttachInfo;
import safeluck.drive.evaluation.platformMessage.JKMessage0001;
@@ -231,12 +232,12 @@
jkMessage0202.timeBCD = new Date();
jkMessage0202.curr_exam = 1;
jkMessage0202.ID = "123456789";
- jkMessage0202.exam_id = 123456;
+ jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
MessageProcessor.getInstance().sendMessage(jkMessage0202);
break;
case R.id.btn_fail:
JKMessage0203 jkMessage0203 = new JKMessage0203();
- jkMessage0203.timeBCD = new Date(utc2NetWorkTime("20200330101455"));
+// jkMessage0203.timeBCD = new Date(utc2NetWorkTime("20200330101455"));
jkMessage0203.fail_item_id = 4;
jkMessage0203.fail_score = 10;
jkMessage0203.fail_reason = "鍙戝姩鏈哄惎鍔ㄥ悗锛屼笉鍙婃椂鏉惧紑鍚姩寮�鍏�";
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
index 88cf5d1..8ad68c9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
@@ -15,6 +15,7 @@
@Length(18)
@Ascii
public String ID;
+
@Order(2)
@BcdDateTime
public Date timeBCD;
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
index 014230f..94f2ded 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
@@ -484,7 +484,7 @@
} catch (ParseException e) {
e.printStackTrace();
}
- long utcTime = date.getTime()+8*60*60*1000;
+ long utcTime = date.getTime();
return utcTime;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt b/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
index 4662ce5..7545a09 100644
--- a/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
@@ -136,14 +136,14 @@
- if (!TextUtils.isEmpty(utc) && utc.length > 12) {
- utc = utc.substring(0, 12)
+ if (!TextUtils.isEmpty(utc) && utc.length > 14) {
+ utc = utc.substring(2, 14)
}
val date = Date(Utils.utc2NetWorkTime(utc))
- jkMessage0203.timeBCD = date
+// jkMessage0203.timeBCD = date
- MessageProcessor.getInstance().sendMessage(jkMessage0203)
+// MessageProcessor.getInstance().sendMessage(jkMessage0203)
--
Gitblit v1.8.0