diff --git a/entry/src/main/cpp/bin/libJudgeSdk.so b/entry/src/main/cpp/bin/libJudgeSdk.so index 14f79f37..e79df114 100644 Binary files a/entry/src/main/cpp/bin/libJudgeSdk.so and b/entry/src/main/cpp/bin/libJudgeSdk.so differ diff --git a/entry/src/main/cpp/sdk/common/HVersion.h b/entry/src/main/cpp/sdk/common/HVersion.h index 49de7ef0..efd787c9 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 "2503270900b" +#define JUDGE_VERSION_STAMP "2503281110b" #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 ed48a72d..13eb497d 100644 --- a/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp +++ b/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp @@ -624,7 +624,10 @@ bool ExamCarSub3::Init_KM3_Global() std::string ss = "," + m_car.DC_YK_Must + ","; if(Tools::pos(s, ss) == false) { - examItem->Item_Color = itemStateHg; + //examItem->Item_Color = itemStateHg; + //examItem->TestPro = ItemProFlagIdle; + //examItem->FinishFlag = true; + KM3EndItem(itemNo,true,false); } } } @@ -4127,20 +4130,23 @@ void ExamCarSub3::KM3EndItem(int ItemNo, bool event, bool sound) ItemNo == Sub3ItemType15Lkzz || ItemNo == Sub3ItemType16Lkyz) { - bool b = true; - if(m_cg->ai_ljjl > 15 && ItemNo == Sub3ItemType02Qbxx) b = false; //15米 - if(m_ctl.ZXD_GuanBi) b = false; - if(b) + if(m_cg) //2025-03-27 { - const TSensorInfo& sor0 = historySensor(0); - const TSensorInfo& sor1 = historySensor(1); - const TSensorInfo& sor2 = historySensor(2); - if(sor0.zfxd+sor0.yfxd==SYES && sor1.zfxd+sor1.yfxd==SYES && sor2.zfxd+sor2.yfxd==SYES) + bool b = true; + if(m_cg->ai_ljjl > 15 && ItemNo == Sub3ItemType02Qbxx) b = false; //15米 + if(m_ctl.ZXD_GuanBi) b = false; + if(b) { - m_ctl.ZXD_KSSJ_TK = m_cg->tkCnt; + const TSensorInfo& sor0 = historySensor(0); + const TSensorInfo& sor1 = historySensor(1); + const TSensorInfo& sor2 = historySensor(2); + if(sor0.zfxd+sor0.yfxd==SYES && sor1.zfxd+sor1.yfxd==SYES && sor2.zfxd+sor2.yfxd==SYES) + { + m_ctl.ZXD_KSSJ_TK = m_cg->tkCnt; + } } + m_ctl.ZXD_GuanBi = false; } - m_ctl.ZXD_GuanBi = false; } TKM3Item* examItem = findExamItem(ItemNo); diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp index f1efc168..a60ef290 100644 --- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp +++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp @@ -3762,7 +3762,6 @@ void Sub3Judge20Comm::Judge_BianDaoFangXiangDeng2() if(sor.zfxd + sor.yfxd == SYES && sor1.zfxd + sor1.yfxd == SYES && sor2.zfxd + sor2.yfxd == SYES) { ctl->ZXD_KSSJ_TK = cg->tkCnt; - if(ksdd == siteof::chongqingkm3) { m_itemvCJH.ZXD_Open_TempJL = cg->ai_ljjl; diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index b456c594..31d6146f 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -309,13 +309,18 @@ struct Index { } if (no1 == 6) { const name = decodeURI(systemParm.txt1) - if (this.mode !== 2 && name === '夜间行驶') { + // 夜间行驶 + if (this.mode !== 2 && no2 == 13) { return } - if (this.mode !== 3 && name === '模拟夜间驾驶') { + // 模拟夜间驾驶 + if (this.mode !== 3 && no2 == 41) { return } let isRequired = allItems.includes(no2 + '') + if (this.mode === 2 && no2 == 11) { + isRequired = false + } console.log("lixiao allItems", no2, JSON.stringify(allItems)) if (no2 == 14) { isRequired = false @@ -329,21 +334,21 @@ struct Index { projectCode: no2 + '', projectCodeCenter: txt2, // 白考夜间行驶非必考 - isRequired: (this.mode === 2 && no2 == 11) ? false : isRequired, + isRequired, //是否考过了 isEnd: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'), //项目开始数据是否上传过 isUpload: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'), } - if (this.mode === 2) { - let type: '1' | '2' | '3' - if (no2 == 13) { - type = '2' - } else { - type = isRequired ? '1' : '3' - } - currentProject.ykType = type - } + // if (this.mode === 2) { + // let type: '1' | '2' | '3' + // if (no2 == 13) { + // type = '2' + // } else { + // type = isRequired ? '1' : '3' + // } + // currentProject.ykType = type + // } this.projectsObj[no2*1] = currentProject this.projectsCenterObj[txt2] = currentProject this.projects.push(currentProject); @@ -458,7 +463,7 @@ struct Index { }) const currentProject = this.projectsObj[xmdm] || { name: '通用评判' } if (this.projectsObj[xmdm]) { - this.projectsObj[xmdm].type = '4' + this.projectsObj[xmdm].ykType = '4' } this.kfArr.push({ //扣分项目名称 @@ -1118,7 +1123,7 @@ struct Index { } //项目进行中不能人工触发 - if (this.isProjectIn) { + if (this.isProjectIn && this.projectsObj['13']?.type != '2') { console.log("lixiao getIsExitManualProject 项目进行中不能人工触发") if (param340 == 1) { if (this.isManualProjectIn && (this.projectsObj[projectCode].type == '2')) { @@ -1136,16 +1141,18 @@ struct Index { return false } - //@ts-ignore 直线行驶中不进其他考试项目(0-否 1-是) - if (param348 == '0' && projectsObj['9']?.type == 2) { + // 直线行驶中不进其他考试项目(0-否 1-是) + if (param348 == '0' && this.projectsObj['9']?.type == '2') { console.log("lixiao getIsExitManualProject 直线行驶中不进其他考试项目", index) return index === 0 ? true : false } //项目已经做过，后续不能人工触发 - if (param307.includes(projectCode) && (projectType == '3' || projectType == '4')) { - console.log("lixiao getIsExitManualProject 项目已经做过", index) - return false + if (this.mode !== 2) { + if (param307.includes(projectCode) && (projectType == '3' || projectType == '4')) { + console.log("lixiao getIsExitManualProject 项目已经做过", index) + return false + } } //319不为0，或者387不为1，里程不够时，靠边停车项目不能触发 diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 1b0aa402..efc218da 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -83,6 +83,7 @@ export default class Judge { }) console.info(judgeTag, `人工评判${type == 1 ? '进入' : '取消'}项目-${itemno}`) } + //人工扣分 public setJudgeMark = async (itemno, serial, type = 1) => { const {fileLog} = this @@ -846,7 +847,7 @@ export default class Judge { this.xmmcEndCode = xmmcCode this.xmdm = xmdm; this.xmxh = xmxh; - if(xmdm != 13) { + if (xmdm != 13) { this.judgeUI.isProjectIn = true } break; @@ -1674,12 +1675,12 @@ export default class Judge { console.info(judgeTag, '项目状态projectsObj:' + JSON.stringify(projectsObj[projectKey])); const {type,isRequired,ykType} = projectsObj[projectKey]; allProjectNum += 1; - if (type == 3 || type == 4 || ykType == 3 || ykType == 4) { + if (type == 3 || type == 4) { allEndProjectsNum += 1; } if (isRequired) { projectNum += 1; - if (type == 3 || type == 4 || ykType == 3 || ykType == 4) { + if (type == 3 || type == 4) { endProjectsNum += 1; } }