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 +++++++++++++--------------
app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java | 28 ++++++----------------------
2 files changed, 19 insertions(+), 36 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 c016652..73ab536 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
@@ -7,33 +7,15 @@
import android.widget.Toast;
import com.anyun.basecommonlib.MyLog;
-import com.anyun.exam.lib.AYSdk;
-import com.google.gson.Gson;
-import org.json.JSONObject;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import okhttp3.ResponseBody;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-import safeluck.drive.evaluation.Constant;
+
import safeluck.drive.evaluation.app;
-import safeluck.drive.evaluation.httpmodule.HttpCarRespBean;
-import safeluck.drive.evaluation.httpmodule.HttpRequetBean;
-import safeluck.drive.evaluation.httpmodule.HttpRoadMapRsp;
-import safeluck.drive.evaluation.httpmodule.HttpYardRsp;
-import safeluck.drive.evaluation.httpmodule.RetrofitCreator;
-import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
-import safeluck.drive.evaluation.util.CThreadPoolExecutor;
+
import safeluck.drive.evaluation.util.DataInitKt;
-import safeluck.drive.evaluation.util.FileUtil;
import static safeluck.drive.evaluation.util.DataInitKt.sendJudgeArgs;
@@ -125,10 +107,12 @@
//闇�瑕佸欢杩熷彂閫侊紝鍥犱负鍓嶉潰鏈塰ttp璇锋眰
executorService.schedule(()->{
Log.i("AYJiaKao","寤惰繜鍙戦��");
- if (DataInitKt.getSendmapAndVehi()){
+ if (DataInitKt.getSendVehiSucc() && (DataInitKt.getSendMapSucc() || DataInitKt.getSendRoadMapSucc())){
sendLightsAndExamStatus();
}else{
- MyLog.i("鍦板浘鎴栬溅妯″瀷瀛樺湪鍙戦�佸け璐ョ殑鎯呭喌");
+ 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();
}
},1, TimeUnit.SECONDS);
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