From 77a7a59d01616ec5f321d72231fa1cfc5a407c07 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期四, 27 八月 2020 11:03:52 +0800
Subject: [PATCH] 坐标
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 2 +-
lib/src/main/cpp/native-lib.cpp | 2 +-
lib/src/main/cpp/rtk_module/rtk.cpp | 8 ++++----
lib/src/main/cpp/test_common/car_sensor.cpp | 4 ++--
lib/src/main/cpp/rtk_module/virtual_rtk.cpp | 4 ++--
5 files changed, 10 insertions(+), 10 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 9379f18..503525c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/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()
diff --git a/lib/src/main/cpp/native-lib.cpp b/lib/src/main/cpp/native-lib.cpp
index 1f47779..01992b4 100644
--- a/lib/src/main/cpp/native-lib.cpp
+++ b/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;
diff --git a/lib/src/main/cpp/rtk_module/rtk.cpp b/lib/src/main/cpp/rtk_module/rtk.cpp
index 732292e..58f397d 100644
--- a/lib/src/main/cpp/rtk_module/rtk.cpp
+++ b/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();
}
diff --git a/lib/src/main/cpp/rtk_module/virtual_rtk.cpp b/lib/src/main/cpp/rtk_module/virtual_rtk.cpp
index 0bf16b7..2b9df51 100644
--- a/lib/src/main/cpp/rtk_module/virtual_rtk.cpp
+++ b/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);
}
diff --git a/lib/src/main/cpp/test_common/car_sensor.cpp b/lib/src/main/cpp/test_common/car_sensor.cpp
index 7eaeef8..5301a21 100644
--- a/lib/src/main/cpp/test_common/car_sensor.cpp
+++ b/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 != '#') {
--
Gitblit v1.8.0