From 732e7535c79adf8307c1baf1568ba19aa9c2e51b Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Mon, 13 Oct 2025 16:14:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 10 ++++----- entry/oh-package-lock.json5 | 2 +- entry/src/main/ets/mock/Judge.ets | 4 +++- .../ets/pages/Judge/ProcessDataTaskPool.ets | 2 +- entry/src/main/ets/pages/Judge/Typing.ets | 21 +++++++++---------- oh-package-lock.json5 | 18 +++++++++------- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index 5d21fa8..a378740 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,13 +4,13 @@ { "name": "default", "material": { - "certpath": "C:/Users/93218/.ohos/config/openharmony/default_harmony_vehicle_terminal_j6U20r4hUBYNJsocRUYxzV96xIPQLMTqn59Ua3h6tI4=.cer", - "storePassword": "0000001A3FBAE9120A580DE1C9D5F8AB398DD7175A8B9FABFBA723C6EB0B2BB78768AAB20CD625EDB6A8", + "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.cer", + "storePassword": "0000001BD807731D6FB9F044E3DF0E0429F4BB4214FE1608E25B4197041FBF36DDA3C6760585312F2864B6", "keyAlias": "debugKey", - "keyPassword": "0000001AC5B516340EAB600B1F9452419BB8A854BB2BBCC2E47FCA97B67D93556BBF50F322FA80CC4A21", - "profile": "C:/Users/93218/.ohos/config/openharmony/default_harmony_vehicle_terminal_j6U20r4hUBYNJsocRUYxzV96xIPQLMTqn59Ua3h6tI4=.p7b", + "keyPassword": "0000001BFA38BF5235541496B5FF9ED9FFA764AB53FABC873D21DC230060209C2FF24ACE5DA09413B0C138", + "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.p7b", "signAlg": "SHA256withECDSA", - "storeFile": "C:/Users/93218/.ohos/config/openharmony/default_harmony_vehicle_terminal_j6U20r4hUBYNJsocRUYxzV96xIPQLMTqn59Ua3h6tI4=.p12" + "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.p12" } } ], diff --git a/entry/oh-package-lock.json5 b/entry/oh-package-lock.json5 index d5892e3..3f4c904 100644 --- a/entry/oh-package-lock.json5 +++ b/entry/oh-package-lock.json5 @@ -1,5 +1,5 @@ { - "lockfileVersion": 1, + "lockfileVersion": 2, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": {}, "packages": {} diff --git a/entry/src/main/ets/mock/Judge.ets b/entry/src/main/ets/mock/Judge.ets index 6b66155..f3e9428 100644 --- a/entry/src/main/ets/mock/Judge.ets +++ b/entry/src/main/ets/mock/Judge.ets @@ -264,7 +264,9 @@ export const DefaultJudgeConfigData: DefaultJudgeConfigObj = { //里程不够允许手工点靠边停车 param_387: '0', //监管模式有扣分续考（0-否++1-是+把上次未考完的扣分带下来重新考试） - param_432: '1' + param_432: '1', + // Todo + param_634: '1' } //所有的科二 科目三项目 diff --git a/entry/src/main/ets/pages/Judge/ProcessDataTaskPool.ets b/entry/src/main/ets/pages/Judge/ProcessDataTaskPool.ets index 8aafc0f..b18b3f6 100644 --- a/entry/src/main/ets/pages/Judge/ProcessDataTaskPool.ets +++ b/entry/src/main/ets/pages/Judge/ProcessDataTaskPool.ets @@ -206,7 +206,7 @@ export class ProcessDataTaskPool { const attemptType = attempt === 0 ? '初次尝试' : `重试 ${attempt}`; console.log(`[Queue] 开始上传 (${attemptType}, 总共第 ${attemptNum} 次)`); - const result: WR = await taskpool.execute(uploadWorkerTask, taskData); + const result: WR = (await taskpool.execute(uploadWorkerTask, taskData)) as WR; dConsole.writeProcessData(ProcessDataEnumType.WuxiExam, JSON.stringify(result)); if (result.code === 1) { diff --git a/entry/src/main/ets/pages/Judge/Typing.ets b/entry/src/main/ets/pages/Judge/Typing.ets index d89ba6f..7a2e04e 100644 --- a/entry/src/main/ets/pages/Judge/Typing.ets +++ b/entry/src/main/ets/pages/Judge/Typing.ets @@ -2,17 +2,16 @@ import { CarInfoType, JudgeConfigObj, JudgeSound, - JudgeUI, MarkRule, ProcessDataEnumType, Project, ProjectInfo, ProjectInfos, SYSTEM_PARAM, - User, + User } from '../../model' import JudgeBusiness from './JudgeBusiness' -import { JudgePage } from "../Judge" +import { JudgePage } from '../Judge' import VoiceAnnounce from '../judgeSDK/utils/voiceAnnouncements' import { dConsole } from '../../utils/LogWorker' import { JudgeConfig, JudgeTag } from '../../config' @@ -323,17 +322,17 @@ export class BaseJudge { const param302 = judgeUI.judgeConfigObj.param_302; //自动退出待验证并且不合格 if (!that.isManual && judgeUI.examSubject === "3" && (param302 === "1" || (judgeUI.singlePlay && param302 === "2")) && judgeUI.totalScore < judgeUI.passingScore) { - that.avPlayer.playAudio([`voice/考试结束.mp3`]) + that.avPlayer?.playAudio([`voice/考试结束.mp3`]) } //联网模式下：项目没有做完、当前分数大于及格分；手动结束直接退出 if (!judgeUI.singlePlay && that.isManual && !judgeUI.isAllProjectsEnd && judgeUI.totalScore >= judgeUI.passingScore) { - that.avPlayer.playAudio(['voice/empty.mp3'], true, () => { + that.avPlayer?.playAudio(['voice/empty.mp3'], true, () => { router.back(); }) return } // - that.avPlayer.playAudio(['voice/exam_waiting.mp3'], judgeUI.singlePlay, async () => { + that.avPlayer?.playAudio(['voice/exam_waiting.mp3'], judgeUI.singlePlay, async () => { try { if (!judgeUI.singlePlay) { // const bytes = await this.getMessageHeartbeat(true); @@ -457,21 +456,21 @@ export class BaseJudge { //结束考试时候是否播报一遍所有扣分 const param634 = judgeUI.judgeConfigObj.param_634; if (judgeUI.kfArr.length && ((judgeUI.examSubject === "2" && param634 === "1") || judgeUI.examSubject === "3")) { - that.avPlayer.playAudio([`voice/kfdesc.mp3`], false, () => { + that.avPlayer?.playAudio([`voice/kfdesc.mp3`], false, () => { try { judgeUI.kfArr.forEach((kf, index) => { score += Math.abs(Number(kf.score)); //TODO 考试分数待替换 if (score <= (judgeUI.examSubject === "3" ? 10 : 20)) { if (judgeUI.kfArr.length - 1 === index) { - that.avPlayer.playAudio([`voice/${kf.markcatalog}.mp3`, voiceURL], false, () => { + that.avPlayer?.playAudio([`voice/${kf.markcatalog}.mp3`, voiceURL], false, () => { router.back(); }) throw new Error('End Loop') } - that.avPlayer.playAudio([`voice/${kf.markcatalog}.mp3`]) + that.avPlayer?.playAudio([`voice/${kf.markcatalog}.mp3`]) } else { - that.avPlayer.playAudio([`voice/${kf.markcatalog}.mp3`, voiceURL], false, () => { + that.avPlayer?.playAudio([`voice/${kf.markcatalog}.mp3`, voiceURL], false, () => { router.back(); }) throw new Error('End Loop') @@ -482,7 +481,7 @@ export class BaseJudge { } }) } else { - that.avPlayer.playAudio([voiceURL], true, () => { + that.avPlayer?.playAudio([voiceURL], true, () => { setTimeout(() => { router.back(); }, param302 === "8" ? 3000 : 0) diff --git a/oh-package-lock.json5 b/oh-package-lock.json5 index f76874c..b959024 100644 --- a/oh-package-lock.json5 +++ b/oh-package-lock.json5 @@ -1,18 +1,20 @@ { - "lockfileVersion": 1, + "lockfileVersion": 2, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { - "@ohos/crypto-js@2.0.3": "@ohos/crypto-js@2.0.3", - "@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19" + "@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19", + "@ohos/crypto-js@2.0.3": "@ohos/crypto-js@2.0.3" }, "packages": { - "@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==" - }, "@ohos/hypium@1.0.19": { "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har", - "integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==" + "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" } } } \ No newline at end of file