diff --git a/entry/src/main/ets/model/Worker.ets b/entry/src/main/ets/model/Worker.ets index 9d7e00d..789fbc4 100644 --- a/entry/src/main/ets/model/Worker.ets +++ b/entry/src/main/ets/model/Worker.ets @@ -112,22 +112,22 @@ export enum WorkerMessageType { // 过程数据枚举 export enum ProcessDataEnumType { - //four_one_log_byte_data - FourOneLogByteData = "0", - //four_one_log_data - FourOneLogData = "1", + // //four_one_log_byte_data + // FourOneLogByteData = "0", + // //four_one_log_data + // FourOneLogData = "1", //judge_exam_data - JudgeExamData = "2", + JudgeExamData = "0", //judge_log_data - JudgeLogData = "3", + JudgeLogData = "1", //judge_progress_callback_data - JudgeProgressCallbackData = "4", + JudgeProgressCallbackData = "2", //plc_data - PlcData = "5", + PlcData = "3", //wuxi_exam_data - WuxiExam = "6", + WuxiExam = "4", //wuxi_progress_data - WuxiProgressData = "7" + WuxiProgressData = "5" } export interface FileQueueType { diff --git a/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets b/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets index 55c5e7f..55d2762 100644 --- a/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets +++ b/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets @@ -533,6 +533,7 @@ export class BaseJudge { AppStorage.setOrCreate('isJudgeInitBool', true) dConsole.info(JudgeTag, '4.评判初始化完成') } + dConsole.writeProcessData(ProcessDataEnumType.JudgeExamData, JSON.stringify(initInfo)) AppStorage.setOrCreate('isJudge', true) // 2.评判过程回调 await examJudgeSetRealExamCallback(async (strData: string, len: number) => { @@ -555,6 +556,7 @@ export class BaseJudge { // 3.开始考试 if (beginExamInfo) { await examJudgeBeginExam(beginExamInfo); + dConsole.writeProcessData(ProcessDataEnumType.JudgeExamData, JSON.stringify(beginExamInfo)) } dConsole.info(JudgeTag, '6.开始考试注册完成') that.avPlayer?.playAudio([judgeUI.singlePlay ? 'voice/ksks.wav' : 'voice/监管成功.mp3']) diff --git a/entry/src/main/ets/utils/business/GetDistance.ets b/entry/src/main/ets/utils/business/GetDistance.ets index 6a63534..99260dc 100644 --- a/entry/src/main/ets/utils/business/GetDistance.ets +++ b/entry/src/main/ets/utils/business/GetDistance.ets @@ -10,6 +10,16 @@ export default class GetDistance { public totalTime: number public date: string public fd: number + //上传行驶里程数据 + uploadData = async () => { + // setInterval(() => { + // // const { carId } = AppStorage.get('carInfo'); + // // const { date, timeStr, totalDistance } = this; + // return + // //"carid":"1001","startTime":"2024-08-24 08:09:01","time":"111233", "mileage":"1222" + // + // }, 5000) + } //后续文件路径待替换 private fileUtil: FileUtils // 设置文件夹 @@ -35,7 +45,6 @@ export default class GetDistance { this.fileUtil = fileUtil; } - // 过程文件数据 public setTimeData = async (str: number) => { console.log('folderPath', this.folderPath) @@ -55,14 +64,4 @@ export default class GetDistance { // `${folderPath}/${date}.txt`,contentArr.join('\n') // ); } - //上传行驶里程数据 - uploadData = async () => { - setInterval(() => { - // const { carId } = AppStorage.get('carInfo'); - // const { date, timeStr, totalDistance } = this; - return - //"carid":"1001","startTime":"2024-08-24 08:09:01","time":"111233", "mileage":"1222" - - }, 5000) - } } diff --git a/entry/src/main/ets/workers/Log.ets b/entry/src/main/ets/workers/Log.ets index 414c55c..340a006 100644 --- a/entry/src/main/ets/workers/Log.ets +++ b/entry/src/main/ets/workers/Log.ets @@ -7,7 +7,8 @@ import fs from '@ohos.file.fs'; const workerPort: ThreadWorkerGlobalScope = worker.workerPort; // 过程数据文件 -const fileNameArr: string[] = ["four_one_log_byte_data.txt", "four_one_log_data.txt", "judge_exam_data.txt", "judge_log_data.txt", "judge_progress_callback_data.txt", "plc_data.txt", "wuxi_exam_data.txt", "wuxi_progress_data.txt"] +// "four_one_log_byte_data.txt", "four_one_log_data.txt", +const fileNameArr: string[] = ["judge_exam_data.txt", "judge_log_data.txt", "judge_progress_callback_data.txt", "plc_data.txt", "wuxi_exam_data.txt", "wuxi_progress_data.txt"] // 过程数据fd let fileFdArr: number[] = [] let writeQueue: Array = [];