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/bean/AbsInitialData.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
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("鏈嶅姟鏈粦瀹氭垚鍔燂紝涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
}
+
}
--
Gitblit v1.8.0