地图或车模型有一失败就不发送考试考试

endian11

2020-12-04 bde7f140ef75a1434ec3a2b698433bd767ba4943

地图或车模型有一失败就不发送考试考试

 app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java

@@ -77,6 +77,7 @@
                        DataInitKt.getMap(ExamPlatformData.getInstance().getMcuSN(),"car");
                }else{
                    MyLog.i("sn为空，不能请求http下载车模型");
                    DataInitKt.sendVehicleInfo();
                }
            }

@@ -90,7 +91,8 @@
                if (ExamPlatformData.getInstance().getMcuSN() != null){
                    DataInitKt.getMap(ExamPlatformData.getInstance().getMcuSN(),"road");
                }else{
                    MyLog.i("sn为空，不能请求http下载道路");
                    MyLog.i("sn为空，不能请求http下载道路；但可以发送用户选择的道路文件");
                    DataInitKt.sendRoadMapInfo();
                }
            }
    }
@@ -106,7 +108,8 @@
                if (ExamPlatformData.getInstance().getMcuSN() != null){
                    DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");
                }else{
                    MyLog.i("sn为空，不能请求http下载场地");
                    MyLog.i("sn为空，不能请求http下载场地但可以发送用户选择的场地文件");
                    DataInitKt.sendMapInfo();
                }
            }
    }
@@ -122,7 +125,13 @@
//需要延迟发送，因为前面有http请求
            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{

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