diff --git a/entry/src/main/cpp/sdk/common/HVersion.h b/entry/src/main/cpp/sdk/common/HVersion.h index b41551ab..7d970e50 100644 --- a/entry/src/main/cpp/sdk/common/HVersion.h +++ b/entry/src/main/cpp/sdk/common/HVersion.h @@ -25,7 +25,7 @@ #define JUDGE_VERSION_MAJOR 1 #define JUDGE_VERSION_MINOR 0 #define JUDGE_VERSION_PATCH 1 -#define JUDGE_VERSION_STAMP 2409131019 +#define JUDGE_VERSION_STAMP 2409140956 #define JUDGE_AUX_EXP(x) #x #define JUDGE_AUX_STR(x) JUDGE_AUX_EXP(x) diff --git a/entry/src/main/cpp/sdk/exam/IExamCar.cpp b/entry/src/main/cpp/sdk/exam/IExamCar.cpp index 71d0a1e4..ec47e30f 100644 --- a/entry/src/main/cpp/sdk/exam/IExamCar.cpp +++ b/entry/src/main/cpp/sdk/exam/IExamCar.cpp @@ -528,7 +528,15 @@ int IExamCar::calcDistance() if(m_cg->move == moveForward) { int gear = m_cg->real.sensor.dw; //只有科三用到 - m_disGears[gear] += a; + int range = ARRAY_SIZE(m_disGears); + if(gear < range) + { + m_disGears[gear] += a; + } + //else + //{ + // logerror("gear=%d is out range=%d", gear, range); + //} } //logdebug("move=%d,dis=%dCM", state, a); @@ -545,8 +553,8 @@ int64 IExamCar::GetCurrentTime2() const } else { - TASSERT_INT(nullptr != m_cg, ""); - result = m_cg->real.gps.sj; + //TASSERT_INT(nullptr != m_cg, ""); + result = (nullptr != m_cg ? m_cg->real.gps.sj : 0); } return result; } @@ -560,12 +568,12 @@ int64 IExamCar::GetCurrentTick2() const } else { - TASSERT_INT(nullptr != m_cg, ""); + //TASSERT_INT(nullptr != m_cg, ""); //if(m_timeBegin == 0) //Tds.StartTime //{ // m_timeBegin = m_cg->real.gps.sj; //} - result = m_cg->real.gps.sj - m_timeBegin; + result = (nullptr != m_cg ? m_cg->real.gps.sj - m_timeBegin : 0); } return result; } diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts index eb32224b..32e03d17 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ts +++ b/entry/src/main/ets/entryability/EntryAbility.ts @@ -33,18 +33,27 @@ export default class EntryAbility extends UIAbility { // globalThis.version = '2022.06.29.01'//洛阳科目二 // globalThis.judgeVersion = '2022.12.18.1' - // globalThis.version = '2022.08.13.01' - // globalThis.version = '2024.11.22.14'//济南 - // globalThis.judgeVersion = '2024.11.22.14' + + /***************** 黑龙江科目二 ******************/ + // globalThis.version = '2024.03.19.01' + // globalThis.judgeVersion = '2024.01.05.1' + + /***************** 黑龙江科目三 ******************/ + // globalThis.version = '2023.09.23.01' + // globalThis.judgeVersion = '2023.07.10.1' + + /***************** 杭州科目二 ******************/ + globalThis.version = '2024.11.22.44' + globalThis.judgeVersion = '2024.11.22.44' + /***********************************/ - globalThis.version = '2024.03.19.01' - globalThis.judgeVersion = '2024.01.05.1'//黑龙江科目二 - globalThis.videoVersion= '1.0' - // globalThis.version = '2023.12.13.01' + // globalThis.version = '2023.12.13.01'//济南 // globalThis.judgeVersion = '2023.09.30.1' + globalThis.videoVersion= '1.0' + // globalThis.videoVersion= '1.0' // globalThis.version = '2022.03.14.01' - //视频遮挡 + //视频遮挡 globalThis.spzd={ spzd1:false, spzd2:false, diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index a61f60c5..b95daba7 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -184,14 +184,24 @@ struct Index { Column() { Row() { Column() { - Text('V 1.0') + Text('V外壳：' + globalThis.version ) .fontColor('#CCAE7A') - .fontSize(22 * globalThis.ratio) + .fontSize(18 * globalThis.ratio) .width('30%') .margin({ bottom: 10 }) + Text('V评判：' + globalThis.judgeVersion) + .fontColor('#CCAE7A') + .fontSize(18 * globalThis.ratio) + .width('30%') + .margin({ bottom: 10 }) + // Text('V 1.0') + // .fontColor('#CCAE7A') + // .fontSize(22 * globalThis.ratio) + // .width('30%') + // .margin({ bottom: 10 }) Text('授权信息：' + (this.hasAuth ? '已授权' : '未授权')) .fontColor('#CCAE7A') - .fontSize(22 * globalThis.ratio) + .fontSize(18 * globalThis.ratio) .width('30%') } .margin({ left: 24 }) diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 6c816fc2..af865e96 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -309,7 +309,7 @@ struct Index { this.projectsCenterObj[txt2].type = '3' this.projectsCenterObj[txt2].isUpload = true this.projectsCenterObj[txt2].isEnd = true - this.isDdxk = true + // this.isDdxk = true this.ddxkKsxmArr.push(txt2) } } @@ -577,7 +577,7 @@ struct Index { if (this.examSubject == 3) { Row() { Text('考试路线：').fontColor('#E5CCA1').fontSize(this.FONTSIZE) - Text(`线路${this.wayno}`).fontColor('#FFAD33').fontSize(this.FONTSIZE) + Text(`线路${this.wayno || 3}`).fontColor('#FFAD33').fontSize(this.FONTSIZE) } } diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index ceff891a..75997429 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -152,6 +152,7 @@ export default class Judge { const performInfo = JSON.parse(info) this.performInfo = performInfo this.judgeUI.jl = Math.floor((performInfo.qjjl + performInfo.dcjl) / 100) + //TODO 待优化 跨组件传值不生效 globalThis.laneData = performInfo.lane; }) @@ -314,14 +315,10 @@ export default class Judge { //断点续考 ddxk: isDdxk ? 1 : 0, ddkssj: ddxkTime || 0, - ykxm: isDdxk - ? (ddxkKsxmArr?.map(projectCenterCode => (projectsCenterObj[projectCenterCode]?.projectCode) * 1)) : [], + ykxm: (ddxkKsxmArr?.map(projectCenterCode => (projectsCenterObj[projectCenterCode]?.projectCode) * 1)) || [], kfxm: isDdxk ? (ddxkKfArr?.map(kf => { const [xmdm, kfdm] = kf.split(',') - return { - xmdm: xmdm * 1, - kfdm - } + return {xmdm: xmdm * 1,kfdm} })) : [], //TODO 已考里程待修改 yklc: 0, @@ -330,8 +327,6 @@ export default class Judge { sczb: (sczb === undefined || sczb == 0) ? 0 : 1, sczbkf: kfdm, dmndg: false, - nitem1: false, - nitem41: false, mfxx: false, mfxxn: false } @@ -470,7 +465,7 @@ export default class Judge { const {xmdm} = precast; const xmmcCode = judgeUI.projectsObj[xmdm].projectCodeCenter; const xmmcSingleCode = judgeUI.projectsObj[xmdm].projectCode; - if((xmdm == 0 && f == 1) || (xmdm == 1 && s == 1) || xmdm == 3){ + if(examSubject == 2 && ((xmdm == 0 && f == 1) || (xmdm == 1 && s == 1) || xmdm == 3)){ //倒车入库/桩考/侧方停车 avPlayer.playAudio([`voice/${xmmcCode}.mp3`],false) } @@ -533,7 +528,7 @@ export default class Judge { const isEnd = projectsObj[xmdm].isEnd; const kmCode = getKmProjectVoice(code, 1, judgeConfigObj, lane,xmxh) if (!ignoreVoiceCodeArr.includes(code)) { - if((xmdm == 0 && f == 2) || (xmdm == 1 && s == 2) || xmdm == 3){ + if(examSubject == 2 && ((xmdm == 0 && f == 2) || (xmdm == 1 && s == 2) || xmdm == 3)){ //倒出入库、桩考\进项目语音控制 }else{ kmCode && avPlayer.playAudio([`voice/${kmCode}.mp3`],true) @@ -1352,11 +1347,12 @@ export default class Judge { }) console.info(judgeTag, `人工评判${type == 1 ? '进入' : '取消'}项目-${itemno}`) } + //人工扣分 public setJudgeMark = async (itemno, serial, type = 1) => { const {fileLog} = this await examJudgeArtificialMark(itemno * 1, serial, type); - + console.info(judgeTag, `进入人工扣分-${itemno}-${serial}`) await fileLog.setExamJudgeData({ method: 'examJudgeArtificialMark', itemno: itemno * 1,