From d23168be49c7113f11a2def8a5c30d0345255a69 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 25 十二月 2020 11:50:04 +0800
Subject: [PATCH] http getmap 不再以是否考试状态（场地、道路训练）来发送地图，任何情况下都发
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
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 3c99ace..0998d35 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -330,15 +330,12 @@
sendVehicleInfo()
}
if (str.contains("yard")){
- if (ExamPlatformData.getInstance().examType ==ExamPlatformData.EXAM_TYPE_ChangKAO) {
sendMapInfo()
- }
}
if (str.contains("road")){
- if (ExamPlatformData.getInstance().examType > ExamPlatformData.EXAM_TYPE_ChangKAO) {
+
sendRoadMapInfo()
- }
}
// Toast.makeText(applicationContext, jsonObject1!!.getString("data"), Toast.LENGTH_SHORT).show()
@@ -357,19 +354,21 @@
val fileContent = FileUtil.readFile(mapPath)
if (fileContent != null) {
val str = String(fileContent)
- sendmapAndVehi = true
+ sendMapSucc = true
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.PUSH_MAP_INFO, str)
} else {
- sendmapAndVehi = false
+ sendMapSucc = false
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�", mapPath))
CThreadPoolExecutor.runOnMainThread { Toast.makeText(app.getAppContext(), "鏂囦欢锛�" + mapPath + "涓嶅瓨鍦�", Toast.LENGTH_SHORT).show() }
}
}else{
- sendmapAndVehi = false
+ sendMapSucc = false
}
}
//鏍囪杞﹁締妯″瀷鎴栧湴鍥� 鍙戦�佹垚鍔熺殑鏍囧織-true
-var sendmapAndVehi = false
+var sendVehiSucc = false
+var sendRoadMapSucc= false
+var sendMapSucc= false
fun sendVehicleInfo(){
val carPath = ExamPlatformData.getInstance().carModelPath
if (!TextUtils.isEmpty(carPath)) {
@@ -377,14 +376,14 @@
val bytes = FileUtil.readFile(carPath)
if (bytes != null) {
val str = String(bytes)
- sendmapAndVehi = true
+ sendVehiSucc = true
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.PUSH_VECHILE_PROFILE, str)
} else {
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�", carPath))
- sendmapAndVehi = false
+ sendVehiSucc = false
}
}else{
- sendmapAndVehi = false
+ sendVehiSucc = false
}
}
fun sendRoadMapInfo(){
@@ -395,15 +394,15 @@
val fileContent = FileUtil.readFile(roadmapPath)
if (fileContent != null) {
val str = String(fileContent)
- sendmapAndVehi = true
+ sendRoadMapSucc = true
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.PUSH_ROAD_MAP_INFO, str)
} else {
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�", roadmapPath))
- sendmapAndVehi = false
+ sendRoadMapSucc = false
CThreadPoolExecutor.runOnMainThread { Toast.makeText(app.getAppContext(), "鏂囦欢锛�" + roadmapPath + "涓嶅瓨鍦�", Toast.LENGTH_SHORT).show() }
}
} else {
- sendmapAndVehi = false
+ sendRoadMapSucc = false
}
}
--
Gitblit v1.8.0