diff --git a/entry/oh-package-lock.json5 b/entry/oh-package-lock.json5 index 3f4c904..d5892e3 100644 --- a/entry/oh-package-lock.json5 +++ b/entry/oh-package-lock.json5 @@ -1,5 +1,5 @@ { - "lockfileVersion": 2, + "lockfileVersion": 1, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": {}, "packages": {} diff --git a/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets b/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets index dba0a5e..9ff7302 100644 --- a/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets +++ b/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets @@ -209,23 +209,22 @@ export class BaseJudge { that.isExamEnd = true that.isManual = true } else { - const param302: number = Reflect.get(judgeUI.judgeConfigObj, '302') - const param342: number = Reflect.get(judgeUI.judgeConfigObj, '342') - const param512: number[] = (Reflect.get(judgeUI.judgeConfigObj, '512') || '').split(','); + const param302: string = Reflect.get(judgeUI.judgeConfigObj, '302') + const param342: string = Reflect.get(judgeUI.judgeConfigObj, '342') + const param512: string[] = (Reflect.get(judgeUI.judgeConfigObj, '512') || '').split(','); if (judgeUI.singlePlay) { // 单机模式 dConsole.info(JudgeTag + ' 单机模式结束 => ', judgeUI.isAllProjectsEnd) if (judgeUI.isAllProjectsEnd && judgeUI.jl >= examMileage) { // 成绩合格 if (totalScore >= passingScore && !that.isEndTip) { - if (judgeUI.examSubject == '3' && (param342 == 0 || param342 == 2) && - (param302 != 6 && param302 != 7 && param302 != 8)) { - if (param512[7] != 0) { - clearTimeout(that.deductedPopShowTimer) - that.avPlayer?.playAudio(['voice/综合评判.mp3']) - judgeUI.isDeductedPopShow = true - judgeUI.defaultTabIndex = 1 - that.isEndTip = true + if (judgeUI.examSubject == '3' && (param342 === "0" || param342 === "2" || !param342) && (param302 !== "6" && param302 !== "7" && param302 !== "8")) { + if (param512[7] !== "0") { + // clearTimeout(that.deductedPopShowTimer) + // that.avPlayer?.playAudio(['voice/综合评判.mp3']) + // judgeUI.isDeductedPopShow = true + // judgeUI.defaultTabIndex = 1 + // that.isEndTip = true return } } else { @@ -234,7 +233,7 @@ export class BaseJudge { return } } 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() that.isExamEnd = true return @@ -243,12 +242,13 @@ export class BaseJudge { await examJudgeEndExam() that.isExamEnd = true } - } else { + } + else { // 非单机模式 //成绩不合格 if (totalScore < passingScore) { //科目三不合格报靠边停车 - if (judgeUI.examSubject == '3' && param302 == 1) { + if (judgeUI.examSubject == '3' && param302 === "1") { that.avPlayer?.playAudio([`voice/考试结束.mp3`]); return } @@ -269,14 +269,14 @@ export class BaseJudge { return } //考试合格自动退出 - if (judgeUI.examSubject == '3' && (param302 == 4 || param302 == 7) || param302 == 8) { + if (judgeUI.examSubject == '3' && (param302 === "4" || param302 === "7") || param302 === "8") { await examJudgeEndExam() that.isExamEnd = true return } - if (judgeUI.examSubject == '3' && (param342 == 0 || param342 == 2) && - (param302 != 6 && param302 != 7 && param302 != 8)) { - if (param512[7] != 0) { + if (judgeUI.examSubject == '3' && (param342 === "0" || param342 === "2") && + (param302 !== "6" && param302 !== "7" && param302 !== "8")) { + if (param512[7] !== "0") { clearTimeout(that.deductedPopShowTimer) judgeUI.isDeductedPopShow = false that.avPlayer?.playAudio(['voice/综合评判.mp3']) @@ -403,7 +403,6 @@ export class BaseJudge { // } console.info(JudgeTag, '考试结束 end') const param302 = judgeUI.judgeConfigObj.param_302; - judgeUI.generateExamRecordsDialogController.open(); let currentKssycs = 0; let voiceURL = '' if (judgeUI.examSubject === "2") { diff --git a/oh-package-lock.json5 b/oh-package-lock.json5 index b959024..f76874c 100644 --- a/oh-package-lock.json5 +++ b/oh-package-lock.json5 @@ -1,20 +1,18 @@ { - "lockfileVersion": 2, + "lockfileVersion": 1, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "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": { - "@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": { "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/crypto-js/-/crypto-js-2.0.3.har", - "integrity": "sha512-LuHaR1kD5PxnOXnuR1fWvPwGtbed9Q/QGzk6JOh8y5Wdzvi8brPesODZiaWf9scOVRHsbTPOtZw91vWB35p1vQ==", - "registryType": "ohpm" + "integrity": "sha512-LuHaR1kD5PxnOXnuR1fWvPwGtbed9Q/QGzk6JOh8y5Wdzvi8brPesODZiaWf9scOVRHsbTPOtZw91vWB35p1vQ==" + }, + "@ohos/hypium@1.0.19": { + "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har", + "integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==" } } } \ No newline at end of file