diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 0f67099..61a6792 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -78,12 +78,15 @@ export default class EntryAbility extends UIAbility { isJudgeInitBool: false, }) - // AppStorage.setOrCreate('windowClass', windowClass) - const config = AppStorage.get("EnvironmentConfiguration") - await windowClass.setWindowLayoutFullScreen(true) - console.log("是否调试模式", config?.isOpenDebugger) - if (config?.isOpenDebugger === "0") { - await windowClass.setWindowSystemBarEnable([]) //全屏 + let fileUtil = new FileUtils(this.context) + const data = await fileUtil.readFile(GlobalConfig.commonFileWriteAddress + '/config/ipConfig.txt'); + if (data !== '' && data !== undefined) { + const config: EnvironmentConfigurationType = JSON.parse(data) + await windowClass.setWindowLayoutFullScreen(true) + console.log("是否调试模式", config?.isOpenDebugger) + if (config?.isOpenDebugger === "0") { + await windowClass.setWindowSystemBarEnable([]) //全屏 + } } windowStage.loadContent('pages/Index', (err, data) => { if (err.code) { diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index f25e3f6..11a927d 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -31,7 +31,6 @@ import { MarkRules, MASYSSETTableType, PerLane, - ProcessDataEnumType, Project, ProjectInfo, ProjectInfos, @@ -43,7 +42,6 @@ import { } from '../model'; import { GetSyncData } from '../utils/table/Operation'; import dayTs from '../utils/Date'; -import { GetCurrentTime } from '../utils/Common'; import FileUtils from '../utils/FileUtils'; import SignalTrajectoryDialog from './Judge/components/SignalTrajectoryDialog'; import { DefaultJudgeConfigData, InitialPerLane } from '../mock'; @@ -210,7 +208,7 @@ struct JudgePage { async aboutToAppear() { this.carInfo = AppStorage.get('carInfo')! this.singlePlay = AppStorage.get('singlePlay')! - this.startFullTime = GetCurrentTime(1); + this.startFullTime = dayTs().format("YYYYMMDDHHmmss"); this.startTime = dayTs().format("YYYY-MM-DD HH:mm:ss") this.startExamTime = dayTs().format("YYYY-MM-DD HH:mm:ss") // let count = 0; @@ -749,13 +747,13 @@ struct JudgePage { singlePlay: this.singlePlay, judgeConfigObj: this.judgeConfigObj, signalViewingClick: () => { - dConsole.writeProcessData(ProcessDataEnumType.FourOneLogByteData, '测试测试') this.signalTrajectoryDialogController.open() }, artificialEvaluationClick: () => { this.isDeductedPopShow = true }, endTheExamClick: () => { + dConsole.log(JudgeTag, "点击结束考试按钮") this.endExamDialogController.open() } })