From e35bf0f30953d95106a7aa63b9959ec51354cba5 Mon Sep 17 00:00:00 2001 From: lixiao <932184220@qq.com> Date: Tue, 13 May 2025 09:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B5=E5=BC=95=E8=BD=A6=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E4=BB=AA=E6=96=B0udp=E5=A2=9E=E5=8A=A0?= 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 | 2 +- entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp | 10 ++++++++++ entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.h | 2 +- entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp | 2 +- entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp | 3 ++- entry/src/main/ets/pages/Index.ets | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/entry/src/main/cpp/sdk/common/HVersion.h b/entry/src/main/cpp/sdk/common/HVersion.h index b0509f12..c05ddbaf 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 "2505121242b" +#define JUDGE_VERSION_STAMP "2505130900b" #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 c34aed57..16d8e8aa 100644 --- a/entry/src/main/cpp/sdk/exam/ExamSensor.cpp +++ b/entry/src/main/cpp/sdk/exam/ExamSensor.cpp @@ -211,7 +211,7 @@ bool ExamSensor::convertDatas(TChuanGan* cg) gps2.jd = GpsMath::convertGpsCoord2(gps2.jd); gps2.wd = GpsMath::convertGpsCoord2(gps2.wd); #if !JUDGE_USE_INSPECT - gps.sd *= GPS_VEL_COEFF; //无锡所检测不需要乘这个系数，因为我们实际用的时候是gps速度，无锡所是加工后的数据 + gps2.sd *= GPS_VEL_COEFF; //无锡所检测不需要乘这个系数，因为我们实际用的时候是gps速度，无锡所是加工后的数据 #endif } diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp index d5466de3..d60df9d2 100644 --- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp +++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp @@ -52,6 +52,16 @@ bool Sub3Judge02Qbxx::dealJudgeEnter() m_exam->TestPro = ItemProFlagJudge; //ToDo2:生成进项目事件 + + if(m_car->examAlready(Sub3ItemType01Sczb) && m_car->examAlready(Sub3ItemType41Mndg)) + { + if(!m_sound_qibu) + { + m_sound_qibu = true; + m_car->createEventSound({m_exam->ItemNo, sound::sub3_402001}); + } + } + return true; } diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.h b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.h index 6307bdea..1d3a3501 100644 --- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.h +++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.h @@ -69,7 +69,7 @@ protected: private: TSub3Item02Qbxx m_itemv; bool m_Pub_First_QiBu_Flag = false; //起步方向灯和喇叭 只判一次 第一次进起步项目才判 - + bool m_sound_qibu = false; //**********************以下是新科目三************************ private: //起步项目中，车辆状态从停止切换前进前10s内，头部姿态没有大于左后侧角度【23度】 diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp index 3351b09e..fc728ebd 100644 --- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp +++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp @@ -554,7 +554,7 @@ void Sub3Judge11Kbtc::DoStatus_2() else if(s430 == "1") //拉手刹放空挡 { //20180625 - if(sor.ssc == SYES && sor.dw == 0) + if(sor.ssc == SYES && (sor.dw == 0 || sor.dw == 10)) { m_itemv.Status = 3; return; diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp index d7d0a589..e2d5527b 100644 --- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp +++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp @@ -868,7 +868,8 @@ void Sub3Judge20Comm::CallMoNiDengGuang() if(m > 0) { - if(m_engineTick > 0 && cg->tkCnt - m_engineTick > m*SECOND) + //if(m_engineTick > 0 && cg->tkCnt - m_engineTick > m*SECOND) + if(m_engineTick > 0 && m_car->timeElapsed() > m*SECOND) { JUDGE_MARK_SUB3(20, "94", true); } diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 81b1b9ce..ad057e49 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -24,7 +24,7 @@ import { examJudgeVersion } from './judgeSDK/api'; @Component struct Index { @State carNum: string = '' - @State version: string = '2025.05.08.01' + @State version: string = '2025.05.13.01' @State judgeVersion: string = '' @State url: string = '' @State hasAuth: boolean = false;