diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index a3afa47..a7481b5 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -150,6 +150,7 @@ struct Index { } practice() { + AppStorage.setOrCreate('singlePlay', true) if (JudgeConfig.isTrajectoryOpen) { router.pushUrl({ url: 'pages/UserInfo', diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 5b8acd0..a4976f1 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -138,12 +138,12 @@ struct UserInfo { return } this.ksksLimit = true - if (this.singlePlay) { - // const { examSubject } = this.carInfo; this.currentUser.id = '0' - // await upDateTableByArray('USER', [this.currentUser]) - await SqlInsertTable('USER', [this.currentUser]) + console.log('开始考试') + SqlInsertTable('USER', [this.currentUser]).catch((e: BusinessError) => { + console.log("error", JSON.stringify(e)) + }) router.pushUrl({ url: this.carInfo.examSubject == '3' ? 'pages/Roads' : 'pages/Judge', params: { @@ -152,7 +152,6 @@ struct UserInfo { } }, router.RouterMode.Single); this.ksksLimit = false - this.stopDeviceById() return } @@ -221,6 +220,7 @@ struct UserInfo { this.currentUser = EmptyCandidateObject this.filePhoto = new FilePhoto(this.context); this.singlePlay = AppStorage.get('singlePlay') || false + console.log("this.singlePlay", this.singlePlay) this.examinerLoginInfo = AppStorage.get('examinerInfo')! this.carInfo = AppStorage.get('carInfo')! //语音功能on @@ -905,8 +905,6 @@ struct UserInfo { // 检测车门、熄火信号 async checkSignal(): Promise { - // const { isCheckFireOpen } = judgeConfig - // const { systemParam } = this; const Param803Str = this.systemParam.Param803Str if (Param803Str === '') { return true @@ -1267,7 +1265,6 @@ struct UserInfo { } .commStyle() .onClick(() => { - // this.avPlayer.playAudio(['button_media.wav']) this.ksksLimit = false this.qkFlag = false }) diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ets b/entry/src/main/ets/pages/judgeSDK/judge.ets index d99fe18..3e96ce4 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ets +++ b/entry/src/main/ets/pages/judgeSDK/judge.ets @@ -689,10 +689,10 @@ export default class Judge { (judgeUI.examSubject == '2' ? testKm2Items : testKm3Items).forEach(item => { const projectCenterObj: ProjectInfo = Reflect.get(judgeUI.projectsCenterObj, item.code) - const currentItem: KmItem = Reflect.get(this.kmItems, item.code) - currentItem.code = item.code - currentItem.status = projectCenterObj === undefined ? 0 : (projectCenterObj.isEnd ? 3 : 1) - Reflect.set(this.kmItems, item.code, currentItem) + Reflect.set(this.kmItems, item.code, { + code: item.code, + status: projectCenterObj === undefined ? 0 : (projectCenterObj.isEnd ? 3 : 1) + }) }) console.info(judgeTag + 'testKmItems', JSON.stringify(this.kmItems)) @@ -955,7 +955,7 @@ export default class Judge { //扣分类型 type: kf.type } - //扣分信息 + //扣分信息 this.kfArr?.push(kfObj) this.judgeUI.totalScore += Number(thisKf?.score); if (kf.xmdm != 20) { @@ -1090,21 +1090,21 @@ export default class Judge { const project: ProjectInfo = Reflect.get(projectsObj, xmdm) const code = project.projectCodeCenter; const isEnd = project.isEnd; - // const kmCode = getKmProjectVoice(code, 1, judgeConfigObj, lane, xmxh) - // if (!ignoreVoiceCodeArr.includes(code)) { - // if(examSubject == 2 && ((xmdm == 0 && f == 2) || (xmdm == 1 && s == 2) || xmdm == 3)){ - // //倒出入库、桩考\进项目语音控制 - // }else{ - // kmCode && avPlayer.playAudio([`voice/${kmCode}.mp3`],true) - // } - // } + // const kmCode = getKmProjectVoice(code, 1, judgeConfigObj, lane, xmxh) + // if (!ignoreVoiceCodeArr.includes(code)) { + // if(examSubject == 2 && ((xmdm == 0 && f == 2) || (xmdm == 1 && s == 2) || xmdm == 3)){ + // //倒出入库、桩考\进项目语音控制 + // }else{ + // kmCode && avPlayer.playAudio([`voice/${kmCode}.mp3`],true) + // } + // } setTimeout(() => { if (Reflect.get(param512, 7) != 0) { clearTimeout(this.deductedPopShowTimer) this.judgeUI.isDeductedPopShow = true } }, 200) - //项目已考不上传监管信息 + //项目已考不上传监管信息 if (!isEnd) { judgeTask.addTask(async () => { console.info(judgeTag, `项目开始-${xmdm}-${project.name}`) @@ -1160,7 +1160,7 @@ export default class Judge { // 扣分 case 3: console.info('surenjun', '扣分开始') - //扣分时实时播报语音(0-否+1-是) + //扣分时实时播报语音(0-否+1-是) const currentKf = kf[kfLen -1]; if (JudgeConfig.kfVoiceOpen || (examSubject == '2' && judgeConfigObj['618'] == '1') || (examSubject == '3' && judgeConfigObj['418'] == '1')) { @@ -1185,7 +1185,7 @@ export default class Judge { // 考试结束 case 5: console.info(judgeTag, '考试结束') - //关闭录像 + //关闭录像 const singlePlay = AppStorage.get('singlePlay') if (!singlePlay && this.videoData) { await endRecordVideo(this.videoData) @@ -1195,8 +1195,8 @@ export default class Judge { AppStorage.setOrCreate('isJudge', false) await handEndExam(ksjs) }) - // TODO待修改 - // clearInterval(globalThis.judgeTimer) + // TODO待修改 + // clearInterval(globalThis.judgeTimer) break default: break @@ -1830,7 +1830,7 @@ export default class Judge { case 4: this.judgeUI.isDwztRight = false; - //差分异常上报 + //差分异常上报 break; } }