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-09 12:01:14 +08:00
parent 4c230f75f0
commit 2a9b4a4f4d
20 changed files with 79 additions and 22 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_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"

8
entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
View File

@ -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);
}
}
}

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

@ -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:

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

@ -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") //无锡地区模式只要发动机启动了，点切换就上车准备自动完成播报模拟灯光

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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

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

@ -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

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

@ -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(){