harmony_car/harmony_vehicle_terminal
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 24 Wiki Activity

fix: 合并

Browse Source
This commit is contained in:
wangzhongjie 2025-10-14 16:57:37 +08:00
commit dcb826724e
3 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entry/oh-package-lock.json5
View File

@ -1,5 +1,5 @@
{ {
"lockfileVersion": 2, "lockfileVersion": 1,
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
"specifiers": {}, "specifiers": {},
"packages": {} "packages": {}

37
entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets
View File

@ -224,23 +224,22 @@ export class BaseJudge {
that.isExamEnd = true that.isExamEnd = true
that.isManual = true that.isManual = true
} else { } else {
const param302: number = Reflect.get(judgeUI.judgeConfigObj, '302') const param302: string = Reflect.get(judgeUI.judgeConfigObj, '302')
const param342: number = Reflect.get(judgeUI.judgeConfigObj, '342') const param342: string = Reflect.get(judgeUI.judgeConfigObj, '342')
const param512: number[] = (Reflect.get(judgeUI.judgeConfigObj, '512') || '').split(','); const param512: string[] = (Reflect.get(judgeUI.judgeConfigObj, '512') || '').split(',');
if (judgeUI.singlePlay) { if (judgeUI.singlePlay) {
// 单机模式 // 单机模式
dConsole.info(JudgeTag + ' 单机模式结束 => ', judgeUI.isAllProjectsEnd) dConsole.info(JudgeTag + ' 单机模式结束 => ', judgeUI.isAllProjectsEnd)
if (judgeUI.isAllProjectsEnd && judgeUI.jl >= examMileage) { if (judgeUI.isAllProjectsEnd && judgeUI.jl >= examMileage) {
// 成绩合格 // 成绩合格
if (totalScore >= passingScore && !that.isEndTip) { if (totalScore >= passingScore && !that.isEndTip) {
if (judgeUI.examSubject == '3' && (param342 == 0 || param342 == 2) && if (judgeUI.examSubject == '3' && (param342 === "0" || param342 === "2" || !param342) && (param302 !== "6" && param302 !== "7" && param302 !== "8")) {
(param302 != 6 && param302 != 7 && param302 != 8)) { if (param512[7] !== "0") {
if (param512[7] != 0) { // clearTimeout(that.deductedPopShowTimer)
clearTimeout(that.deductedPopShowTimer) // that.avPlayer?.playAudio(['voice/综合评判.mp3'])
that.avPlayer?.playAudio(['voice/综合评判.mp3']) // judgeUI.isDeductedPopShow = true
judgeUI.isDeductedPopShow = true // judgeUI.defaultTabIndex = 1
judgeUI.defaultTabIndex = 1 // that.isEndTip = true
that.isEndTip = true
return return
} }
} else { } else {
@ -249,7 +248,7 @@ export class BaseJudge {
return return
} }
} else { } else {
if (judgeUI.examSubject == '3' && (param302 == 4 || param302 == 5 || param302 == 7 || param302 == 8)) { if (judgeUI.examSubject == '3' && (param302 === "4" || param302 === "5" || param302 === "7" || param302 === "8")) {
await examJudgeEndExam() await examJudgeEndExam()
that.isExamEnd = true that.isExamEnd = true
return return
@ -258,12 +257,13 @@ export class BaseJudge {
await examJudgeEndExam() await examJudgeEndExam()
that.isExamEnd = true that.isExamEnd = true
} }
} else { }
else {
// 非单机模式 // 非单机模式
//成绩不合格 //成绩不合格
if (totalScore < passingScore) { if (totalScore < passingScore) {
//科目三不合格报靠边停车 //科目三不合格报靠边停车
if (judgeUI.examSubject == '3' && param302 == 1) { if (judgeUI.examSubject == '3' && param302 === "1") {
that.avPlayer?.playAudio([`voice/考试结束.mp3`]); that.avPlayer?.playAudio([`voice/考试结束.mp3`]);
return return
} }
@ -284,14 +284,14 @@ export class BaseJudge {
return return
} }
//考试合格自动退出 //考试合格自动退出
if (judgeUI.examSubject == '3' && (param302 == 4 || param302 == 7) || param302 == 8) { if (judgeUI.examSubject == '3' && (param302 === "4" || param302 === "7") || param302 === "8") {
await examJudgeEndExam() await examJudgeEndExam()
that.isExamEnd = true that.isExamEnd = true
return return
} }
if (judgeUI.examSubject == '3' && (param342 == 0 || param342 == 2) && if (judgeUI.examSubject == '3' && (param342 === "0" || param342 === "2") &&
(param302 != 6 && param302 != 7 && param302 != 8)) { (param302 !== "6" && param302 !== "7" && param302 !== "8")) {
if (param512[7] != 0) { if (param512[7] !== "0") {
clearTimeout(that.deductedPopShowTimer) clearTimeout(that.deductedPopShowTimer)
judgeUI.isDeductedPopShow = false judgeUI.isDeductedPopShow = false
that.avPlayer?.playAudio(['voice/综合评判.mp3']) that.avPlayer?.playAudio(['voice/综合评判.mp3'])
@ -418,7 +418,6 @@ export class BaseJudge {
// } // }
console.info(JudgeTag, '考试结束 end') console.info(JudgeTag, '考试结束 end')
const param302 = judgeUI.judgeConfigObj.param_302; const param302 = judgeUI.judgeConfigObj.param_302;
judgeUI.generateExamRecordsDialogController.open();
let currentKssycs = 0; let currentKssycs = 0;
let voiceURL = '' let voiceURL = ''
if (judgeUI.examSubject === "2") { if (judgeUI.examSubject === "2") {

18
oh-package-lock.json5
View File

@ -1,20 +1,18 @@
{ {
"lockfileVersion": 2, "lockfileVersion": 1,
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
"specifiers": { "specifiers": {
"@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19", "@ohos/crypto-js@2.0.3": "@ohos/crypto-js@2.0.3",
"@ohos/crypto-js@2.0.3": "@ohos/crypto-js@2.0.3" "@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19"
}, },
"packages": { "packages": {
"@ohos/hypium@1.0.19": {
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",
"integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
"registryType": "ohpm"
},
"@ohos/crypto-js@2.0.3": { "@ohos/crypto-js@2.0.3": {
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/crypto-js/-/crypto-js-2.0.3.har", "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/crypto-js/-/crypto-js-2.0.3.har",
"integrity": "sha512-LuHaR1kD5PxnOXnuR1fWvPwGtbed9Q/QGzk6JOh8y5Wdzvi8brPesODZiaWf9scOVRHsbTPOtZw91vWB35p1vQ==", "integrity": "sha512-LuHaR1kD5PxnOXnuR1fWvPwGtbed9Q/QGzk6JOh8y5Wdzvi8brPesODZiaWf9scOVRHsbTPOtZw91vWB35p1vQ=="
"registryType": "ohpm" },
"@ohos/hypium@1.0.19": {
"resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",
"integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ=="
} }
} }
} }