From b3a208e8a6079d6aa37a290f6e8badc48c106519 Mon Sep 17 00:00:00 2001 From: lvyuankang <1344032923@qq.com> Date: Tue, 18 Feb 2025 13:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/model/api.ets | 25 +++++++++++++++++++ entry/src/main/ets/pages/CarCheck.ets | 3 ++- entry/src/main/ets/pages/ExaminerLogin.ets | 6 +++-- entry/src/main/ets/pages/Index.ets | 15 +++++------ entry/src/main/ets/pages/Judge.ets | 3 ++- entry/src/main/ets/pages/UserInfo.ets | 16 +++++++++++- .../ets/pages/compontents/FaceCompare.ets | 4 +-- .../judge/BoardPrePareSetPopup.ets | 19 +++++++++----- 8 files changed, 69 insertions(+), 22 deletions(-) diff --git a/entry/src/main/ets/model/api.ets b/entry/src/main/ets/model/api.ets index 56acc9b3..aefcb723 100644 --- a/entry/src/main/ets/model/api.ets +++ b/entry/src/main/ets/model/api.ets @@ -12,3 +12,28 @@ interface Head { resultMessage: string; } +export interface TimeInfo { + mode: string; + url: string; + paraKdid: string; + kdid: string; + carid: string; + ksdd: string; +} + +export interface Carinfo { + carId: string; + examinationRoomId: string; + plateNo?: string; + isNeedCheck: string; + examSubject:number| string; +} +export interface examinerLoginInfo{ + carId?: string; + examinationRoomId?: string; + examinerName?: string; + examinerPwd?: string; + username?: string; + kgxm?:string; + ksyh?:string; +} \ No newline at end of file diff --git a/entry/src/main/ets/pages/CarCheck.ets b/entry/src/main/ets/pages/CarCheck.ets index b13af36d..ee9c1dda 100644 --- a/entry/src/main/ets/pages/CarCheck.ets +++ b/entry/src/main/ets/pages/CarCheck.ets @@ -8,6 +8,7 @@ import { DwMapData, PassData, RealNumData, StackValueData, WarnFlagData, WarnFla import { BaseInfoType } from '../model/Common'; import { CarCheckDataType, CarConfigurationParams, CarInfoType } from '../model/CarCheck'; import { BusinessError } from '@ohos.base'; +import { Carinfo } from '../model'; @Entry @Component @@ -39,7 +40,7 @@ struct Index { @State devPath: string = "/dev/ttyS3" @State stopFlag: boolean = false @State fromIndex: boolean = false - @State carInfo: CarInfoType = {} + @State carInfo: Carinfo = {} private vocObj: ESObject; // private AccountTable = new AccountTable(()=>{},CommonConstants); diff --git a/entry/src/main/ets/pages/ExaminerLogin.ets b/entry/src/main/ets/pages/ExaminerLogin.ets index 57c9e44d..bf67cc06 100644 --- a/entry/src/main/ets/pages/ExaminerLogin.ets +++ b/entry/src/main/ets/pages/ExaminerLogin.ets @@ -8,6 +8,8 @@ import { UserLoginType } from '../model/ExaminerLogin'; import { BusinessError } from '@ohos.base'; import { CarCheckDataType } from '../model/CarCheck'; import { examinerLogin } from '../api/login'; +import { examinerLoginInfo,Carinfo } from '../model/index' + @Entry @Component @@ -93,7 +95,7 @@ struct Index { if (this.limit) { return } - const carInfo: CarCheckDataType = AppStorage.get('carInfo') + const carInfo: Carinfo = AppStorage.get('carInfo') const param: UserLoginType = { carId: carInfo.carId as string, examinationRoomId: carInfo.examinationRoomId as string, @@ -127,7 +129,7 @@ struct Index { }, router.RouterMode.Single); console.log('res11', JSON.stringify(res)) - const examinerLoginInfo: ESObject = res.examinerLoginRsp.body + const examinerLoginInfo: examinerLoginInfo = res.examinerLoginRsp.body examinerLoginInfo.username = this.inputTextArr[0] AppStorage.setOrCreate('examinerLoginInfo', examinerLoginInfo) }).catch((err: BusinessError) => { diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 5123b2d6..e2a2c66e 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -20,14 +20,13 @@ import imageBtn from './compontents/imageBtn'; import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; import { BaseInfoType } from '../model/Common'; import { CarCheckDataType } from '../model/CarCheck'; +import { Carinfo, TimeInfo } from '../model'; // import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; @Entry @Component struct Index { - @State carNum: string = '' - @State version: string = '' @State url: string = '' @State hasAuth: boolean = false; @State dialogVisiable: boolean = false; @@ -41,7 +40,7 @@ struct Index { @State loading: boolean = false @State initParamFlag: boolean = false @State fd: number = -1; - @State carInfo: CarCheckDataType = {}; + @State carInfo: Carinfo = {}; @State num: number = 0; fileHelper = null; errorDialog: CustomDialogController = new CustomDialogController({ @@ -61,7 +60,7 @@ struct Index { private interval = -1; // private vocObj = null; private avPlayer - private timeInfo + private timeInfo:TimeInfo private workerInstance = null; private context = getContext(this) as common.UIAbilityContext; @@ -217,7 +216,7 @@ struct Index { .width('30%') .margin({ bottom: 10 }) - Text('授权信息：' + (this.hasAuth ? '已授权' : '未授权')) + Text('授权信息：' + (this.baseInfo.hasAuth ? '已授权' : '未授权')) .fontColor('#CCAE7A') .fontSize(18 * this.ratio) .width('30%') @@ -523,7 +522,7 @@ struct Index { async onPageShow() { console.log('ttttt', 1111) this.singlePlay = AppStorage.get('singlePlay') - this.baseInfo = AppStorage.get('baseInfo') as baseInfo + this.baseInfo = AppStorage.get('baseInfo') as BaseInfoType await this.userAuth(); if (this.singlePlay == undefined || this.singlePlay == null) { // setVideoParam() @@ -614,9 +613,7 @@ struct Index { AppStorage.setOrCreate('distanceClass', distanceClass) console.info('surenjun', 'distanceClass=>初始化完成') } - this.carNum = this.carInfo.plateNo; - this.version = this.baseInfo.version; - this.hasAuth = this.baseInfo.hasAuth; + setTimeout(() => { this.initParamFlag = true }, 3000) diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 7a5ce1a8..784a0a18 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -30,6 +30,7 @@ import { judgeConfig } from './judgeSDK/utils/judgeConfig'; import FileUtil from '../common/utils/File'; import SignDisplayCom from './compontents/signDisplayCom'; +import { Carinfo } from '../model/api'; @Entry @Component @@ -137,7 +138,7 @@ struct Index { @State popTimer: number = 0; @State carlist: string = '' @State errorMsg: string = '' - @State carInfo: object = {} + @State carInfo: Carinfo = {} @State isErrorMsgEnd: boolean = false @State disConnectErrorOpen: boolean = false private context = getContext(this) as common.UIAbilityContext; diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index aed2318d..c9600fee 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -23,7 +23,7 @@ import FileUtil from '../common/utils/File'; import DB, { ColumnType } from '../common/database/DbSql'; import { LabelBlockType, QKParamType, SckType, SystemParamType, User } from '../model'; import { BusinessError } from '@ohos.base'; - +import {Carinfo,examinerLoginInfo} from '../model/index' @Entry @Component struct UserInfo { @@ -74,6 +74,20 @@ struct UserInfo { @State faceFlag: string = '0'; @State FaceOpenStatue: string = '0'; //是否开启人脸识别 @State faceCatchImg: string = '' + @State carInfo: Carinfo = { + carId: '', + examinationRoomId: '', + plateNo: '', + isNeedCheck: '', + examSubject:'' + } + @State examinerLoginInfo: examinerLoginInfo = { + carId: '', + examinationRoomId: '', + plateNo: '', + isNeedCheck: '', + examSubject:'' + } @State systemParam: SystemParamType = { Param341: true, Param803Str: '0', diff --git a/entry/src/main/ets/pages/compontents/FaceCompare.ets b/entry/src/main/ets/pages/compontents/FaceCompare.ets index 103ef207..2de49bc2 100644 --- a/entry/src/main/ets/pages/compontents/FaceCompare.ets +++ b/entry/src/main/ets/pages/compontents/FaceCompare.ets @@ -7,7 +7,7 @@ import { string2Bytes } from '../../common/utils/tools'; import { takePhoto } from '../../service/videoService'; import { GlobalConfig } from '../../config/index'; import { VideoConfigData } from '../../mock'; -import { VideoConfig } from '../../model'; +import { Carinfo, VideoConfig } from '../../model'; import App from '@system.app'; @Component @@ -30,7 +30,7 @@ export default struct FaceCompare { @State showControls: boolean = false @State isAutoPlay: boolean = true @State signNum: number = 0; - @State carinfo: object = {}; + @State carinfo: Carinfo = {}; @State param: VideoConfig = VideoConfigData private times = 1; //人脸比对失败次数， 超过3次将不会自动比对，需要点击重新打开重新触发 private vocObj = null; diff --git a/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets b/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets index 108159be..02ecaf87 100644 --- a/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets +++ b/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets @@ -8,6 +8,7 @@ import { MarkRule, SYSSET } from '../../judgeSDK/api/judgeSDK.d'; import { uploadExamProgressData, writeObjectOut } from '../../../api/judge'; import JudgeTask from '../../judgeSDK/utils/judgeTask'; import FilePhoto from '../../judgeSDK/utils/filePhoto'; +import { Carinfo } from '../../../model/api'; interface SEL { fontColor: string @@ -55,7 +56,13 @@ export default struct DeductedPopup { @State manualMarkRules: MarkRule[] = [] @State lineBg: Array = ['#4D4136', '#26231E'] @State selectedLine: number = undefined - @State carInfo: object = {} + @State carInfo: object = { + carId: '', + examinationRoomId: '', + plateNo: '', + isNeedCheck: '', + examSubject:'', + } @State singlePlay: boolean = false private closePopup: Function = () => { } @@ -98,7 +105,7 @@ export default struct DeductedPopup { //本地数据初始化 async initDb() { const {isTrajectoryOpen,trajectoryPath} = judgeConfig - const examSubject = this.carInfo.examSubject; + const examSubject= this.carInfo.examSubject; //轨迹回放读取 systemparam表、markrule表 const fileUtil = new FileUtil(this.context); const folderPath = await fileUtil.initFolder(trajectoryPath); @@ -209,7 +216,7 @@ export default struct DeductedPopup { //项目开始 async beginProject() { //项目开始 //过程照片 //扣分 //结束考试 - const carInfo = this.carInfo; + const carInfo:Carinfo= this.carInfo; const { examSubject,plateNo } = carInfo; const {serialNumber,lsh,idCard,ksxl,kslx,ksdd} = this const time = await getCurrentTime(); @@ -268,8 +275,8 @@ export default struct DeductedPopup { const {serialNumber,lsh,idCard,ksdd,kfdmArr} = this; const kfLen = kfdmArr.length; const kf = kfdmArr[kfLen -1]; - const carInfo = this.carInfo; - const { examSubject} = carInfo; + const carInfo:Carinfo = this.carInfo; + const { examSubject} = this.carInfo; const time = await getCurrentTime(); const kfData = { xtlb: '17', jkxlh: serialNumber, jkid: '17C53', @@ -317,7 +324,7 @@ export default struct DeductedPopup { //考试结束 async endFn() { const {serialNumber,lsh,idCard,score,getPhoto} = this; - const carInfo = this.carInfo; + const carInfo:Carinfo = this.carInfo; const { examSubject,plateNo } = carInfo; const time = await getCurrentTime(); const photoBase64 = await getPhoto();