harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

牵引车第二导航仪新udp增加

Browse Source
This commit is contained in:
lixiao 2025-05-13 09:14:24 +08:00
parent d8b78c2970
commit e35bf0f309
7 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entry/src/main/cpp/sdk/common/HVersion.h
View File

@ -27,7 +27,7 @@
#define JUDGE_VERSION_MAJOR 1 #define JUDGE_VERSION_MAJOR 1
#define JUDGE_VERSION_MINOR 0 #define JUDGE_VERSION_MINOR 0
#define JUDGE_VERSION_PATCH 3 #define JUDGE_VERSION_PATCH 3
#define JUDGE_VERSION_STAMP "2505121242b" #define JUDGE_VERSION_STAMP "2505130900b"
#if JUDGE_USE_OLD #if JUDGE_USE_OLD
# undef JUDGE_VERSION_STAMP # undef JUDGE_VERSION_STAMP
# define JUDGE_VERSION_STAMP "2411121010b.old" # define JUDGE_VERSION_STAMP "2411121010b.old"

2
entry/src/main/cpp/sdk/exam/ExamSensor.cpp
View File

@ -211,7 +211,7 @@ bool ExamSensor::convertDatas(TChuanGan* cg)
gps2.jd = GpsMath::convertGpsCoord2(gps2.jd); gps2.jd = GpsMath::convertGpsCoord2(gps2.jd);
gps2.wd = GpsMath::convertGpsCoord2(gps2.wd); gps2.wd = GpsMath::convertGpsCoord2(gps2.wd);
#if !JUDGE_USE_INSPECT #if !JUDGE_USE_INSPECT
gps.sd *= GPS_VEL_COEFF; //无锡所检测不需要乘这个系数，因为我们实际用的时候是gps速度，无锡所是加工后的数据 gps2.sd *= GPS_VEL_COEFF; //无锡所检测不需要乘这个系数，因为我们实际用的时候是gps速度，无锡所是加工后的数据
#endif #endif
} }

10
entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp
View File

@ -52,6 +52,16 @@ bool Sub3Judge02Qbxx::dealJudgeEnter()
m_exam->TestPro = ItemProFlagJudge; m_exam->TestPro = ItemProFlagJudge;
//ToDo2:生成进项目事件 //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; return true;
} }

2
entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.h
View File

@ -69,7 +69,7 @@ protected:
private: private:
TSub3Item02Qbxx m_itemv; TSub3Item02Qbxx m_itemv;
bool m_Pub_First_QiBu_Flag = false; //起步方向灯和喇叭 只判一次 第一次进起步项目才判 bool m_Pub_First_QiBu_Flag = false; //起步方向灯和喇叭 只判一次 第一次进起步项目才判
bool m_sound_qibu = false;
//**********************以下是新科目三************************ //**********************以下是新科目三************************
private: private:
//起步项目中，车辆状态从停止切换前进前10s内，头部姿态没有大于左后侧角度【23度】 //起步项目中，车辆状态从停止切换前进前10s内，头部姿态没有大于左后侧角度【23度】

2
entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
View File

@ -554,7 +554,7 @@ void Sub3Judge11Kbtc::DoStatus_2()
else if(s430 == "1") //拉手刹放空挡 else if(s430 == "1") //拉手刹放空挡
{ {
//20180625 //20180625
if(sor.ssc == SYES && sor.dw == 0) if(sor.ssc == SYES && (sor.dw == 0 || sor.dw == 10))
{ {
m_itemv.Status = 3; m_itemv.Status = 3;
return; return;

3
entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
View File

@ -868,7 +868,8 @@ void Sub3Judge20Comm::CallMoNiDengGuang()
if(m > 0) 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); JUDGE_MARK_SUB3(20, "94", true);
} }

2
entry/src/main/ets/pages/Index.ets
View File

@ -24,7 +24,7 @@ import { examJudgeVersion } from './judgeSDK/api';
@Component @Component
struct Index { struct Index {
@State carNum: string = '' @State carNum: string = ''
@State version: string = '2025.05.08.01' @State version: string = '2025.05.13.01'
@State judgeVersion: string = '' @State judgeVersion: string = ''
@State url: string = '' @State url: string = ''
@State hasAuth: boolean = false; @State hasAuth: boolean = false;