diff --git a/entry/src/main/cpp/bin/libJudgeSdk.so b/entry/src/main/cpp/bin/libJudgeSdk.so index 3307c58c..fff5844f 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/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 8e01dc58..f6dd15a1 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -26,7 +26,7 @@ import { examJudgeVersion } from './judgeSDK/api'; @Component struct Index { @State carNum: string = '' - @State version: string = '2025.04.24.01' + @State version: string = '2025.04.25.01' @State judgeVersion: string = '' @State url: string = '' @State hasAuth: boolean = false; diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 1da8a627..0117b332 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -332,10 +332,6 @@ struct Index { if (this.mode === 2 && no2 != 13) { isUpload = true } - // 夜考靠边停车设置为非必须 - if (this.mode === 2 && no2 == 11) { - isRequired = false - } // 加减档自动完成,为非必须项目 if (no2 == 14) { isRequired = false diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 2ed5ba48..4e206fcc 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -333,7 +333,7 @@ export default class Judge { async (isManual?: boolean) => { const {judgeUI,avPlayer,isExamEnd,isEndTip,ksjs} = this; const {isAllProjectsEnd,examSubject,singlePlay,totalScore,judgeConfigObj,passingScore,examMileage,jl} = judgeUI; - + const param302 = judgeConfigObj['302']; if (isExamEnd) { return } @@ -345,7 +345,6 @@ export default class Judge { this.isExamEnd = true this.isManual = true } else { - const param302 = judgeConfigObj['302']; const param342 = judgeConfigObj['342']; const param512 = (judgeConfigObj['512'] || '').split(','); @@ -357,11 +356,11 @@ export default class Judge { if (totalScore >= passingGrade && !isEndTip) { if (examSubject == 3 && (param342 == 0 || param342 == 2) && (param302 != 6 || param302 != 7 || param302 != 8)) { if (param512[7] != 0) { - clearTimeout(this.deductedPopShowTimer) - avPlayer.playAudio(['voice/综合评判.mp3']) - this.judgeUI.isDeductedPopShow = true - this.judgeUI.defaultTabIndex = 1 - this.isEndTip = true + // clearTimeout(this.deductedPopShowTimer) + // avPlayer.playAudio(['voice/综合评判.mp3']) + // this.judgeUI.isDeductedPopShow = true + // this.judgeUI.defaultTabIndex = 1 + // this.isEndTip = true return } } else { @@ -383,9 +382,12 @@ export default class Judge { //成绩不合格 if (totalScore < passingGrade) { //科目三不合格报靠边停车 - if (examSubject == 3 && param302 == 1) { - avPlayer.playAudio([`voice/考试结束.mp3`]); - return + if (examSubject == 3 ) { + if( param302 == 1){ + avPlayer.playAudio([`voice/考试结束.mp3`]); + }else if(param302 == 0){ + return + } } await examJudgeEndExam() this.isExamEnd = true @@ -1227,6 +1229,12 @@ export default class Judge { }) }) } else { + if(code[0] == 'zhpp'){ + clearTimeout(this.deductedPopShowTimer) + this.judgeUI.isDeductedPopShow = true + this.judgeUI.defaultTabIndex = 1 + this.isEndTip = true + } avPlayer.playAudio([`voice/${code[0]}.mp3`]) } } @@ -1247,7 +1255,7 @@ export default class Judge { avPlayer.playAudio([`voice/考试结束.mp3`]) } //联网模式下手动结束的直接退出 - if (!singlePlay && isManual && !isAllProjectsEnd) { + if (!singlePlay && isManual && !isAllProjectsEnd && totalScore >= passingScore) { avPlayer.playAudio(['voice/empty.mp3'], true, () => { this.isUdpEnd = true; closeAllFiles()