From 15f3a0225ffda532c43da5737f7ef47fab868d05 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 28 一月 2021 13:38:58 +0800
Subject: [PATCH] 服务绑定不成功时 不发送数据
---
app/src/main/java/safeluck/drive/evaluation/app.java | 8 +---
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 9 ++++
app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java | 46 +++++++++++++----------
3 files changed, 37 insertions(+), 26 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();
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
index 10daff0..a76ad05 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
@@ -98,34 +98,40 @@
}
ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
public synchronized void sendInitialData(){
- if (checkPermission() && !hasSend){
- /**********鍙湁鏉冮檺婊¤冻锛堣鍐橲D鍗℃潈闄愶級鍜屾病鏈夊彂閫佽繃鐨勬儏鍐典笅鎵嶈繘琛屼互涓嬫搷浣�*********/
- hasSend = true;
- sendCarModelFile();
- sendRoadMapFile();
- sendItemsMapFile();
- sendJudgeArgs();
+ if ( ExamPlatformData.getInstance().getServceBindStatus()==0){
+ if (checkPermission() && !hasSend ){
+ /**********鍙湁鏉冮檺婊¤冻锛堣鍐橲D鍗℃潈闄愶級鍜屾病鏈夊彂閫佽繃鐨勬儏鍐典笅鎵嶈繘琛屼互涓嬫搷浣�*********/
+ hasSend = true;
+ sendCarModelFile();
+ sendRoadMapFile();
+ sendItemsMapFile();
+ sendJudgeArgs();
//闇�瑕佸欢杩熷彂閫侊紝鍥犱负鍓嶉潰鏈塰ttp璇锋眰
- executorService.schedule(()->{
- Log.i("AYJiaKao","寤惰繜鍙戦��");
-// if (DataInitKt.getSendVehiSucc() && (DataInitKt.getSendMapSucc() || DataInitKt.getSendRoadMapSucc())){
- CThreadPoolExecutor.runInBackground(()->{
- sendLightsAndExamStatus();
- });
+ executorService.schedule(()->{
+ Log.i("AYJiaKao","寤惰繜鍙戦��");
+ if (DataInitKt.getSendVehiSucc() && (DataInitKt.getSendMapSucc() || DataInitKt.getSendRoadMapSucc())){
+ CThreadPoolExecutor.runInBackground(()->{
+ sendLightsAndExamStatus();
+ });
-// }else{
- MyLog.i(DataInitKt.getSendRoadMapSucc()?String.format("閬撹矾鍦板浘鍙戦�佹垚鍔�"):"閬撹矾鍦板浘鍙戦�佸け璐�");
- MyLog.i(DataInitKt.getSendMapSucc()?String.format("鍦哄湴鍦板浘鍙戦�佹垚鍔�"):"鍦哄湴鍦板浘鍙戦�佸け璐�");
- MyLog.i(DataInitKt.getSendVehiSucc()?String.format("杞﹁締妯″瀷鍙戦�佹垚鍔�"):"杞﹁締妯″瀷鍙戦�佸け璐�");
- Toast.makeText(app.getAppContext(), "鍦板浘鎴栬溅妯″瀷涓嶅瓨鍦紝璇锋鏌ュ钩鍙伴厤缃垨鎵嬪伐閰嶇疆", Toast.LENGTH_SHORT).show();
-// }
+ }else{
+ MyLog.i(DataInitKt.getSendRoadMapSucc()?String.format("閬撹矾鍦板浘鍙戦�佹垚鍔�"):"閬撹矾鍦板浘鍙戦�佸け璐�");
+ MyLog.i(DataInitKt.getSendMapSucc()?String.format("鍦哄湴鍦板浘鍙戦�佹垚鍔�"):"鍦哄湴鍦板浘鍙戦�佸け璐�");
+ MyLog.i(DataInitKt.getSendVehiSucc()?String.format("杞﹁締妯″瀷鍙戦�佹垚鍔�"):"杞﹁締妯″瀷鍙戦�佸け璐�");
+ Toast.makeText(app.getAppContext(), "鍦板浘鎴栬溅妯″瀷涓嶅瓨鍦紝璇锋鏌ュ钩鍙伴厤缃垨鎵嬪伐閰嶇疆", Toast.LENGTH_SHORT).show();
+
+ }
},2, TimeUnit.SECONDS);
+ }else{
+ MyLog.i(hasSend?"宸茬粡鍙戦�佽繃浜嗗垵濮嬫暟鎹�":"鏉冮檺涓嶅厑璁革紝涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
+ }
}else{
- MyLog.i(hasSend?"宸茬粡鍙戦�佽繃浜嗗垵濮嬫暟鎹�":"鏉冮檺涓嶅厑璁革紝涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
+ MyLog.i("鏈嶅姟鏈粦瀹氭垚鍔燂紝涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
}
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index 77c7852..3c7a54d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -619,4 +619,13 @@
public String getMcuSN(){
return mcuSN;
}
+
+ private int bindServiceStats= -2;// 0-鏈嶅姟缁戝畾鎴愬姛 -1,鏈嶅姟寮傚父姝讳骸 -2-榛樿鍊艰繕鏈繘琛岀粦瀹氭湇鍔℃搷浣滐紱
+ public void setServiceBindStatus(int i) {
+ this.bindServiceStats = i;
+ }
+
+ public int getServceBindStatus(){
+ return bindServiceStats;
+ }
}
--
Gitblit v1.8.0