坐标

fctom1215

2020-08-27 77a7a59d01616ec5f321d72231fa1cfc5a407c07

坐标

 app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt

@@ -261,7 +261,7 @@
                                        ExamPlatformData.getInstance().setNewRoadMapPath(Environment.getExternalStorageDirectory().absolutePath + "/"
                                                + app.getAppContext().getPackageName() + "/" + fileName)
                                        CThreadPoolExecutor.runInBackground(Runnable {
                                            str = gson.toJson(map.data.map_json.map_json)
                                            str = gson.toJson(map.data.map_json)
                                            MyLog.i(PlatFormConstant.HTTPTAG,"科三道路地图保存成功")
                                            FileUtil.writeTxtFileToSD(app.getAppContext(), fileName, str, "")
                                            sendRoadMapInfo()

 lib/src/main/cpp/native-lib.cpp

@@ -27,7 +27,7 @@
const int RTK_PLATFORM_PORT = 12125;
const uint8_t phone[] = {0x20,0x19,0x10,0x15,0x00,0x00,0x00,0x01};

const char *VIRTUAL_RTK_IP = "192.168.16.100";
const char *VIRTUAL_RTK_IP = "192.168.1.5";
const int VIRTUAL_RTK_PORT = 9001;

static pthread_mutex_t tts_mutex = PTHREAD_MUTEX_INITIALIZER;

 lib/src/main/cpp/rtk_module/rtk.cpp

@@ -214,7 +214,7 @@
        }*/

        if (RxBufLen > 0) {
#if 0
#if 1
            const uint8_t *ptr = parseGPS(RxBuf, RxBuf + RxBufLen);
            if(ptr != RxBuf) {
                memcpy(RxBuf, ptr, RxBufLen - (ptr - RxBuf));
@@ -475,7 +475,7 @@

    DEBUG("RTK Module failure!!");

//    PlayTTS("RTK模块无法通讯");
//
//    CheckPjkParam();
    PlayTTS("RTK模块无法通讯", NULL);

    CheckPjkParam();
}

 lib/src/main/cpp/rtk_module/virtual_rtk.cpp

@@ -57,7 +57,7 @@

    if (fd > 0) {
        DEBUG("虚拟平台连接成功");
        PlayTTS("模拟器连接", NULL);
//        PlayTTS("模拟器连接", NULL);
    } else {
        DEBUG("虚拟平台连接失败");
    }
@@ -99,7 +99,7 @@

    free(vs);

    PlayTTS("模拟器断开", NULL);
//    PlayTTS("模拟器断开", NULL);

    pthread_exit(NULL);
}

 lib/src/main/cpp/test_common/car_sensor.cpp

@@ -157,7 +157,7 @@
    if (s->leftTurnLamp != Sensor.leftTurnLamp && s->leftTurnLamp != '#') {
        SensorChanged(SENSOR_LEFT_TURN_SIGNAL, BX(s->leftTurnLamp));
    }
    if (s->rightTurnLamp != Sensor.leftTurnLamp && s->rightTurnLamp != '#') {
    if (s->rightTurnLamp != Sensor.rightTurnLamp && s->rightTurnLamp != '#') {
        SensorChanged(SENSOR_RIGHT_TURN_SIGNAL, BX(s->rightTurnLamp));
    }
    if (s->fogLamp != Sensor.fogLamp && s->fogLamp != '#') {
@@ -169,7 +169,7 @@
    if (s->dippedBeamLamp != Sensor.dippedBeamLamp && s->dippedBeamLamp != '#') {
        SensorChanged(SENSOR_DIPPED_BEAM_LIGHT, BX(s->dippedBeamLamp));
    }
    if (s->mainBeamLamp != Sensor.leftTurnLamp && s->mainBeamLamp != '#') {
    if (s->mainBeamLamp != Sensor.mainBeamLamp && s->mainBeamLamp != '#') {
        SensorChanged(SENSOR_MAIN_BEAM_LIGHT, BX(s->mainBeamLamp));
    }
    if (s->seatBelt != Sensor.seatBelt && s->seatBelt != '#') {