diff --git a/entry/src/main/ets/config/judge.ets b/entry/src/main/ets/config/judge.ets index 0440403..907424a 100644 --- a/entry/src/main/ets/config/judge.ets +++ b/entry/src/main/ets/config/judge.ets @@ -12,7 +12,7 @@ import { JudgeConfigType } from '../model' //考试回放开关 export const JudgeConfig:JudgeConfigType = { //本地目录开关 - isTrajectoryOpen: false, + isTrajectoryOpen: true, //是否开启拍照 isPhotoOpen: true, //扣分语音是否强制开启 @@ -26,7 +26,7 @@ export const JudgeConfig:JudgeConfigType = { // 本地模型地址 modelPath: 'models/model_enc', // 济南科目三 - trajectoryPath: 'logs/2024_12_26/2024_12_26_14_12_51_2412505941910_370125200404041910_赵宇/judge_exam_data.txt', + trajectoryPath: 'logs/2024_10_12/2024_10_12_11_50_10_9999427676823_744299437502336256_隋统/judge_exam_data.txt', //四合一画面配置 fourInOneScreen: { //gps位数 diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 6b3131e..a3afa47 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -261,6 +261,7 @@ struct Index { } } .width('100%') + .height(100) .justifyContent(FlexAlign.SpaceBetween) Row() { diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 0f32a28..5b8acd0 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -130,7 +130,6 @@ struct UserInfo { if (this.ksksLimit) { return } - console.log('routerParamrouterParam') try { await this.checkSignal() this.faceCompareSucess = 0 @@ -235,9 +234,7 @@ struct UserInfo { if (!this.singlePlay) { if (routerParam.type != "1") { - // this.list = await getSyncData('USERLIST') this.list = await GetSyncData("USERLIST") - // const data = await getSyncData('USER') const data = await GetSyncData("USER") console.log('useruser,', JSON.stringify(this.list)) console.log('useruser1,', JSON.stringify(data)) @@ -476,7 +473,7 @@ struct UserInfo { //考点端查询缺考指令内容消息请求 getqkFn() { let tmpList: Array = []; - const number=AppStorage.get('signNum')! + const number = AppStorage.get('signNum')! tmpList.push(NumberToByteArray(number, 1 * 8)[0]) const param: UDPParamType = { id: 41, @@ -1200,17 +1197,11 @@ struct UserInfo { .margin({ left: 53 * this.ratio }) Column() { - // Image($r('app.media.yydj_btn')) - // .commStyle() imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.yydj_btn') }) .margin({ bottom: 12 * this.ratio }) - - // Image($r('app.media.gx_btn')) - // .commStyle() imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.gx_btn') }) .margin({ bottom: 12 * this.ratio }) .onClick(() => { - // this.avPlayer.playAudio(['button_media.wav']) if (this.isExamStart && !this.singlePlay) { return } @@ -1218,12 +1209,9 @@ struct UserInfo { this.numCount = 0 this.getExaminationStudentInfoFn() }) - // Image($r('app.media.qk_btn')) - // .commStyle() imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.qk_btn') }) .margin({ bottom: 12 * this.ratio }) .onClick(() => { - // this.avPlayer.playAudio(['button_media.wav']) // 已开始考试不能缺考 已考过一次学员不能缺考 车上不能缺考 if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') || this.systemParam.Param770Str == '1') { @@ -1236,8 +1224,6 @@ struct UserInfo { if (this.isBoardPrePareSetPopupOpen && (this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') && !this.isFirstBoardPrePareSetPopupBtnShow) { - //上车准备 - // Image($r('app.media.sczb_btn')).commStyle() imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.sczb_btn') }) .margin({ bottom: 12 * this.ratio }) .onClick(async () => { @@ -1247,8 +1233,6 @@ struct UserInfo { await this.prePareSCZB() }) } else { - // Image($r('app.media.ksks_btn')) - // .commStyle() imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.ksks_btn') }) .margin({ bottom: 12 * this.ratio }) .onClick(async () => { diff --git a/entry/src/main/ets/pages/compontents/TopLogo.ets b/entry/src/main/ets/pages/compontents/TopLogo.ets index d0f8d57..15bc1a6 100644 --- a/entry/src/main/ets/pages/compontents/TopLogo.ets +++ b/entry/src/main/ets/pages/compontents/TopLogo.ets @@ -9,44 +9,6 @@ export default struct TopLogo { @Link outFlag: boolean; //返回按钮触发 private timer: number = -1; - constructor() { - super() - } - - build() { - Column() { - Column() { - } - .backgroundColor('#333230') - .width('100%') - .height('100%') - - Row() { - Row() { - Image($r('app.media.shortLogo')) - .width('10.2%') - .height('75%') - .margin({ left: 30 * this.ratio, top: -15 * this.ratio }) - Text(this.timeText) - .fontSize(30 * this.ratio) - .fontColor('#CCB48F') - .margin({ top: -15 * this.ratio, left: 14 * this.ratio }) - } - - imageBtn({ btnWidth: '13.5%', imgSrc: $r('app.media.topB_back') }) - .onClick(() => { - this.outFlag = true - router.back() - }) - } - .position({ x: 0, y: 0 }) - .width('100%') - .justifyContent(FlexAlign.SpaceBetween) - } - .width('100%') - .height('8%') - } - async aboutToAppear() { this.timeText = GetCurrentTime(); this.timer = setInterval(async () => { @@ -57,5 +19,30 @@ export default struct TopLogo { aboutToDisappear() { clearInterval(this.timer) } + + build() { + Row() { + Row() { + Image($r('app.media.shortLogo')) + .width('10.2%') + .height('75%') + .margin({ left: 30 * this.ratio, top: -15 * this.ratio }) + Text(this.timeText) + .fontSize(30 * this.ratio) + .fontColor('#CCB48F') + .margin({ top: -15 * this.ratio, left: 14 * this.ratio }) + } + + imageBtn({ btnWidth: '14.5%', imgSrc: $r('app.media.topB_back') }) + .onClick(() => { + this.outFlag = true + router.back() + }) + } + .width('100%') + .height(100) + .justifyContent(FlexAlign.SpaceBetween) + .backgroundColor('#333230') + } }