From ccb8c654aecc69c4562f96649d80427a534fff80 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 30 三月 2020 17:34:36 +0800
Subject: [PATCH] 修改评判信息utc时间为北京时间
---
app/src/main/java/safeluck/drive/evaluation/app.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 8f11cf7..c4d2568 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -69,6 +69,7 @@
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.SystemUtil;
+import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
import safeluck.drive.evaluation.worker.TTSWorker;
@@ -192,11 +193,13 @@
case Constant.JUDGE_INFO:
if(!TextUtils.isEmpty(json)){
- Data judgeData = new Data.Builder().putString(Constant.TTS,json).build();
- final JsonArray jsonArray = (JsonArray) JsonParser.parseString(json);
+ final JKMessage0203 jkMessage0203 = new JKMessage0203();
- OneTimeWorkRequest ttswoker = new OneTimeWorkRequest.Builder(TTSWorker.class).setInputData(judgeData).build();
- WorkManager.getInstance(getAppContext()).enqueue(ttswoker);
+// Data judgeData = new Data.Builder().putString(Constant.TTS,json).build();
+ final JsonArray jsonArray = (JsonArray) JsonParser.parseString(json);
+//
+// OneTimeWorkRequest ttswoker = new OneTimeWorkRequest.Builder(TTSWorker.class).setInputData(judgeData).build();
+// WorkManager.getInstance(getAppContext()).enqueue(ttswoker);
CThreadPoolExecutor.runInBackground(new Runnable() {
@Override
@@ -210,17 +213,31 @@
CriteriaForIII ttsStr=WorkRoomDataBase.getWorkRoomDataBase(getAppContext()).getCriteriaIIIDao().queryItemForCriteriaIIINoLive(emp_id-1000);
ExamPlatformData.getInstance().getTTS().speak(ttsStr.getDeducting_reason() + (ttsStr.getScore_deducting() == 100? "涓嶅悎鏍�" : "鎵�" +
ttsStr.getScore_deducting() + "鍒�"));
+ jkMessage0203.fail_item_id =ttsStr.getItem_id();
+ jkMessage0203.fail_score = ttsStr.getScore_deducting();
+ jkMessage0203.fail_reason = ttsStr.getDeducting_reason();
}else{
CriteriaForI ttsStr = WorkRoomDataBase.getWorkRoomDataBase(getAppContext()).getCriteriaIDao().queryItemForCriteriaINoLive(emp_id);
ExamPlatformData.getInstance().getTTS().speak(ttsStr.getDeducting_reason() + (ttsStr.getScore_deducting() == 100? "涓嶅悎鏍�" : "鎵�" +
ttsStr.getScore_deducting() + "鍒�"));
+ jkMessage0203.fail_item_id =ttsStr.getItem_id();
+ jkMessage0203.fail_score = ttsStr.getScore_deducting();
+ jkMessage0203.fail_reason = ttsStr.getDeducting_reason();
}
+ if (!TextUtils.isEmpty(utc) && utc.length() > 14) {
+ utc = utc.substring(0, 14);
+ }
+ Date date = new Date(Utils.utc2NetWorkTime(utc));
+ jkMessage0203.timeBCD = date;
+ MyLog.i(String.format("鏀跺埌杩滅▼鏈嶅姟缁欑殑璇勫垽娑堟伅 timeBCD=%s",Utils.formatTimeYYMMDDHHmmSS(jkMessage0203.timeBCD.getTime())));
+ MessageProcessor.getInstance().sendMessage(jkMessage0203);
if (emp_id<1000) { //鍦哄湴璇勫垽娑堟伅
if (emp_id > 31 || emp_id < 0) {
MyLog.i("emp_id瓒呭嚭鑼冨洿涓嶈兘鎻掑叆鏁版嵁搴擄紙I绫昏�冨満锛�");
}else{
+
FailedProj failedProj = new FailedProj(Constant.SUBJECT_I, emp_id, Constant.TEST_STU_ID, utc, sn);
MyLog.i("鎻掑叆fail_projects琛�=$failedProj");
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getFailProjDao().insert(failedProj);
@@ -232,6 +249,7 @@
if (emp_id >1066 || emp_id < 1000) {
MyLog.i("emp_id瓒呭嚭鑼冨洿涓嶈兘鎻掑叆鏁版嵁搴擄紙璺�冪被鑰冨満锛�");
}else{
+
LuKaoFailedProj failedProj = new LuKaoFailedProj(Constant.SUBJECT_III, (emp_id-1000), Constant.TEST_STU_ID, utc, sn);
MyLog.i("鎻掑叆璺�僨ail_projects琛�=$failedProj");
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getLuKaoFailProjDao().insert(failedProj);
--
Gitblit v1.8.0