From d57b3fb06749c28d9ceeb28a01783c328c1d49a1 Mon Sep 17 00:00:00 2001
From: lixiao <932184220@qq.com>
Date: Sun, 11 May 2025 09:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=BC=82=E5=B8=B8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/cpp/sdk/common/HVersion.h   |  2 +-
 entry/src/main/cpp/sdk/exam/ExamSensor.cpp | 55 +++++++++++++---------
 entry/src/main/ets/pages/Index.ets         |  2 +-
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/entry/src/main/cpp/sdk/common/HVersion.h b/entry/src/main/cpp/sdk/common/HVersion.h
index 64d0e3a3..25e2bf04 100644
--- a/entry/src/main/cpp/sdk/common/HVersion.h
+++ b/entry/src/main/cpp/sdk/common/HVersion.h
@@ -27,7 +27,7 @@
 #define JUDGE_VERSION_MAJOR  1
 #define JUDGE_VERSION_MINOR  0
 #define JUDGE_VERSION_PATCH  3
-#define JUDGE_VERSION_STAMP  "2505071805b"
+#define JUDGE_VERSION_STAMP  "2505091540b"
 #if JUDGE_USE_OLD
 #   undef JUDGE_VERSION_STAMP
 #   define JUDGE_VERSION_STAMP  "2411121010b.old"
diff --git a/entry/src/main/cpp/sdk/exam/ExamSensor.cpp b/entry/src/main/cpp/sdk/exam/ExamSensor.cpp
index f556551a..ef701bf9 100644
--- a/entry/src/main/cpp/sdk/exam/ExamSensor.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamSensor.cpp
@@ -50,12 +50,11 @@ bool ExamSensor::pretreatment(TChuanGan* cg)
         return false;
     }
 
-    if(!cg->real.gps.rtkEnabled)
-    {
-        //cg->move = moveUnknown;
-        //cg->real.gps.ai_gps = Pointi(0, 0);
-        return true;
-    }
+    //2025-05-09  //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
+    //if(!cg->real.gps.rtkEnabled)
+    //{
+    //    return true;
+    //}
 
     ExamSubject subject = m_car->examSubject();
     if(subject == ExamSubject2)
@@ -534,24 +533,29 @@ bool ExamSensor::GetCarDirStauts(TChuanGan* cg)
 
     if(!m_initGPSFlag)
     {
-        if(cg->real.gps.rtkEnabled == true)
-        {
-            m_initGPSFlag = true;
-            setStatus(cg, moveStop);
-            m_stopOffset = cg->real.gps.ai_gps;
-        }
-        else
-        {
-            //数据异常
-            return true;  //如果从一开始考试一直在非差分状态 如果返回false就进不了评判了 比如模拟灯光 20240726
-        }
+        m_initGPSFlag = true;
+        setStatus(cg, moveStop);
+        m_stopOffset = cg->real.gps.ai_gps;
+        //2025-05-09 KM3  //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
+        //if(cg->real.gps.rtkEnabled == true)
+        //{
+        //    m_initGPSFlag = true;
+        //    setStatus(cg, moveStop);
+        //    m_stopOffset = cg->real.gps.ai_gps;
+        //}
+        //else
+        //{
+        //    //数据异常
+        //    return true;  //如果从一开始考试一直在非差分状态 如果返回false就进不了评判了 比如模拟灯光 20240726
+        //}
     }
 
     //if(cg.Rtk_Enabled = False) or (Lscg[zj(1)].Rtk_Enabled = False) or (Lscg[zj(2)].Rtk_Enabled = False) then Exit;
-    if(cg->move == moveStop && cg->real.gps.rtkEnabled == false)
-    {
-        return false;
-    }
+    //2025-05-09 KM3 //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
+    //if(cg->move == moveStop && cg->real.gps.rtkEnabled == false)
+    //{
+    //    return false;
+    //}
 
     static constexpr int MoveAgainCm = 20;
     //1、拿到通用的停车时间阈值
@@ -584,7 +588,7 @@ bool ExamSensor::GetCarDirStauts(TChuanGan* cg)
             int b = 0, c = 0;
             if(I == 0)
             {
-                if(cg->real.gps.rtkEnabled == false) continue;
+                //if(cg->real.gps.rtkEnabled == false) continue; //2025-05-09 KM3 //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
                 b = m_stopOffset.x - cg->real.gps.ai_gps.x;
                 c = m_stopOffset.y - cg->real.gps.ai_gps.y;
             }
@@ -789,6 +793,10 @@ bool ExamSensor::GetCarDirStatus_KM2(TChuanGan* cg)
 
     if(!m_initGPSFlag)
     {
+        //m_initGPSFlag = true;
+        //setStatus(cg, moveStop);
+        //m_stopOffset = cg->real.gps.ai_gps;
+        //2025-05-09 KM2  //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
         if(cg->real.gps.rtkEnabled == true)
         {
             m_initGPSFlag = true;
@@ -803,6 +811,7 @@ bool ExamSensor::GetCarDirStatus_KM2(TChuanGan* cg)
     }
 
     //if(cg.Rtk_Enabled = False) or (Lscg[zj(1)].Rtk_Enabled = False) or (Lscg[zj(2)].Rtk_Enabled = False) then Exit;
+    //2025-05-09 KM2  //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
     if(cg->move == moveStop && cg->real.gps.rtkEnabled == false)
     {
         return false;
@@ -872,7 +881,7 @@ bool ExamSensor::GetCarDirStatus_KM2(TChuanGan* cg)
             int b = 0, c = 0;
             if(I == 0)
             {
-                if(cg->real.gps.rtkEnabled == false) continue;
+                if(cg->real.gps.rtkEnabled == false) continue; //2025-05-09 KM2 //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
                 b = m_stopOffset.x - cg->real.gps.ai_gps.x;
                 c = m_stopOffset.y - cg->real.gps.ai_gps.y;
             }
diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets
index 19e1fdfd..16dd71a4 100644
--- a/entry/src/main/ets/pages/Index.ets
+++ b/entry/src/main/ets/pages/Index.ets
@@ -62,7 +62,7 @@ struct Index {
   private context = getContext(this) as common.UIAbilityContext;
   private serviceExtProxy: IdlServiceExtProxy
   @State judgeVersion: string = ""
-  private version: string = "2025.05.08.01"
+  private version: string = "2025.05.09.01"
 
   @Styles
   commStyle(){