diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 3b988465..5828707f 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -17,13 +17,17 @@ import promptAction from '@ohos.promptAction'; import FilePhoto from './judgeSDK/utils/filePhoto'; import { getSyncData, upDateTableByArray } from '../common/service/initable'; import { CandidateData, EmptyCandidateObject } from '../mock/CandidateData'; -import BoardPrePareSetPopup from './compontents/judge/BoardPrePareSetPopup'; +import BoardPrePareSetPopup from './compontents/judge/BoardPrePareSetPopup' +import LoadingPopup from './compontents/judge/LoadingPopup'; import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; +import { JudgeConfig } from '../config/judge'; import { judgeConfig } from './judgeSDK/utils/judgeConfig'; @Entry @Component struct UserInfo { + private filePhoto: FilePhoto + private avPlayer @State pageIndex: number = 0 @State ratio: number = 1700 / 960 @State index: number = 0 @@ -42,12 +46,9 @@ struct UserInfo { @State isBoardPrePareSetPopupOpen: boolean = false @State isFirstBoardPrePareSetPopupBtnShow: boolean = false @State isBoardPrePareSetPopupShow: boolean = false - @State isLoadingPopupVisible: boolean = false; - @State loadingText: string = '正在生成考试记录,请稍后...' - @State sczbkf: { - xmdm: number, - kfdm: string - }[] = [] + @State isLoadingPopupVisible:boolean = false; + @State loadingText:string = '正在生成考试记录,请稍后...' + @State sczbkf:{xmdm:number,kfdm:string}[] = [] @State currentUser: User = EmptyCandidateObject @State dataList: Array = [] @State list: Array = [] @@ -60,7 +61,7 @@ struct UserInfo { @State idCard: string = ''; @State grantDept: string = ''; //是否已经开始考试 - @State isExamStart: boolean = false; + @State isExamStart:boolean = false; @State effectDate: string = ''; @State interval: any = null; @State studentRefreshStatue: string = '0'; @@ -519,42 +520,18 @@ struct UserInfo { return } // } - this.AccountTable.query('0', (result) => { - if (result.length == 0) { - this.isExamStart = true - this.AccountTable.insertData(this.currentUser, (id) => { - this.AccountTable.query('0', (result) => { - globalThis.statue = 4 - this.stepFlag = false - router.pushUrl({ - url: 'pages/Judge', - params: { - examItems: examItems?.getExaminationItemRsp?.body?.ykxx, - sczb: Number(this.isBoardPrePareSetPopupOpen), - kfdm: this.sczbkf - } - }, router.RouterMode.Single); - this.stopDeviceById() - }) - }) - } else { - this.AccountTable.updateData(this.currentUser, (id) => { - this.AccountTable.query('0', (result) => { - this.stepFlag = false - router.pushUrl({ - url: 'pages/Judge', - params: { - examItems: examItems?.getExaminationItemRsp?.body?.ykxx, - sczb: Number(this.isBoardPrePareSetPopupOpen), - kfdm: this.sczbkf - } - }, router.RouterMode.Single); - globalThis.statue = 4 - this.stopDeviceById() - }) - }) + await upDateTableByArray('USER', [this.currentUser]) + globalThis.statue = 4 + this.stepFlag = false + router.pushUrl({ + url: 'pages/Judge', + params: { + examItems: examItems?.getExaminationItemRsp?.body?.ykxx, + sczb: Number(this.isBoardPrePareSetPopupOpen), + kfdm: this.sczbkf } - }) + }, router.RouterMode.Single); + this.stopDeviceById() this.stepFlag = false } @@ -678,8 +655,6 @@ struct UserInfo { .backgroundImageSize({ width: '100%', height: '100%' }) .onClick(() => { this.currentUser = item - - }) }) }.width(640 * this.ratio).margin({ left: 30 * this.ratio }) @@ -791,35 +766,15 @@ struct UserInfo { if (globalThis.singlePlay) { const {examSubject} = globalThis.carInfo; console.info('surenjun => sczbkf', JSON.stringify(this.sczbkf)) - this.AccountTable.query('0', (result) => { - if (result.length == 0) { - this.AccountTable.insertData(this.currentUser, (id) => { - this.AccountTable.query('0', (result) => { - router.pushUrl({ - url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge', - params: { - sczb: Number(this.isBoardPrePareSetPopupOpen), - kfdm: this.sczbkf - } - }, router.RouterMode.Single); - this.stopDeviceById() - }) - }) - } else { - this.AccountTable.updateData(this.currentUser, (id) => { - this.AccountTable.query('0', (result) => { - router.pushUrl({ - url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge', - params: { - sczb: Number(this.isBoardPrePareSetPopupOpen), - kfdm: this.sczbkf - } - }, router.RouterMode.Single); - this.stopDeviceById() - }) - }) + await upDateTableByArray('USER', [this.currentUser]) + router.pushUrl({ + url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge', + params: { + sczb: Number(this.isBoardPrePareSetPopupOpen), + kfdm: this.sczbkf } - }) + }, router.RouterMode.Single); + this.stopDeviceById() return } if (this.FaceOpenStatue != '0') {