From 06ad18fccb1237ef227df38f58daf76d2f851fb2 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Wed, 29 Oct 2025 10:44:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E7=A8=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/oh-package-lock.json5 | 2 +- .../main/ets/pages/Judge/BaseJudgeBussines.ets | 1 - entry/src/main/ets/pages/UserInfo.ets | 2 ++ entry/src/main/ets/utils/LogWorker.ets | 7 +++---- entry/src/main/ets/workers/Log.ets | 11 +++++++---- oh-package-lock.json5 | 18 ++++++++++-------- 6 files changed, 23 insertions(+), 18 deletions(-) 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/pages/Judge/BaseJudgeBussines.ets b/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets index d3bba8c..d99b995 100644 --- a/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets +++ b/entry/src/main/ets/pages/Judge/BaseJudgeBussines.ets @@ -752,7 +752,6 @@ export class BaseJudge { async judgeEnd(judgeUI: JudgePage, that: JudgeBusiness, isManual?: boolean) { dConsole.info(JudgeTag, '收到远程结束考试消息3') - dConsole.closeProcessData() const isAllProjectsEnd = judgeUI.isAllProjectsEnd const examSubject = judgeUI.examSubject const singlePlay = judgeUI.singlePlay diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 028189a..21fedef 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -219,6 +219,7 @@ struct UserInfoPage { ] async onPageShow() { + dConsole.closeProcessData() this.avPlayer = new VoiceAnnounce(this.context); this.isExamStart = false this.startExam = false @@ -1183,6 +1184,7 @@ struct UserInfoPage { .onClick(() => { if ((this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') || this.systemParam.Param770Str == '1') { + dConsole.log(UserInfoTag, '不允许缺考') return } // this.qkFlag = true diff --git a/entry/src/main/ets/utils/LogWorker.ets b/entry/src/main/ets/utils/LogWorker.ets index 0ff9e4f..d327718 100644 --- a/entry/src/main/ets/utils/LogWorker.ets +++ b/entry/src/main/ets/utils/LogWorker.ets @@ -1,6 +1,6 @@ // 日志向外暴露的方法 import worker from '@ohos.worker'; -import { GlobalConfig } from '../config'; +import { GlobalConfig, LogTag } from '../config'; import { LogWorkerMessage, ProcessDataEnumType, WorkerMessageType } from '../model/index'; import dayTs from './Date'; @@ -87,12 +87,11 @@ class logWorker { // 关闭过程数据写入 closeProcessData() { + dConsole.log(LogTag, "关闭过程数据1") let params: LogWorkerMessage = { type: WorkerMessageType.CloseProcessData, } - if (this.isLogEnabled === "1") { - this.workerInstance?.postMessage(JSON.stringify(params)) - } + this.workerInstance?.postMessage(JSON.stringify(params)) } // 通用日志方法 diff --git a/entry/src/main/ets/workers/Log.ets b/entry/src/main/ets/workers/Log.ets index a8a3fb1..8ba1511 100644 --- a/entry/src/main/ets/workers/Log.ets +++ b/entry/src/main/ets/workers/Log.ets @@ -33,6 +33,7 @@ workerPort.onmessage = (e: MessageEvents) => { } // 关闭过程数据 if (result.type === WorkerMessageType.CloseProcessData) { + console.log(LogTag, "关闭过程数据") CloseProcessData() } } @@ -113,10 +114,12 @@ async function processQueue() { // 关闭过程数据 function CloseProcessData() { - fileFdArr.forEach((item: number) => { - fs.closeSync(item) - }) - console.log(LogTag, "关闭过程数据") + if (fileFdArr.length > 0) { + console.log(LogTag, "有文件需要 关闭过程数据") + fileFdArr.forEach((item: number) => { + fs.closeSync(item) + }) + } } workerPort.onmessageerror = (e: MessageEvents) => { 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