diff --git a/entry/src/main/ets/model/api.ets b/entry/src/main/ets/model/api.ets index 45b1f8b0..f5e270a8 100644 --- a/entry/src/main/ets/model/api.ets +++ b/entry/src/main/ets/model/api.ets @@ -20,7 +20,7 @@ export interface FaceCompareResp { imageCompareRsp: ImageCompareRsp } -export interface examinerLoginInfo { +export interface ExaminerLoginInfo { carId?: string; examinationRoomId?: string; examinerName?: string; @@ -30,6 +30,26 @@ export interface examinerLoginInfo { ksyh?: string; } +export interface Spzd { + carId?: string; + examinationRoomId?: string; + examinerName?: string; + examinerPwd?: string; + username?: string; + kgxm?: string; + ksyh?: string; +} + +export interface IdCard { + name?: string; + sex?: string; + nation?: string; + born?: string; + address?: string; + idCard?: string; + photo?: string; +} + export interface TimeInfo { mode: string; diff --git a/entry/src/main/ets/pages/CarCheck.ets b/entry/src/main/ets/pages/CarCheck.ets index b13af36d..806fdac9 100644 --- a/entry/src/main/ets/pages/CarCheck.ets +++ b/entry/src/main/ets/pages/CarCheck.ets @@ -313,7 +313,7 @@ struct Index { that.passArray[index] = true if (index == 2) { let flag = false - const spzd = AppStorage.get('spzd') + const spzd: Spzd = AppStorage.get('spzd') for (let key in pzd) { if (spzd[key]) { that.warnFlag[index] = '1' diff --git a/entry/src/main/ets/pages/ExaminerLogin.ets b/entry/src/main/ets/pages/ExaminerLogin.ets index e33b31c3..a95c9f5d 100644 --- a/entry/src/main/ets/pages/ExaminerLogin.ets +++ b/entry/src/main/ets/pages/ExaminerLogin.ets @@ -7,7 +7,7 @@ import imageBtn from './compontents/imageBtn'; import { UserLoginType } from '../model/ExaminerLogin'; import { BusinessError } from '@ohos.base'; import { examinerLogin } from '../api/login'; -import { CarInfoType, examinerLoginInfo } from '../model/index'; +import { CarInfoType, ExaminerLoginInfo } from '../model/index'; @Entry @@ -128,7 +128,7 @@ struct Index { }, router.RouterMode.Single); console.log('res11', JSON.stringify(res)) - const examinerLoginInfo: examinerLoginInfo = 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/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 4664d96e..43faf599 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -21,9 +21,8 @@ import errorMsgDialog from './compontents/errorMsgDialog'; import imageBtn from './compontents/imageBtn'; import FileUtil from '../common/utils/File'; import DB, { ColumnType } from '../common/database/DbSql'; -import { CarInfoType, LabelBlockType, QKParamType, SckType, SystemParamType, User } from '../model'; +import { CarInfoType, IdCard, LabelBlockType, QKParamType, SckType, SystemParamType, User } from '../model'; import { BusinessError } from '@ohos.base'; -import { examinerLoginInfo } from '../model/index'; @Entry @Component @@ -82,7 +81,13 @@ struct UserInfo { isNeedCheck: '', examSubject: '' } - @State examinerLoginInfo: examinerLoginInfo = {} + @State examinerLoginInfo: ExaminerLoginInfo = { + carId: '', + examinationRoomId: '', + plateNo: '', + isNeedCheck: '', + examSubject: '' + } @State systemParam: SystemParamType = { Param341: true, Param803Str: '0', @@ -354,7 +359,7 @@ struct UserInfo { onReadCard(ret: IDCardSDK.IDCardInfo) { console.info(`zzctest xx Read Card ret =${ret.status}`) - let thisVar = AppStorage.get('indexComponent'); + let thisVar: IdCard = AppStorage.get('indexComponent'); if (ret.status == 0) { // status = 1 为读到身份证信息; status = 1 为身份证离开读卡器 // 收到身份证离开读卡器的事件通知,根据实际业务需要决定是否需要清空之前已读取的身份证信息。