From 93c1d95e3645049bd8c8a0f98481e924a273e3a4 Mon Sep 17 00:00:00 2001 From: "26269261@qq.com" <26269261@qq.com> Date: Thu, 19 Dec 2024 11:15:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BF=BD=E7=95=A5CPP=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a4a68abd..2d31fa21 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ .cxx /.clangd /.clang-format -/.clang-tidy \ No newline at end of file +/.clang-tidy +/entry/src/main/cpp \ No newline at end of file From eb9d46e90406f899602c3efad5f8bb04f197e0de Mon Sep 17 00:00:00 2001 From: "26269261@qq.com" <26269261@qq.com> Date: Thu, 19 Dec 2024 11:38:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2d31fa21..b6fe8db5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ /.clangd /.clang-format /.clang-tidy -/entry/src/main/cpp \ No newline at end of file +/entry/src/main/cpp +/build-profile.json5 \ No newline at end of file From 02c021da1478159660fea1221f3c90953d0ad8a3 Mon Sep 17 00:00:00 2001 From: surenjun Date: Fri, 20 Dec 2024 09:07:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat=EF=BC=9A=E5=B7=AE=E5=88=86=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/ets/pages/judgeSDK/api/judgeSDK.d.ts | 7 ++- entry/src/main/ets/pages/judgeSDK/judge.ts | 49 ++++++++++++------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts b/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts index d651eccf..f398950e 100644 --- a/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts +++ b/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts @@ -97,8 +97,8 @@ export interface MAPITEMPOINTITEM { } export interface EXAMDATA { - //1:项目开始 2:项目结束 3:扣分 4:考车状态 5:考试结束 6:项目取消 7:语音播放和提示 8:模拟灯光事件 9:车道信息事件 10:预进项目事件 - event: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 + //1:项目开始 2:项目结束 3:扣分 4:考车状态 5:考试结束 6:项目取消 7:语音播放和提示 8:模拟灯光事件 9:车道信息事件 10:预进项目事件 11:差分事件 + event: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 //时间 sj: number //考车状态 -1:后退 0:停车 1:前进 @@ -164,6 +164,9 @@ export interface EXAMDATA { xmdm:number, xmxh:string } + nongps:{ + type:0|1|2|3|4 + } } export interface KSJS { diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index e4f3cad7..58e90e00 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -358,7 +358,7 @@ export default class Judge { handleRealExam = async (strData, callBack) => { let examData: EXAMDATA = JSON.parse(strData); const {getDqxmStr,getKfStr,goJudgeVoice,setMndg,avPlayer,fileLog,judgeUI} = this; - const {carzt,xmks,kf,event,xmjs,xmqx,ksjs,sound,mndg,lane,precast} = examData + const {carzt,xmks,kf,event,xmjs,xmqx,ksjs,sound,mndg,lane,precast,nongps} = examData const param512 = (judgeUI.judgeConfigObj['512'] || '').split(','); //获取项目结束、项目开始代码 const xmdm = event == 2 ? xmjs.xmdm : xmks.xmdm @@ -497,6 +497,11 @@ export default class Judge { } break; + //差分事件 + case 11:{ + const {type}= nongps + this.checkDwzt(type) + } default: break; @@ -1483,7 +1488,7 @@ export default class Judge { this.judgeUI.sd = ((param350 == 0? plcData.gps.sd :plcData.sensor.cs) as number * 1.852).toFixed(0) + '' this.judgeUI.dw = (Math.floor(plcData.sensor.dw as number) || 0) + '' //TODO 暂时关闭差分检测异常 - await this.checkDwzt(plcData.gps.dwzt,plcData.gps.jdzt); + // await this.checkDwzt(plcData.gps.dwzt,plcData.gps.jdzt); if(!isExamEnd){ await examJudgeRealExam(plcData) } @@ -1610,25 +1615,33 @@ export default class Judge { } // 检测差分状态 - checkDwzt = async (dwzt,jdzt) => { + checkDwzt = async (type) => { const {avPlayer} = this; const judgeConfig = this.judgeUI.judgeConfig; - const param499 = judgeConfig['499'] || ''; - if(param499 == '' || param499 == undefined){ - return - } - //10秒内dwzt不为4； - const dwztNum = this.dwztNum - if(dwztNum != 0 && (dwztNum % (5 * 10) == 0) && (param499 !== '' || param499 !== undefined)){ - this.judgeUI.dwztErrorVisible = true; - avPlayer.playAudio([`voice/差分状态异常.mp3`],true) - } + switch (type){ + case 0: + break; - if(dwzt != 4 || jdzt != 3){ - this.dwztNum += 1 - }else{ - this.dwztNum = 0; - this.judgeUI.dwztErrorVisible = false; + case 1: + this.judgeUI.dwztErrorVisible = true; + avPlayer.playAudio([`voice/差分状态异常.mp3`],true) + setTimeout(()=>{ + router.back() + },3000) + break; + + case 2: + avPlayer.playAudio([`voice/差分状态异常.mp3`],true); + + break; + case 3: + this.judgeUI.dwztErrorVisible = true; + avPlayer.playAudio([`voice/差分状态异常.mp3`],true); + break; + + case 4: + //差分异常上报 + break; } } From fbfdbd797b10e944ab0c4847ce4adc23df8353cf Mon Sep 17 00:00:00 2001 From: surenjun Date: Fri, 20 Dec 2024 09:28:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat=EF=BC=9A=E5=B7=AE=E5=88=86=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/Judge.ets | 2 +- entry/src/main/ets/pages/judgeSDK/judge.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 078c6237..c7a8242e 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -1325,7 +1325,7 @@ struct Index { @State lane: LANE = { road: '', num: 0, count: 0 } @State roadData: Object = {}; //定位差分状态时候正常 - @State isDwztRight: boolean = false; + @State isDwztRight: boolean = true; @State defaultTabIndex: number = 0; private context = getContext(this) as common.UIAbilityContext; public kfArrScroller: Scroller = new Scroller() diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 58e90e00..d3217516 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -1482,7 +1482,7 @@ export default class Judge { const str = await senorToWXDataStr(msg); usbService.sendUSB(str) } - this.judgeUI.isDwztRight = (plcData.gps.dwzt == 4 && plcData.gps.jdzt == 3); + // this.judgeUI.isDwztRight = (plcData.gps.dwzt == 4 && plcData.gps.jdzt == 3); const param350 = judgeUI.judgeConfigObj['350'] //@ts-ignore this.judgeUI.sd = ((param350 == 0? plcData.gps.sd :plcData.sensor.cs) as number * 1.852).toFixed(0) + '' @@ -1620,6 +1620,7 @@ export default class Judge { const judgeConfig = this.judgeUI.judgeConfig; switch (type){ case 0: + this.judgeUI.isDwztRight = true; break; case 1: @@ -1640,6 +1641,7 @@ export default class Judge { break; case 4: + this.judgeUI.isDwztRight = false; //差分异常上报 break; } From 4ac12f65264ba93ff2862f0c6625768c11b3348a Mon Sep 17 00:00:00 2001 From: surenjun Date: Fri, 20 Dec 2024 11:33:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat=EF=BC=9Agitigore=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b6fe8db5..a6da3e53 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ /.clang-format /.clang-tidy /entry/src/main/cpp +/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts /build-profile.json5 \ No newline at end of file diff --git a/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts b/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts index a505696d..d6e6899f 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts +++ b/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts @@ -2,9 +2,9 @@ //考试回放开关 export const judgeConfig = { //本地目录开关 - isTrajectoryOpen: true, + isTrajectoryOpen: false, //是否开启拍照 - isPhotoOpen: false, + isPhotoOpen: true, //扣分语音是否强制开启 kfVoiceOpen: false, //忽略的考试项目