http getmap 不再以是否考试状态（场地、道路训练）来发送地图，任何情况下都发

endian11

2020-12-25 d23168be49c7113f11a2def8a5c30d0345255a69

http getmap 不再以是否考试状态（场地、道路训练）来发送地图，任何情况下都发

 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 @@
//需要延迟发送，因为前面有http请求
            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);

 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
    }
}