From b213c3e542fc71b31b6ad1e9da6958eaec6d5b41 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 13 一月 2021 09:24:09 +0800
Subject: [PATCH] 修改评判表数据库，只能rtkconfig sn变化的时候发送一次initdata
---
app/src/main/java/safeluck/drive/evaluation/app.java | 113 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 32 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 01d67bd..3ec7ab8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -39,6 +39,7 @@
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
+import safeluck.drive.evaluation.DB.criterias.Criteria;
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
@@ -48,6 +49,7 @@
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
import safeluck.drive.evaluation.DB.route.RouteCross;
import safeluck.drive.evaluation.DB.route.RouteTriggerLine;
+import safeluck.drive.evaluation.DB.rtktb.RTKConfigUpdateWorker;
import safeluck.drive.evaluation.bean.AbsInitialData;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.RemoteRouteCollect;
@@ -158,7 +160,8 @@
sendRouteExam();
- DataInitKt.sendRtkConfig(getApplicationContext());
+ //2021 1. 12
+// DataInitKt.sendRtkConfig(getApplicationContext());
// DataInitKt.MCUUpgrade(getApplicationContext());
//鏀瑰湪钃濈墮宸茬粡杩炴帴锛屽彂閫乮nitialdata
@@ -319,21 +322,51 @@
int emp_id = jsonObject.get("wrong_id").getAsInt();
String utc = jsonObject.get("utc").getAsString();
int sn = jsonObject.get("sn").getAsInt();
- if (emp_id>1000){
- CriteriaForIII ttsStr=WorkRoomDataBase.getWorkRoomDataBase(getAppContext()).getCriteriaIIIDao().queryItemForCriteriaIIINoLive(emp_id-1000);
+// if (emp_id>1000){
+// 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();
+// }
+
+
+
+
+
+
+
+
+
+
+ Criteria ttsStr=WorkRoomDataBase.getWorkRoomDataBase(getAppContext()).getCriteriaDao().queryItemForCriteriaNoLive(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();
- }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);
}
@@ -343,30 +376,46 @@
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绫昏�冨満锛�");
+// 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);
+// }
+//
+// }
+// if (emp_id>1000) { //閬撹矾 璇勫垽娑堟伅
+//
+// 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);
+// }
+//
+// }
- }else{
- FailedProj failedProj = new FailedProj(Constant.SUBJECT_I, emp_id, Constant.TEST_STU_ID, utc, sn);
+
+
+
+
+ FailedProj failedProj = new FailedProj(Constant.SUBJECT_ALL, emp_id, Constant.TEST_STU_ID, utc, sn);
MyLog.i("鎻掑叆fail_projects琛�=$failedProj");
- WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getFailProjDao().insert(failedProj);
- }
+ WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getFailProjDao().insert(failedProj);
- }
- if (emp_id>1000) { //閬撹矾 璇勫垽娑堟伅
- 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);
- }
- }
+
+
+
}
}
@@ -524,7 +573,7 @@
try {
JSONObject rtkConfigUpdtea = new JSONObject(json);
sn = rtkConfigUpdtea.getString("sn");
- sn = rtkConfigUpdtea.put(safeluck.drive.evaluation.DB.Constant.RTK_CONFIG_SN,sn).toString();
+// sn = rtkConfigUpdtea.put(safeluck.drive.evaluation.DB.Constant.RTK_CONFIG_SN,sn).toString();
} catch (JSONException e) {
e.printStackTrace();
}
@@ -537,9 +586,9 @@
}
lastSn = sn;
ExamPlatformData.getInstance().setMcuSN(sn);
-// Data data = new Data.Builder().putString(safeluck.drive.evaluation.DB.Constant.RTK_CONFIG_UPDATE_JSON,sn).build();
-// OneTimeWorkRequest rtkConfigUpdateWorker= new OneTimeWorkRequest.Builder(RTKConfigUpdateWorker.class).setInputData(data).build();
-// WorkManager.getInstance(getAppContext()).enqueue(rtkConfigUpdateWorker);
+ Data data = new Data.Builder().putString(safeluck.drive.evaluation.DB.Constant.RTK_CONFIG_UPDATE_JSON,sn).build();
+ OneTimeWorkRequest rtkConfigUpdateWorker= new OneTimeWorkRequest.Builder(RTKConfigUpdateWorker.class).build();
+ WorkManager.getInstance(getAppContext()).enqueue(rtkConfigUpdateWorker);
}
CEventCenter.dispatchEvent(Constant.BIND_MCUINFO_TOPIC,cmd,0,json);
break;
--
Gitblit v1.8.0