From 27c78b3431a38878b8c8b1b81c79694cea4a2bcf Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 23 七月 2020 10:07:51 +0800
Subject: [PATCH] 20200723

---
 lib/src/main/cpp/test_items2/drive_straight.cpp |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/cpp/test_items2/drive_straight.cpp b/lib/src/main/cpp/test_items2/drive_straight.cpp
index 4e006f3..6d505b9 100644
--- a/lib/src/main/cpp/test_items2/drive_straight.cpp
+++ b/lib/src/main/cpp/test_items2/drive_straight.cpp
@@ -72,9 +72,9 @@
         reportOffsetOver = true;
 
         //////////////////////////////////////////////
-        startPoint = car->basePoint;
-        edgeDistance = dis2roadEdge;
-        reportOffsetOver = false;
+//        startPoint = car->basePoint;
+//        edgeDistance = dis2roadEdge;
+//        reportOffsetOver = false;
     }
 
     if (distanceToStart > CHECK_STAGE_DISTANCE) {
@@ -99,6 +99,7 @@
     if (id == examTtsSeq) {
         DEBUG("StopCarTTSDone %d", id);
         ttsPlayEnd = 1;
+        AppTimer_delete(PlayTTSTimeout);
     }
 }
 
@@ -141,9 +142,11 @@
 
 FIND_VP_END:
     if (get_vp) {
+        DEBUG("寰楀埌鍨傜偣 %d: %f, %f -- %f, %f", road.id, car->basePoint.X, car->basePoint.Y, vp.X, vp.Y);
         distance = DistanceOf(car->basePoint, vp);
     } else {
         // 娌℃湁鎵惧埌鍖归厤绾跨锛屾寜鏈�灏忚窛绂婚《鐐硅绠�
+        DEBUG("鏃犲瀭鐐�");
         distance = 100;
         for (int i = 0; i < road.leftEdge.size(); ++i) {
             for (int j = 0; j < road.leftEdge[i].points.size(); ++j) {

--
Gitblit v1.8.0