From 7ad5b81283c39e66ba2ca84314e283f277fc77e0 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期五, 03 四月 2020 11:39:17 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/test_items/park_edge.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/src/main/cpp/test_items/park_edge.cpp b/lib/src/main/cpp/test_items/park_edge.cpp
index 921ce34..6836600 100644
--- a/lib/src/main/cpp/test_items/park_edge.cpp
+++ b/lib/src/main/cpp/test_items/park_edge.cpp
@@ -54,6 +54,8 @@
parkSuccess = false;
parkStatus = 0;
occurMoveBack = false;
+
+ // 浠呭綋鍙戠敓鍊掕溅锛屾墠鎰忓懗鐫�椤圭洰寮�濮�
if (moveStatus == -1) {
occurMoveBack = true;
moveBackTimePoint = TimeMakeComposite(rtkTime->hh, rtkTime->mm, rtkTime->ss, rtkTime->mss*10);
@@ -63,23 +65,23 @@
int TestParkEdge(const Polygon *map, const car_model *car, const car_model *carPrev, double speed, int moveStatus, const struct RtkTime *rtkTime)
{
if (CrashRedLine1(map, car)) {
- if (!occurCrashRedLine1) {
+ if (!occurCrashRedLine1 && occurMoveBack) {
// 杞﹁疆鍘嬭竟绾匡紝姣忔鎵�10鍒�
AddExamFault(23, rtkTime);
DEBUG("杞﹁疆鍘嬭竟绾�");
+ occurCrashRedLine1 = true;
}
- occurCrashRedLine1 = true;
} else {
occurCrashRedLine1 = false;
}
if (CrashRedLine2(map, car)) {
- if (!occurCrashRedLine2) {
+ if (!occurCrashRedLine2 && occurMoveBack) {
// 杞﹁韩鍘嬪簱浣嶇嚎锛屾瘡娆℃墸10鍒�
AddExamFault(24, rtkTime);
DEBUG("杞﹁韩鍘嬪簱浣嶇嚎");
+ occurCrashRedLine2 = true;
}
- occurCrashRedLine2 = true;
} else {
occurCrashRedLine2 = false;
}
@@ -121,7 +123,7 @@
if (moveStatus == storeMoveStatusBeforeStop) {
// 鍚屾柟鍚戝啀鍚姩锛岀户缁垽鏂槸鍚﹀仠杞﹁秴鏃�
- if (tp - stopTimepoint >= STOP_CAR_TIME) {
+ if (tp - stopTimepoint >= STOP_CAR_TIME && occurMoveBack) {
// 鍋滆溅瓒�2绉掞紝姣忔鎵�5鍒�
AddExamFault(26, rtkTime);
DEBUG("鍋滆溅瓒呮椂");
--
Gitblit v1.8.0