From 2a9b4a4f4d51170c5d35e467ebc13b9de23c6641 Mon Sep 17 00:00:00 2001
From: lixiao <932184220@qq.com>
Date: Fri, 9 May 2025 12:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E4=BC=A0=E4=BC=98=E5=8C=96?=
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/ExamCarSub3.cpp   |  8 +--
 .../main/cpp/sdk/judge/sub3/ISub3JudgeWrap.h  |  2 +
 .../cpp/sdk/judge/sub3/Sub3Judge01Sczb.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge03Zxxs.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge04Bgcd.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge06Rxhd.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge07Xxqy.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge08Gjzt.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge09Hcxx.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge14Jjdw.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp    |  2 +-
 .../cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp    |  2 +-
 entry/src/main/ets/pages/Index.ets            | 57 ++++++++++++++++++-
 20 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/entry/src/main/cpp/sdk/common/HVersion.h b/entry/src/main/cpp/sdk/common/HVersion.h
index 0052c215..64d0e3a3 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  "2504281937b"
+#define JUDGE_VERSION_STAMP  "2505071805b"
 #if JUDGE_USE_OLD
 #   undef JUDGE_VERSION_STAMP
 #   define JUDGE_VERSION_STAMP  "2411121010b.old"
diff --git a/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp b/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
index 9909476d..fed0a8ab 100644
--- a/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
@@ -5036,7 +5036,7 @@ void ExamCarSub3::dealItemNoIDEndItem()
                 {
                     //ToDo1:生成 全程加减挡 进项目事件
                     //createEventEnterItem({item14->ItemNo, ""});
-                    KM3EndItem(item14->ItemNo);
+                    KM3EndItem(item14->ItemNo, true, false);
                 }
             }
             else
@@ -5046,7 +5046,7 @@ void ExamCarSub3::dealItemNoIDEndItem()
                 {
                     //ToDo1:生成 全程加减挡 进项目事件
                     //createEventEnterItem({item14->ItemNo, ""});
-                    KM3EndItem(item14->ItemNo);
+                    KM3EndItem(item14->ItemNo, true, false);
                 }
             }
         }
@@ -5063,7 +5063,7 @@ void ExamCarSub3::dealItemNoIDEndItem()
                 {
                     if(item->FinishFlag == false)
                     {
-                        KM3EndItem(item->ItemNo);
+                        KM3EndItem(item->ItemNo, true, false);
                     }
                 }
                 else if(item->ItemNo == Sub3ItemType14Jjdw) //加减档单独处理
@@ -5073,7 +5073,7 @@ void ExamCarSub3::dealItemNoIDEndItem()
                 {
                     if(item->Item_Color == itemStateWk) //&& item->FinishFlag == false
                     {
-                        KM3EndItem(item->ItemNo);
+                        KM3EndItem(item->ItemNo, true, false);
                     }
                 }
             }
diff --git a/entry/src/main/cpp/sdk/judge/sub3/ISub3JudgeWrap.h b/entry/src/main/cpp/sdk/judge/sub3/ISub3JudgeWrap.h
index e6ff0744..6ffeae50 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/ISub3JudgeWrap.h
+++ b/entry/src/main/cpp/sdk/judge/sub3/ISub3JudgeWrap.h
@@ -95,6 +95,8 @@ protected:
     //当前路段是否禁止左右转、直行、掉头
     bool forbidInLane(const std::string& laneDir, TURN_TYPE d);
 
+    bool judgeAllowable() { return true; /*(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) ? false : true; */ }
+
     //显示状态信息
     void showStatus(const std::string& msg);
 protected:
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge01Sczb.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge01Sczb.cpp
index 021b17a4..514ec206 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge01Sczb.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge01Sczb.cpp
@@ -101,7 +101,7 @@ void Sub3Judge01Sczb::dealJudgeItem()
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
     //超声波评判跟差分信号没有关系，所以不做差分信号状态的判断
-    //if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    //if(!judgeAllowable()) return;
 
     const std::string& s386 = TableSysSet->get386();
     //if(s386 == "3") //无锡地区模式只要发动机启动了，点切换就上车准备自动完成播报模拟灯光
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp
index b8a6de20..d5466de3 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp
@@ -63,7 +63,7 @@ void Sub3Judge02Qbxx::dealJudgeItem()
 
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TSensorInfo& sor = cg->real.sensor;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge03Zxxs.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge03Zxxs.cpp
index 1a5c81d1..811b024e 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge03Zxxs.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge03Zxxs.cpp
@@ -105,7 +105,7 @@ void Sub3Judge03Zxxs::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TRTKResult& RTKKM3 = cg->RTKKM3;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge04Bgcd.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge04Bgcd.cpp
index fcf7a5ca..86745870 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge04Bgcd.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge04Bgcd.cpp
@@ -56,7 +56,7 @@ void Sub3Judge04Bgcd::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TRTKResult& RTKKM3 = cg->RTKKM3;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp
index 96ea70e9..730f08a9 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp
@@ -78,7 +78,7 @@ void Sub3Judge05Lkzx::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1－平交
     //setup2: 限速值，通过路口停车线时的车速  缺省 35
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge06Rxhd.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge06Rxhd.cpp
index a3f2229c..f9fb7437 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge06Rxhd.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge06Rxhd.cpp
@@ -110,7 +110,7 @@ void Sub3Judge06Rxhd::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TSensorInfo& sor = cg->real.sensor;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge07Xxqy.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge07Xxqy.cpp
index 8a4745cf..9558c20a 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge07Xxqy.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge07Xxqy.cpp
@@ -82,7 +82,7 @@ void Sub3Judge07Xxqy::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TSensorInfo& sor = cg->real.sensor;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge08Gjzt.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge08Gjzt.cpp
index 039e353a..2397bfa0 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge08Gjzt.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge08Gjzt.cpp
@@ -93,7 +93,7 @@ void Sub3Judge08Gjzt::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TRTKResult& RTKKM3 = cg->RTKKM3;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge09Hcxx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge09Hcxx.cpp
index 5c480b73..ee1cfe35 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge09Hcxx.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge09Hcxx.cpp
@@ -63,7 +63,7 @@ void Sub3Judge09Hcxx::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TRTKResult& RTKKM3 = cg->RTKKM3;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp
index 13555f9e..2815d334 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp
@@ -144,7 +144,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TRTKResult& RTKKM3 = cg->RTKKM3;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
index 5e0413db..3351b09e 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
@@ -141,7 +141,7 @@ void Sub3Judge11Kbtc::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    //if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    //if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TSensorInfo& sor = cg->real.sensor;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp
index 4319137b..82f7b81f 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp
@@ -59,7 +59,7 @@ void Sub3Judge12Lkdt::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1－平交
     //setup2: 限速值，通过路口停车线时的车速  缺省 35
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp
index bf35af8f..b39d5810 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp
@@ -48,7 +48,7 @@ void Sub3Judge12Ptdt::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     const TChuanGan* cg = m_car->historyChuanGan();
     const TRTKResult& RTKKM3 = cg->RTKKM3;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge14Jjdw.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge14Jjdw.cpp
index 29cb18d2..8aa977e9 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge14Jjdw.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge14Jjdw.cpp
@@ -31,7 +31,7 @@ void Sub3Judge14Jjdw::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     std::string Str425;
     std::string TempLog;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp
index 3c5734eb..aa27c636 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp
@@ -73,7 +73,7 @@ void Sub3Judge15Lkzz::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1－平交
     //setup2: 限速值，通过路口停车线时的车速  缺省 35
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp
index ffaf466f..60e939a9 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp
@@ -73,7 +73,7 @@ void Sub3Judge16Lkyz::dealJudgeItem()
 {
     HELP_COST_TIME("");
     if(m_exam->TestPro != ItemProFlagJudge) return;
-    if(!m_car->rtkEnabled() || !m_car->rtkEnabled(1)) return;
+    if(!judgeAllowable()) return;
 
     //setup1: 路口类型 1-平交 2-环道 3-三叉   缺省 1－平交
     //setup2: 限速值，通过路口停车线时的车速  缺省 35
diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets
index d4eb9c48..bcccc60d 100644
--- a/entry/src/main/ets/pages/Index.ets
+++ b/entry/src/main/ets/pages/Index.ets
@@ -52,6 +52,61 @@ struct Index {
       confirm: () => {
       }
     }),
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+
+
+
+
     customStyle: true,
     alignment: DialogAlignment.Center,
   })
@@ -60,7 +115,7 @@ struct Index {
   private context = getContext(this) as common.UIAbilityContext;
   private serviceExtProxy: IdlServiceExtProxy
   @State judgeVersion: string = ""
-  private version: string = "2025.05.06.01"
+  private version: string = "2025.05.08.01"
 
   @Styles
   commStyle(){