From c3e207bd4a37f4f4cafbf43b897592ac3c582e45 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期二, 02 二月 2021 13:07:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/app.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 3ec7ab8..8a437bb 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -2,14 +2,12 @@
import android.app.Application;
import android.content.Context;
-import android.os.Environment;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import androidx.annotation.NonNull;
-import androidx.work.Configuration;
import androidx.work.Data;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
@@ -32,7 +30,6 @@
import org.json.JSONException;
import org.json.JSONObject;
-import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -40,12 +37,9 @@
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;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusOutWorker;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
-import safeluck.drive.evaluation.DB.failitems.LuKaoFailedProj;
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
import safeluck.drive.evaluation.DB.route.RouteCross;
import safeluck.drive.evaluation.DB.route.RouteTriggerLine;
@@ -717,10 +711,12 @@
MyLog.i(String.format("bindStatus = %d",code));
if (code == 0){
ExamPlatformData.getInstance().getTTS().speak("鏈嶅姟缁戝畾鎴愬姛");
+ ExamPlatformData.getInstance().setServiceBindStatus(0);
initData();
}else{
ExamPlatformData.getInstance().getTTS().speak("鏈嶅姟寮傚父姝讳骸");
MyLog.i("鏈嶅姟寮傚父姝讳骸鐩戝惉鍒颁箣鍚庯紝閲嶇疆鍙戦�佹爣蹇楋紝鐒跺悗鍙戦�佹暟鎹�");
+ ExamPlatformData.getInstance().setServiceBindStatus(-1);
AbsInitialData.getInstance().resethasSendInitData();
AbsInitialData.getInstance().sendInitialData();
}
--
Gitblit v1.8.0