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

弹窗异常关闭

Browse Source
This commit is contained in:
lixiao 2025-05-11 09:44:02 +08:00
parent bd41dc0ad2
commit d57b3fb067
3 changed files with 34 additions and 25 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 "2505071805b" #define JUDGE_VERSION_STAMP "2505091540b"
#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"

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

@ -50,12 +50,11 @@ bool ExamSensor::pretreatment(TChuanGan* cg)
return false; return false;
} }
if(!cg->real.gps.rtkEnabled) //2025-05-09 //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
{ //if(!cg->real.gps.rtkEnabled)
//cg->move = moveUnknown; //{
//cg->real.gps.ai_gps = Pointi(0, 0); // return true;
return true; //}
}
ExamSubject subject = m_car->examSubject(); ExamSubject subject = m_car->examSubject();
if(subject == ExamSubject2) if(subject == ExamSubject2)
@ -534,24 +533,29 @@ bool ExamSensor::GetCarDirStauts(TChuanGan* cg)
if(!m_initGPSFlag) if(!m_initGPSFlag)
{ {
if(cg->real.gps.rtkEnabled == true) m_initGPSFlag = true;
{ setStatus(cg, moveStop);
m_initGPSFlag = true; m_stopOffset = cg->real.gps.ai_gps;
setStatus(cg, moveStop); //2025-05-09 KM3 //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
m_stopOffset = cg->real.gps.ai_gps; //if(cg->real.gps.rtkEnabled == true)
} //{
else // m_initGPSFlag = true;
{ // setStatus(cg, moveStop);
//数据异常 // m_stopOffset = cg->real.gps.ai_gps;
return true; //如果从一开始考试一直在非差分状态 如果返回false就进不了评判了 比如模拟灯光 20240726 //}
} //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.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) //2025-05-09 KM3 //杭州临平KM3一开始就不在差分不然计算不到行驶距离和前进状态
{ //if(cg->move == moveStop && cg->real.gps.rtkEnabled == false)
return false; //{
} // return false;
//}
static constexpr int MoveAgainCm = 20; static constexpr int MoveAgainCm = 20;
//1、拿到通用的停车时间阈值 //1、拿到通用的停车时间阈值
@ -584,7 +588,7 @@ bool ExamSensor::GetCarDirStauts(TChuanGan* cg)
int b = 0, c = 0; int b = 0, c = 0;
if(I == 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; b = m_stopOffset.x - cg->real.gps.ai_gps.x;
c = m_stopOffset.y - cg->real.gps.ai_gps.y; c = m_stopOffset.y - cg->real.gps.ai_gps.y;
} }
@ -789,6 +793,10 @@ bool ExamSensor::GetCarDirStatus_KM2(TChuanGan* cg)
if(!m_initGPSFlag) 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) if(cg->real.gps.rtkEnabled == true)
{ {
m_initGPSFlag = 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; //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) if(cg->move == moveStop && cg->real.gps.rtkEnabled == false)
{ {
return false; return false;
@ -872,7 +881,7 @@ bool ExamSensor::GetCarDirStatus_KM2(TChuanGan* cg)
int b = 0, c = 0; int b = 0, c = 0;
if(I == 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; b = m_stopOffset.x - cg->real.gps.ai_gps.x;
c = m_stopOffset.y - cg->real.gps.ai_gps.y; c = m_stopOffset.y - cg->real.gps.ai_gps.y;
} }

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

@ -62,7 +62,7 @@ struct Index {
private context = getContext(this) as common.UIAbilityContext; private context = getContext(this) as common.UIAbilityContext;
private serviceExtProxy: IdlServiceExtProxy private serviceExtProxy: IdlServiceExtProxy
@State judgeVersion: string = "" @State judgeVersion: string = ""
private version: string = "2025.05.08.01" private version: string = "2025.05.09.01"
@Styles @Styles
commStyle(){ commStyle(){