From bde7f140ef75a1434ec3a2b698433bd767ba4943 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 04 十二月 2020 15:32:43 +0800
Subject: [PATCH] 地图或车模型有一失败就不发送考试考试
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 24 ++++++++++++++++++++++--
app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java | 15 ++++++++++++---
2 files changed, 34 insertions(+), 5 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 37bcad6..c016652 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
@@ -77,6 +77,7 @@
DataInitKt.getMap(ExamPlatformData.getInstance().getMcuSN(),"car");
}else{
MyLog.i("sn涓虹┖锛屼笉鑳借姹俬ttp涓嬭浇杞︽ā鍨�");
+ DataInitKt.sendVehicleInfo();
}
}
@@ -90,7 +91,8 @@
if (ExamPlatformData.getInstance().getMcuSN() != null){
DataInitKt.getMap(ExamPlatformData.getInstance().getMcuSN(),"road");
}else{
- MyLog.i("sn涓虹┖锛屼笉鑳借姹俬ttp涓嬭浇閬撹矾");
+ MyLog.i("sn涓虹┖锛屼笉鑳借姹俬ttp涓嬭浇閬撹矾锛涗絾鍙互鍙戦�佺敤鎴烽�夋嫨鐨勯亾璺枃浠�");
+ DataInitKt.sendRoadMapInfo();
}
}
}
@@ -106,7 +108,8 @@
if (ExamPlatformData.getInstance().getMcuSN() != null){
DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");
}else{
- MyLog.i("sn涓虹┖锛屼笉鑳借姹俬ttp涓嬭浇鍦哄湴");
+ MyLog.i("sn涓虹┖锛屼笉鑳借姹俬ttp涓嬭浇鍦哄湴浣嗗彲浠ュ彂閫佺敤鎴烽�夋嫨鐨勫満鍦版枃浠�");
+ DataInitKt.sendMapInfo();
}
}
}
@@ -122,7 +125,13 @@
//闇�瑕佸欢杩熷彂閫侊紝鍥犱负鍓嶉潰鏈塰ttp璇锋眰
executorService.schedule(()->{
Log.i("AYJiaKao","寤惰繜鍙戦��");
- sendLightsAndExamStatus();},1, TimeUnit.SECONDS);
+ if (DataInitKt.getSendmapAndVehi()){
+ sendLightsAndExamStatus();
+ }else{
+ MyLog.i("鍦板浘鎴栬溅妯″瀷瀛樺湪鍙戦�佸け璐ョ殑鎯呭喌");
+ Toast.makeText(app.getAppContext(), "鍦板浘鎴栬溅妯″瀷涓嶅瓨鍦紝璇锋鏌ュ钩鍙伴厤缃垨鎵嬪伐閰嶇疆", Toast.LENGTH_SHORT).show();
+ }
+ },1, TimeUnit.SECONDS);
}else{
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
index 3dd8ff5..af083a3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -270,6 +270,9 @@
}
+ }else{
+ MyLog.i(PlatFormConstant.HTTPTAG,"杩斿洖澶辫触锛屽垯鍙戦�佺敤鎴峰凡缁忛�夋嫨鐨勯亾璺枃浠�")
+ sendRoadMapInfo()
}}
"yard" ->{
mapInfoHead.type = BaseDataUIBean.TYPE_.yard
@@ -290,6 +293,9 @@
sendMapInfo()
})
}
+ }else{
+ MyLog.i(PlatFormConstant.HTTPTAG,"杩斿洖澶辫触锛屽垯鍙戦�佺敤鎴峰凡缁忛�夋嫨鐨勫満鍦版枃浠�")
+ sendMapInfo()
}
}
else ->{
@@ -312,6 +318,9 @@
})
}
+ }else{
+ MyLog.i(PlatFormConstant.HTTPTAG,"杩斿洖澶辫触锛屽垯鍙戦�佺敤鎴峰凡缁忛�夋嫨鐨勮溅杈嗘ā鍨嬫枃浠�")
+ sendVehicleInfo()
}
}
}
@@ -333,14 +342,19 @@
val fileContent = FileUtil.readFile(mapPath)
if (fileContent != null) {
val str = String(fileContent)
+ sendmapAndVehi = true
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.PUSH_MAP_INFO, str)
} else {
+ sendmapAndVehi = false
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�", mapPath))
CThreadPoolExecutor.runOnMainThread { Toast.makeText(app.getAppContext(), "鏂囦欢锛�" + mapPath + "涓嶅瓨鍦�", Toast.LENGTH_SHORT).show() }
}
+ }else{
+ sendmapAndVehi = false
}
}
-
+//鏍囪杞﹁締妯″瀷鎴栧湴鍥� 鍙戦�佹垚鍔熺殑鏍囧織-true
+var sendmapAndVehi = false
fun sendVehicleInfo(){
val carPath = ExamPlatformData.getInstance().carModelPath
if (!TextUtils.isEmpty(carPath)) {
@@ -348,10 +362,14 @@
val bytes = FileUtil.readFile(carPath)
if (bytes != null) {
val str = String(bytes)
+ sendmapAndVehi = true
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.PUSH_VECHILE_PROFILE, str)
} else {
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�", carPath))
+ sendmapAndVehi = false
}
+ }else{
+ sendmapAndVehi = false
}
}
fun sendRoadMapInfo(){
@@ -362,13 +380,15 @@
val fileContent = FileUtil.readFile(roadmapPath)
if (fileContent != null) {
val str = String(fileContent)
+ sendmapAndVehi = true
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.PUSH_ROAD_MAP_INFO, str)
} else {
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�", roadmapPath))
+ sendmapAndVehi = false
CThreadPoolExecutor.runOnMainThread { Toast.makeText(app.getAppContext(), "鏂囦欢锛�" + roadmapPath + "涓嶅瓨鍦�", Toast.LENGTH_SHORT).show() }
}
} else {
-
+ sendmapAndVehi = false
}
}
--
Gitblit v1.8.0