From 2242a796345bceb301cf3e2094f2a4871cb81cb6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 13 八月 2020 18:22:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/app.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 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 23357ad..07539dc 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -20,7 +20,7 @@
import me.yokeyword.fragmentation.Fragmentation;
import me.yokeyword.fragmentation.helper.ExceptionHandler;
-import com.anyun.exam.lib.MyLog;
+import com.anyun.basecommonlib.MyLog;
import com.anyun.exam.lib.crash.CrashHandler;
import com.facebook.stetho.Stetho;
import com.google.gson.JsonArray;
@@ -37,6 +37,7 @@
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusOutWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusWoker;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
@@ -56,7 +57,6 @@
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SystemUtil;
import safeluck.drive.evaluation.util.Utils;
-import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
/**
* MyApplication2
@@ -87,7 +87,6 @@
crashHandler.init(getApplicationContext());
AYSdk.getInstance().init(getApplicationContext());
AYSdk.getInstance().registListener(this);
- MyLog.createIfNotExist();
Stetho.initializeWithDefaults(this);
appContext = this;
@@ -140,6 +139,9 @@
private String lastStr;
private String lastSn;
+ private int mapId = 0;
+ int type = 0;
+ int enter_status = -1;
@Override
public void callBackMsg(final int cmd, String json) {
String strConent = String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s", cmd, json);
@@ -181,11 +183,8 @@
if(!TextUtils.isEmpty(json)){
final JKMessage0203 jkMessage0203 = new JKMessage0203();
-// 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
@@ -324,12 +323,13 @@
WorkManager.getInstance(getApplicationContext()).enqueue(gpsinfoWorkRequest);
break;
case Constant.ENTER_OR_EXIT_ITEM:
- int type = 0;
- int enter_status = -1;
+
try {
JSONObject rtkConfigUpdtea = new JSONObject(json);
type = rtkConfigUpdtea.getInt("type");
enter_status = rtkConfigUpdtea.getInt("enter");
+ mapId = rtkConfigUpdtea.getInt("map_id");
+
String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
MyLog.i(PlatFormConstant.LUKAO,String.format("%s",itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�")));
if (ExamPlatformData.getInstance().getTrainingMode()== ExamPlatformData.TRAINING_MODE){
@@ -355,9 +355,21 @@
} catch (JSONException e) {
e.printStackTrace();
}
- Data exam_enter_exitdata = new Data.Builder().putString(Constant.exam_enter_exitdata,json).build();
- OneTimeWorkRequest examStatusWorker = new OneTimeWorkRequest.Builder(ExamStatusWoker.class).setInputData(exam_enter_exitdata).build();
- WorkManager.getInstance(getApplicationContext()).enqueue(examStatusWorker);
+
+ MyLog.i("鏀跺埌鍛戒护13="+json);
+ CThreadPoolExecutor.runInBackground(new Runnable() {
+ @Override
+ public void run() {
+ ExamStatus examStatus = new ExamStatus();
+ examStatus.setEnter(enter_status);
+ examStatus.setMap_id(mapId);
+ examStatus.setMap_item(type);
+ WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().insert(examStatus);
+ }
+ });
+// Data exam_enter_exitdata = new Data.Builder().putString(Constant.exam_enter_exitdata,json).build();
+// OneTimeWorkRequest examStatusWorker = new OneTimeWorkRequest.Builder(ExamStatusWoker.class).setInputData(exam_enter_exitdata).build();
+// WorkManager.getInstance(getApplicationContext()).enqueue(examStatusWorker);
break;
case Constant.REAL_TIME_CAR_POS:
try {
--
Gitblit v1.8.0