From e6d6b7778b0fc51908e7bf9d2eacec84ffc14aff Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期三, 28 四月 2021 22:18:59 +0800
Subject: [PATCH] 路口提示提前距离由70改为60
---
lib/src/main/cpp/test_items2/through_something.cpp | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/lib/src/main/cpp/test_items2/through_something.cpp b/lib/src/main/cpp/test_items2/through_something.cpp
index 82f25c9..3186830 100644
--- a/lib/src/main/cpp/test_items2/through_something.cpp
+++ b/lib/src/main/cpp/test_items2/through_something.cpp
@@ -188,17 +188,36 @@
if (RoadMap.calibrate == 0) {
if (!(it->second & REDUCE_SPEED)) {
// 涓嶆寜瑙勫畾鍑忛�燂紝涓嶅悎鏍�
- DEBUG("涓嶆寜瑙勫畾鍑忛��");
+ DEBUG("璺彛 涓嶆寜瑙勫畾鍑忛��");
- if (ExamSchemeCrossing(RoadMap, road, x) == ROAD_ACTIVE_FORWARD) {
- AddExamFault(40701, rtkTime);
- } else if (ExamSchemeCrossing(RoadMap, road, x) ==
- ROAD_ACTIVE_TURN_LEFT) {
- AddExamFault(40801, rtkTime);
- } else if (ExamSchemeCrossing(RoadMap, road, x) ==
- ROAD_ACTIVE_TURN_RIGHT) {
- AddExamFault(40901, rtkTime);
+ switch (ExamSchemeCrossing(RoadMap, road, x) ) {
+ case ROAD_ACTIVE_FORWARD:
+ DEBUG("璺彛鐩磋鏈噺閫�");
+ AddExamFault(40701, rtkTime);
+ break;
+ case ROAD_ACTIVE_TURN_LEFT:
+ DEBUG("璺彛宸﹁浆鏈噺閫�");
+ AddExamFault(40801, rtkTime);
+ break;
+ case ROAD_ACTIVE_TURN_RIGHT:
+ DEBUG("璺彛鍙宠浆鏈噺閫�");
+ AddExamFault(40901, rtkTime);
+ break;
+ default:
+ DEBUG("璺彛 鏈厤缃� 鏈噺閫�");
+ break;
}
+
+
+// if (ExamSchemeCrossing(RoadMap, road, x) == ROAD_ACTIVE_FORWARD) {
+// AddExamFault(40701, rtkTime);
+// } else if (ExamSchemeCrossing(RoadMap, road, x) ==
+// ROAD_ACTIVE_TURN_LEFT) {
+// AddExamFault(40801, rtkTime);
+// } else if (ExamSchemeCrossing(RoadMap, road, x) ==
+// ROAD_ACTIVE_TURN_RIGHT) {
+// AddExamFault(40901, rtkTime);
+// }
}
if (!(it->second & STOP_CAR) && RoadMap.roads[road].stopLine[x].stopFlag) {
// 涓嶅仠杞︾灜鏈涳紝涓嶅悎鏍�
--
Gitblit v1.8.0