From 9dd83d3a6e97ea8e76b1a28c1bddda10bb678872 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Thu, 10 Apr 2025 16:34:14 +0800 Subject: [PATCH] =?UTF-8?q?init:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 10 ++++---- entry/src/main/ets/pages/Judge.ets | 2 +- .../compontents/judge/DeductionPopup.ets | 8 +++---- .../ets/pages/compontents/judge/EndPopup.ets | 4 ++-- entry/src/main/ets/pages/judgeSDK/judge.ets | 2 +- .../main/ets/pages/judgeSDK/utils/fileLog.ets | 23 +++++++++---------- .../ets/pages/judgeSDK/utils/fileModel.ets | 17 +++++++------- .../ets/pages/judgeSDK/utils/judgeCommon.ets | 4 ++-- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index 47db1d4..a84a149 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_Ja3OiX9fkBwGKa0NNRbcXszAt35lPCdUakY4mTtjFwU=.cer", - "storePassword": "0000001B8F068D534BF0B0245E4BDB69E8CFA101B3E7CD4BE89CFE5B2FD5D27D4CA2734F0FBC84F49A9C68", + "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.cer", + "storePassword": "0000001B8E9DDF652EF92FEE3FEA48705C778A1477A239E20DF0355D7EB87B3674868AFF199387F065F4FF", "keyAlias": "debugKey", - "keyPassword": "0000001B7EE522481B6BADA6544DD7E5E5D2A7A964971BFFF30CF41899AE5382A42143444D275F293D0744", - "profile": "C:/Users/93218/.ohos/config/openharmony/default_harmony_vehicle_terminal_Ja3OiX9fkBwGKa0NNRbcXszAt35lPCdUakY4mTtjFwU=.p7b", + "keyPassword": "0000001B5154009358EC6DAB38F99A25239BD735D77777640200E7EF810C1330F87F76DAA287AAC62AED71", + "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_Ja3OiX9fkBwGKa0NNRbcXszAt35lPCdUakY4mTtjFwU=.p12" + "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.p12" } } ], diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index c9e44b1..0136686 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -22,7 +22,7 @@ // // import { JudgeConfig } from './judgeSDK/utils/judgeConfig'; // -// import SignDisplayCom from './compontents/signDisplayCom'; +// import SignDisplayCom from './compontents/SignDisplayCom'; // import { // AmplifyItem, // CarInfoType, diff --git a/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets b/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets index 7c69ec9..6261ad7 100644 --- a/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets +++ b/entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets @@ -18,7 +18,7 @@ export default struct DeductedPopup { @State universalMarkRules: MarkRule[] = [] @State manualMarkRules: MarkRule[] = [] @State lineBg: Array = ['#4D4136', '#26231E'] - @State selectedLine: number = undefined + @State selectedLine: number = -1 @State endPopupVisible: boolean = false @State selectedLineStyle: SEL = { fontColor: '#FFF', @@ -34,7 +34,7 @@ export default struct DeductedPopup { } aboutToAppear() { - this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes(item.itemno.toString()) || + this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes((item.itemno||0).toString()) || this.currentItems.includes(item.itemno + ''))); this.currentIndex = this.defaultTabIndex if (this.currentIndex == 1) { @@ -45,7 +45,7 @@ export default struct DeductedPopup { changeCurrentItems() { if (this.currentItems?.length && (this.currentItems?.length >= this.preCurrentItemsLength)) { - this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes(item.itemno.toString()) || + this.universalMarkRules = this.markRules.filter(item => (this.currentItems.includes((item.itemno||0).toString()) || this.currentItems.includes(item.itemno + ''))); this.currentIndex = this.defaultTabIndex if (this.currentIndex == 1) { @@ -120,7 +120,7 @@ export default struct DeductedPopup { this.universalMarkRules = this.markRules.filter(item => item.itemno == 20) } else { this.universalMarkRules = - this.markRules.filter(item => (this.currentItems.includes(item.itemno.toString()) || + this.markRules.filter(item => (this.currentItems.includes((item.itemno||0).toString()) || this.currentItems.includes(item.itemno + ''))) } }) diff --git a/entry/src/main/ets/pages/compontents/judge/EndPopup.ets b/entry/src/main/ets/pages/compontents/judge/EndPopup.ets index 7711314..5f414c7 100644 --- a/entry/src/main/ets/pages/compontents/judge/EndPopup.ets +++ b/entry/src/main/ets/pages/compontents/judge/EndPopup.ets @@ -6,8 +6,8 @@ export default struct EndPopup { } private title:string = '' - private cancelFn:(event?: ClickEvent) => void - private confirmFn:(event?: ClickEvent) => void + private cancelFn?:(event?: ClickEvent) => void + private confirmFn?:(event?: ClickEvent) => void build(){ Column(){ diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ets b/entry/src/main/ets/pages/judgeSDK/judge.ets index 3e09949..88f701f 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ets +++ b/entry/src/main/ets/pages/judgeSDK/judge.ets @@ -83,7 +83,7 @@ type GetDqxmStr = (xmdm: number) => string type TJudgeBeginObj = JudgeBeginObj export default class Judge { - public plcStr: string + public plcStr!: string public judgeUI: JudgeUI //获取科目三的评判初始化配置 getKm3JudgeInitConfig: GetKm3JudgeInitConfig = async () => { diff --git a/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ets b/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ets index 70da6c2..ad8cef7 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ets +++ b/entry/src/main/ets/pages/judgeSDK/utils/fileLog.ets @@ -10,18 +10,17 @@ interface StuInfo { export default class FileLog { - public folderPath: string - public progressDataFd: number = undefined - public examJudgeWuxiDataFd: number = undefined - public examJudgeWuxiProgressDataFd: number = undefined - public plcDataFd: number = undefined - public examJudgeDataFd: number = undefined - public examJudgeCallbackDataFd: number = undefined - public examJudgeLogDataFd: number = undefined - public fourAndOneLogDataFd: number = undefined - public fourAndOneLogDataBytesFd: number = undefined - public examLineDataFd: number = undefined - //后续文件路径待替换 + public folderPath?: string + public progressDataFd: number|undefined =undefined + public examJudgeWuxiDataFd: number|undefined = undefined + public examJudgeWuxiProgressDataFd: number|undefined = undefined + public plcDataFd: number|undefined = undefined + public examJudgeDataFd: number|undefined = undefined + public examJudgeCallbackDataFd: number|undefined = undefined + public examJudgeLogDataFd: number|undefined = undefined + public fourAndOneLogDataFd: number|undefined = undefined + public fourAndOneLogDataBytesFd: number|undefined = undefined + public examLineDataFd: number|undefined = undefined private fileUtil: FileUtils // 过程文件数据 public setExamProgressData = async (str: Object) => { diff --git a/entry/src/main/ets/pages/judgeSDK/utils/fileModel.ets b/entry/src/main/ets/pages/judgeSDK/utils/fileModel.ets index de1311d..d26a96f 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/fileModel.ets +++ b/entry/src/main/ets/pages/judgeSDK/utils/fileModel.ets @@ -10,15 +10,15 @@ interface Options{ } export default class FileModel { - public folderPath: string + public folderPath?: string // 设置文件夹 public initFolder = async () => { - await this.fileUtil.initFolder(`/models/model_enc`); - const folderPath = await this.fileUtil.initFolder(`/models`); + await this.fileUtil?.initFolder(`/models/model_enc`); + const folderPath = await this.fileUtil?.initFolder(`/models`); this.folderPath = folderPath; } //后续文件路径待替换 - private fileUtil: FileUtils + private fileUtil?: FileUtils constructor(context:common.UIAbilityContext) { (async () => { @@ -30,7 +30,7 @@ export default class FileModel { // 存储zip文件并解压 public storingFiles = async (str:string) => { - await this.fileUtil.editFile(`${this.folderPath}/model.zip`, str) + await this.fileUtil?.editFile(`${this.folderPath}/model.zip`, str) const folderPath = this.folderPath let options:Options = { @@ -53,13 +53,14 @@ export default class FileModel { //获取文件内容 public getModelContent = (folderPath:string, fileName:string) => { try { - return this.fileUtil.getFileContent(`${folderPath}/${fileName}`); + return this.fileUtil?.getFileContent(`${folderPath}/${fileName}`); } catch (e) { - console.info('surenjun', JSON.stringify(e)) + console.info('surenjun', JSON.stringify(e)); promptAction.showToast({ message: `请检查模型路径${folderPath}/${fileName}是否正确！`, duration: 4000 - }) + }); + return null; // 添加返回值 } } } \ No newline at end of file diff --git a/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ets b/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ets index 24ce2cc..3847002 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ets +++ b/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ets @@ -101,8 +101,8 @@ export function getKmProjectVoice( lane: JudgeLane, xmxh: string ) { - const carInfo = AppStorage.get('carInfo'); - const examSubject = carInfo.examSubject; + const carInfo = AppStorage.get('carInfo')!; + const examSubject = carInfo.examSubject||"2"; const param506Str: number[] = (Reflect.get(judgeConfig, '506')?.split(',')) || [] const param512Str: number[] = (Reflect.get(judgeConfig, '512')?.split(',')) || [] const param544Str: number[] = (Reflect.get(judgeConfig, '544')?.split(',')) || []