Merge remote-tracking branch 'outer/代理服务方案' into 代理服务方案
# Conflicts: # build-profile.json5
This commit is contained in:
commit
8cdba36805
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,5 +8,6 @@
|
|||||||
/.clangd
|
/.clangd
|
||||||
/.clang-format
|
/.clang-format
|
||||||
/.clang-tidy
|
/.clang-tidy
|
||||||
|
/entry/src/main/cpp
|
||||||
/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts
|
/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts
|
||||||
/build-profile.json5
|
/build-profile.json5
|
||||||
@ -2,6 +2,8 @@ import { examinationStuAbsent, getExaminationItem, getExaminationStudentInfo } f
|
|||||||
import router from '@ohos.router';
|
import router from '@ohos.router';
|
||||||
import TopLogo from './compontents/TopLogo';
|
import TopLogo from './compontents/TopLogo';
|
||||||
import Md5 from '../common/utils/md5';
|
import Md5 from '../common/utils/md5';
|
||||||
|
import AccountTable from '../common/database/tables/AccountTable';
|
||||||
|
import USER from '../common/constants/USER';
|
||||||
import { dateFormat, getCurrentHourTime, getCurrentTime, string2Bytes } from '../common/utils/tools';
|
import { dateFormat, getCurrentHourTime, getCurrentTime, string2Bytes } from '../common/utils/tools';
|
||||||
import FaceCompare from './compontents/FaceCompare';
|
import FaceCompare from './compontents/FaceCompare';
|
||||||
// import { initJudgeUdp } from '../common/utils/UdpJudge'
|
// import { initJudgeUdp } from '../common/utils/UdpJudge'
|
||||||
@ -65,7 +67,6 @@ struct UserInfo {
|
|||||||
//是否已经开始考试
|
//是否已经开始考试
|
||||||
@State isExamStart: boolean = false;
|
@State isExamStart: boolean = false;
|
||||||
@State effectDate: string = '';
|
@State effectDate: string = '';
|
||||||
@State errorNum: number = 0;
|
|
||||||
@State interval: any = null;
|
@State interval: any = null;
|
||||||
@State studentRefreshStatue: string = '0';
|
@State studentRefreshStatue: string = '0';
|
||||||
@State photo: string = 'data:image/bmp;base64,';
|
@State photo: string = 'data:image/bmp;base64,';
|
||||||
@ -97,7 +98,7 @@ struct UserInfo {
|
|||||||
if (singlePlay) {
|
if (singlePlay) {
|
||||||
return ''
|
return ''
|
||||||
} else {
|
} else {
|
||||||
const { filePhoto } = this;
|
const {filePhoto} = this;
|
||||||
const photoBase64 = await filePhoto.getPhoto();
|
const photoBase64 = await filePhoto.getPhoto();
|
||||||
return photoBase64
|
return photoBase64
|
||||||
}
|
}
|
||||||
@ -118,7 +119,7 @@ struct UserInfo {
|
|||||||
this.ksksLimit = true
|
this.ksksLimit = true
|
||||||
|
|
||||||
if (globalThis.singlePlay) {
|
if (globalThis.singlePlay) {
|
||||||
const { examSubject } = globalThis.carInfo;
|
const {examSubject} = globalThis.carInfo;
|
||||||
this.currentUser.id = '0'
|
this.currentUser.id = '0'
|
||||||
await upDateTableByArray('USER', [this.currentUser])
|
await upDateTableByArray('USER', [this.currentUser])
|
||||||
router.pushUrl({
|
router.pushUrl({
|
||||||
@ -166,6 +167,8 @@ struct UserInfo {
|
|||||||
)
|
)
|
||||||
private filePhoto: FilePhoto
|
private filePhoto: FilePhoto
|
||||||
private avPlayer
|
private avPlayer
|
||||||
|
private AccountTable = new AccountTable(() => {
|
||||||
|
}, USER);
|
||||||
private context = getContext(this) as common.UIAbilityContext;
|
private context = getContext(this) as common.UIAbilityContext;
|
||||||
private labelBlocks = [
|
private labelBlocks = [
|
||||||
{ label: '考生姓名', key: 'xm' },
|
{ label: '考生姓名', key: 'xm' },
|
||||||
@ -201,6 +204,7 @@ struct UserInfo {
|
|||||||
if (!globalThis.singlePlay) {
|
if (!globalThis.singlePlay) {
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
if (routerParam.type != 1) {
|
if (routerParam.type != 1) {
|
||||||
|
console.info('surenjun', 'Judge返回到UserInfo界面')
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
this.list = await getSyncData('USERLIST')
|
this.list = await getSyncData('USERLIST')
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
@ -209,39 +213,62 @@ struct UserInfo {
|
|||||||
console.log('useruser1,', JSON.stringify(data))
|
console.log('useruser1,', JSON.stringify(data))
|
||||||
|
|
||||||
const user = data[0]
|
const user = data[0]
|
||||||
if (user && Number(user.kssycs)) {
|
if (!Number(user.kssycs)) {
|
||||||
let flag = false
|
|
||||||
this.list.forEach(res => {
|
|
||||||
if (res.sfzmhm == user.sfzmhm) {
|
|
||||||
flag = true
|
|
||||||
res.kssycs = user.kssycs
|
|
||||||
this.getCurrentStudent(res.sfzmhm)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if (!flag) {
|
|
||||||
this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
|
|
||||||
}
|
|
||||||
} else if (user && (user.kssycs == '0' || user.kssycs == '')) {
|
|
||||||
console.log('datadatadatadata')
|
|
||||||
this.list = this.list.filter(res => {
|
this.list = this.list.filter(res => {
|
||||||
return res.sfzmhm != user.sfzmhm
|
return res.sfzmhm != user.sfzmhm
|
||||||
})
|
})
|
||||||
this.pageIndex = 0
|
}
|
||||||
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
this.pageIndex = 0
|
||||||
if (this.dataList.length) {
|
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||||
setTimeout(() => {
|
if (this.dataList.length) {
|
||||||
this.currentUser = this.dataList[0]
|
setTimeout(() => {
|
||||||
this.currentUser.ksy2 = globalThis.kgxm
|
this.currentUser = this.dataList[0]
|
||||||
globalThis.lsh = this.currentUser.lsh
|
this.currentUser.ksy2 = globalThis.kgxm
|
||||||
}, 200)
|
globalThis.lsh = this.currentUser.lsh
|
||||||
} else {
|
}, 200)
|
||||||
this.currentUser = EmptyCandidateObject
|
} else {
|
||||||
}
|
this.currentUser = EmptyCandidateObject
|
||||||
|
globalThis.lsh = '1111111111111'
|
||||||
}
|
}
|
||||||
this.list.forEach((res, index) => {
|
this.list.forEach((res, index) => {
|
||||||
res.id = index.toString()
|
res.id = index.toString()
|
||||||
})
|
})
|
||||||
await upDateTableByArray('USERLIST', this.list || [])
|
await upDateTableByArray('USERLIST', this.list || [])
|
||||||
|
|
||||||
|
// if(this.)
|
||||||
|
// if (user && Number(user.kssycs)) {
|
||||||
|
//
|
||||||
|
// let flag = false
|
||||||
|
// this.list.forEach(res => {
|
||||||
|
// if (res.sfzmhm == user.sfzmhm) {
|
||||||
|
// flag = true
|
||||||
|
// res.kssycs = user.kssycs
|
||||||
|
// this.getCurrentStudent(res.sfzmhm)
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// if (!flag) {
|
||||||
|
// this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
|
||||||
|
// globalThis.lsh = this.list.length?this.currentUser.lsh:'1111111111111'
|
||||||
|
// }
|
||||||
|
// } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
|
||||||
|
// console.log('datadatadatadata')
|
||||||
|
// this.list = this.list.filter(res => {
|
||||||
|
// return res.sfzmhm != user.sfzmhm
|
||||||
|
// })
|
||||||
|
// this.pageIndex = 0
|
||||||
|
// this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||||
|
// if (this.dataList.length) {
|
||||||
|
// setTimeout(() => {
|
||||||
|
// this.currentUser = this.dataList[0]
|
||||||
|
// this.currentUser.ksy2 = globalThis.kgxm
|
||||||
|
// globalThis.lsh = this.currentUser.lsh
|
||||||
|
// }, 200)
|
||||||
|
// } else {
|
||||||
|
// this.currentUser = EmptyCandidateObject
|
||||||
|
// globalThis.lsh = '1111111111111'
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
await this.getExaminationStudentInfoFn()
|
await this.getExaminationStudentInfoFn()
|
||||||
}
|
}
|
||||||
@ -309,7 +336,7 @@ struct UserInfo {
|
|||||||
|
|
||||||
globalThis.lsh = res.lsh
|
globalThis.lsh = res.lsh
|
||||||
globalThis.ksyh = res.ksy1sfzmhm
|
globalThis.ksyh = res.ksy1sfzmhm
|
||||||
const { examSubject } = globalThis.carInfo;
|
const {examSubject} = globalThis.carInfo;
|
||||||
// this.currentUser.kszp=this.photo+res.kszp
|
// this.currentUser.kszp=this.photo+res.kszp
|
||||||
// this.currentUser.ksmjzp=this.photo+this.currentUser.ksmjzp
|
// this.currentUser.ksmjzp=this.photo+this.currentUser.ksmjzp
|
||||||
if (globalThis.singlePlay) {
|
if (globalThis.singlePlay) {
|
||||||
@ -336,7 +363,6 @@ struct UserInfo {
|
|||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.currentUser = this.list[0]
|
this.currentUser = this.list[0]
|
||||||
this.currentUser.ksy2 = globalThis.kgxm
|
this.currentUser.ksy2 = globalThis.kgxm
|
||||||
|
|
||||||
globalThis.lsh = this.currentUser.lsh
|
globalThis.lsh = this.currentUser.lsh
|
||||||
}, 200)
|
}, 200)
|
||||||
|
|
||||||
@ -585,7 +611,14 @@ struct UserInfo {
|
|||||||
// this.getExaminationItemFn()
|
// this.getExaminationItemFn()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
// const db = new AccountTable(() => {
|
||||||
|
// }, MA_SYSSET);
|
||||||
|
// db.getRdbStore(() => {
|
||||||
|
// db.query('0', (syssetParams) => {
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// })
|
||||||
|
// })
|
||||||
}
|
}
|
||||||
|
|
||||||
//人脸比对窗口关闭
|
//人脸比对窗口关闭
|
||||||
@ -627,136 +660,153 @@ struct UserInfo {
|
|||||||
this.ksksLimit = false
|
this.ksksLimit = false
|
||||||
// this.isBoardPrePareSetPopupOpen=true
|
// this.isBoardPrePareSetPopupOpen=true
|
||||||
this.isFirstBoardPrePareSetPopupBtnShow = false
|
this.isFirstBoardPrePareSetPopupBtnShow = false
|
||||||
console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow,
|
console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow, this.isBoardPrePareSetPopupOpen)
|
||||||
this.isBoardPrePareSetPopupOpen)
|
|
||||||
this.startExam = false
|
this.startExam = false
|
||||||
// await upDateTableByArray('USER', [])
|
// await upDateTableByArray('USER', [])
|
||||||
// await upDateTableByArray('USERLIST', [])
|
// await upDateTableByArray('USERLIST', [])
|
||||||
// await DB.clearTable('USER')
|
|
||||||
// await DB.clearTable('USERLIST')
|
|
||||||
|
|
||||||
// this.type = '2'
|
this.type = '2'
|
||||||
// this.errorDialog.open()
|
this.errorDialog.open()
|
||||||
this.updateTimeLimit = true
|
this.updateTimeLimit = true
|
||||||
const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId +
|
const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId + globalThis.carInfo.examinationRoomId + globalThis.username)}</checkCode></head><body><carId>${globalThis.carInfo.carId}</carId><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><sfzmhm></sfzmhm></body></getExaminationStudentInfoReq>`
|
||||||
globalThis.carInfo.examinationRoomId +
|
try {
|
||||||
globalThis.username)}</checkCode></head><body><carId>${globalThis.carInfo.carId}</carId><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><sfzmhm></sfzmhm></body></getExaminationStudentInfoReq>`
|
getExaminationStudentInfo(param).then(async (res) => {
|
||||||
getExaminationStudentInfo(param).then(async (res) => {
|
console.log("temp log ", JSON.stringify(res))
|
||||||
this.errorNum=0
|
await DB.clearTable('USER')
|
||||||
console.log("temp log ", JSON.stringify(res))
|
await DB.clearTable('USERLIST')
|
||||||
await DB.clearTable('USER')
|
this.errorDialog.close()
|
||||||
await DB.clearTable('USERLIST')
|
setTimeout(() => {
|
||||||
// this.errorDialog.close()
|
this.updateTimeLimit = false
|
||||||
setTimeout(() => {
|
}, 3000)
|
||||||
this.updateTimeLimit = false
|
|
||||||
}, 3000)
|
|
||||||
// @ts-ignore
|
|
||||||
if (!res || res?.getExaminationStudentInfoRsp?.head?.resultCode == '1') {
|
|
||||||
this.dataList = []
|
|
||||||
this.list = []
|
|
||||||
return
|
|
||||||
}
|
|
||||||
let dataList = []
|
|
||||||
this.list = []
|
|
||||||
|
|
||||||
// @ts-ignore
|
|
||||||
for (let key in res.getExaminationStudentInfoRsp.body) {
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
const a = res.getExaminationStudentInfoRsp.body[key]
|
if (!res || res?.getExaminationStudentInfoRsp?.head?.resultCode == '1') {
|
||||||
if (a instanceof Array) {
|
this.dataList = []
|
||||||
dataList = a
|
this.list = []
|
||||||
} else {
|
return
|
||||||
dataList = [a]
|
|
||||||
}
|
}
|
||||||
}
|
let dataList = []
|
||||||
if (dataList.length) {
|
this.list = []
|
||||||
this.numCount = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
this.list = JSON.parse(JSON.stringify(dataList))
|
// @ts-ignore
|
||||||
|
for (let key in res.getExaminationStudentInfoRsp.body) {
|
||||||
console.log("temp list", JSON.stringify(this.list))
|
// @ts-ignore
|
||||||
this.list.forEach((listData, index) => {
|
const a = res.getExaminationStudentInfoRsp.body[key]
|
||||||
//考过一次不允许切换学员
|
if (a instanceof Array) {
|
||||||
if (listData.kssycs == '1') {
|
dataList = a
|
||||||
|
} else {
|
||||||
this.startExam = true
|
dataList = [a]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
listData.id = index.toString()
|
if (dataList.length) {
|
||||||
for (let i in listData) {
|
this.numCount = 0
|
||||||
listData[i] = decodeURI(listData[i])
|
|
||||||
}
|
}
|
||||||
if (this.systemParam.Param828Str == '1' || this.systemParam.Param828Str == '2') {
|
|
||||||
// listData.ksy2=listData.ksy1;
|
|
||||||
listData.ksy2 = globalThis.kgxm
|
|
||||||
} else {
|
|
||||||
// listData.ksy2=listData.ksy2;
|
|
||||||
listData.ksy2 = globalThis.kgxm
|
|
||||||
}
|
|
||||||
listData.kszp = this.photo + listData.kszp
|
|
||||||
listData.ksmjzp = this.photo + listData.ksmjzp
|
|
||||||
})
|
|
||||||
|
|
||||||
// await upDateTableByArray('USERLIST', this.list || [])
|
this.list = JSON.parse(JSON.stringify(dataList))
|
||||||
console.log("temp list", JSON.stringify(this.list))
|
|
||||||
|
|
||||||
await sqlInsertCommonFn("USERLIST", this.list || [])
|
console.log("temp list", JSON.stringify(this.list))
|
||||||
dataList = this.list.length > 4 ? this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) : this.list;
|
this.list.forEach((listData, index) => {
|
||||||
|
//考过一次不允许切换学员
|
||||||
|
if (listData.kssycs == '1') {
|
||||||
|
|
||||||
this.dataList = dataList
|
this.startExam = true
|
||||||
console.log("temp list", JSON.stringify(this.dataList))
|
}
|
||||||
|
listData.id = index.toString()
|
||||||
|
for (let i in listData) {
|
||||||
|
listData[i] = decodeURI(listData[i])
|
||||||
|
}
|
||||||
|
if (this.systemParam.Param828Str == '1' || this.systemParam.Param828Str == '2') {
|
||||||
|
// listData.ksy2=listData.ksy1;
|
||||||
|
listData.ksy2 = globalThis.kgxm
|
||||||
|
} else {
|
||||||
|
// listData.ksy2=listData.ksy2;
|
||||||
|
listData.ksy2 = globalThis.kgxm
|
||||||
|
}
|
||||||
|
listData.kszp = this.photo + listData.kszp
|
||||||
|
listData.ksmjzp = this.photo + listData.ksmjzp
|
||||||
|
})
|
||||||
|
|
||||||
const user = this.dataList.filter(res => {
|
// await upDateTableByArray('USERLIST', this.list || [])
|
||||||
return res.kssycs == '1'
|
console.log("temp list", JSON.stringify(this.list))
|
||||||
})
|
|
||||||
if (this.dataList.length) {
|
await sqlInsertCommonFn("USERLIST", this.list || [])
|
||||||
if (user.length) {
|
dataList = this.list.length > 4 ? this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) : this.list;
|
||||||
setTimeout(() => {
|
|
||||||
this.currentUser = user[0]
|
this.dataList = dataList
|
||||||
this.currentUser.ksy2 = globalThis.kgxm
|
console.log("temp list", JSON.stringify(this.dataList))
|
||||||
globalThis.lsh = this.currentUser.lsh
|
|
||||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
const user = this.dataList.filter(res => {
|
||||||
}, 200)
|
return res.kssycs == '1'
|
||||||
} else {
|
})
|
||||||
|
if (this.dataList.length) {
|
||||||
|
// if (user.length) {
|
||||||
|
// setTimeout(() => {
|
||||||
|
// this.currentUser = user[0]
|
||||||
|
// this.currentUser.ksy2 = globalThis.kgxm
|
||||||
|
// globalThis.lsh = this.currentUser.lsh
|
||||||
|
// globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||||
|
// }, 200)
|
||||||
|
// } else {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.currentUser = this.dataList[0]
|
this.currentUser = this.dataList[0]
|
||||||
this.currentUser.ksy2 = globalThis.kgxm
|
this.currentUser.ksy2 = globalThis.kgxm
|
||||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||||
globalThis.lsh = this.currentUser.lsh
|
globalThis.lsh = this.currentUser.lsh
|
||||||
}, 200)
|
}, 200)
|
||||||
|
// }
|
||||||
|
} else {
|
||||||
|
this.currentUser = EmptyCandidateObject
|
||||||
|
globalThis.lsh = '1111111111111'
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
this.currentUser = EmptyCandidateObject
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//364 绕车一周评判时机(1-开始考试后判 2-开始考试前判)
|
// const flag=dataList.filter((res)=>{
|
||||||
if (this.systemParam.Param364 == '2') {
|
// return res.sfzmhm==this.currentUser.sfzmhm
|
||||||
this.isBoardPrePareSetPopupOpen = true;
|
// }).length?true:false
|
||||||
this.isFirstBoardPrePareSetPopupBtnShow = false;
|
// if(!this.currentUser.sfzmhm||this.currentUser.kssycs=='0'||!flag){
|
||||||
}
|
// if (this.dataList.length) {
|
||||||
|
// setTimeout(()=>{
|
||||||
|
// this.currentUser = this.dataList[0]
|
||||||
|
// this.currentUser.ksy2= globalThis.kgxm
|
||||||
|
// globalThis.lsh=this.currentUser.lsh
|
||||||
|
// },200)
|
||||||
|
// console.log('this.currentUser1',JSON.stringify(this.currentUser))
|
||||||
|
// } else {
|
||||||
|
// this.currentUser = EmptyCandidateObject
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
//398参数为1 第二场考试上车准备不考
|
|
||||||
if (this.systemParam.Param398 == '1') {
|
|
||||||
this.isSecondBoardPrePareSetPopupOpen = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.pageIndex = 0
|
// this.lsh = this.currentUser.lsh
|
||||||
// getSyncData('USER').then(data => {
|
// globalThis.lsh = this.lsh
|
||||||
// if (data?.[0]) {
|
// globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||||
// this.getCurrentStudent(data[0].sfzmhm)
|
|
||||||
// }
|
//364 绕车一周评判时机(1-开始考试后判 2-开始考试前判)
|
||||||
// })
|
if (this.systemParam.Param364 == '2') {
|
||||||
}).catch((error) => {
|
this.isBoardPrePareSetPopupOpen = true;
|
||||||
|
this.isFirstBoardPrePareSetPopupBtnShow = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
//398参数为1 第二场考试上车准备不考
|
||||||
|
if (this.systemParam.Param398 == '1') {
|
||||||
|
this.isSecondBoardPrePareSetPopupOpen = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.pageIndex = 0
|
||||||
|
getSyncData('USER').then(data => {
|
||||||
|
if (data?.[0]) {
|
||||||
|
this.getCurrentStudent(data[0].sfzmhm)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}).catch((error) => {
|
||||||
|
this.updateTimeLimit = false
|
||||||
|
this.errorDialog.close()
|
||||||
|
console.log('error12error' + error)
|
||||||
|
})
|
||||||
|
} catch (error) {
|
||||||
this.updateTimeLimit = false
|
this.updateTimeLimit = false
|
||||||
// this.errorDialog.close()
|
this.errorDialog.close()
|
||||||
this.errorNum++
|
console.log('error14error' + error)
|
||||||
if (this.errorNum < 3) {
|
}
|
||||||
this.getExaminationStudentInfoFn()
|
|
||||||
}
|
|
||||||
console.log('error12error' + error)
|
|
||||||
})
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
qkFn() {
|
qkFn() {
|
||||||
@ -770,8 +820,7 @@ struct UserInfo {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log('JsonJson', JSON.stringify(this.currentUser))
|
console.log('JsonJson', JSON.stringify(this.currentUser))
|
||||||
const param =
|
const param = `<?xml version="1.0" encoding="UTF-8" ?><examinationStuAbsentReq><body><carId>${globalThis.carInfo.carId}</carId><cardNo>${this.currentUser.sfzmhm}</cardNo><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><lsh>${this.lsh}</lsh></body></examinationStuAbsentReq>`
|
||||||
`<?xml version="1.0" encoding="UTF-8" ?><examinationStuAbsentReq><body><carId>${globalThis.carInfo.carId}</carId><cardNo>${this.currentUser.sfzmhm}</cardNo><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><lsh>${this.lsh}</lsh></body></examinationStuAbsentReq>`
|
|
||||||
console.log('carNo1111', param)
|
console.log('carNo1111', param)
|
||||||
|
|
||||||
examinationStuAbsent(param).then(res => {
|
examinationStuAbsent(param).then(res => {
|
||||||
@ -807,7 +856,7 @@ struct UserInfo {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
const carInfo = globalThis.carInfo;
|
const carInfo = globalThis.carInfo;
|
||||||
const { carId, examinationRoomId } = carInfo;
|
const {carId,examinationRoomId} = carInfo;
|
||||||
const examItems = await getExaminationItem({
|
const examItems = await getExaminationItem({
|
||||||
time: getCurrentTime(),
|
time: getCurrentTime(),
|
||||||
carId,
|
carId,
|
||||||
@ -829,7 +878,7 @@ struct UserInfo {
|
|||||||
globalThis.statue = 4
|
globalThis.statue = 4
|
||||||
this.stepFlag = true
|
this.stepFlag = true
|
||||||
const carInfo = globalThis.carInfo;
|
const carInfo = globalThis.carInfo;
|
||||||
const { carId, examinationRoomId } = carInfo;
|
const {carId,examinationRoomId} = carInfo;
|
||||||
let examItems = { getExaminationItemRsp: { body: { ykxx: '' } } };
|
let examItems = { getExaminationItemRsp: { body: { ykxx: '' } } };
|
||||||
if (!globalThis.singlePlay) {
|
if (!globalThis.singlePlay) {
|
||||||
//获取已考项目
|
//获取已考项目
|
||||||
@ -847,7 +896,7 @@ struct UserInfo {
|
|||||||
|
|
||||||
avPlayer.playAudio([`voice/监管通信中.mp3`], false, async () => {
|
avPlayer.playAudio([`voice/监管通信中.mp3`], false, async () => {
|
||||||
console.info('surenjun', '播放结束开始考试接口调用')
|
console.info('surenjun', '播放结束开始考试接口调用')
|
||||||
const { code, keystr, message } = await this.beginExam() || {};
|
const {code,keystr,message} = await this.beginExam() || {};
|
||||||
console.info('surenjun', '开始考试接口调用结束')
|
console.info('surenjun', '开始考试接口调用结束')
|
||||||
// console.info('surenjun',code +'')
|
// console.info('surenjun',code +'')
|
||||||
//@ts-ignore TODO code转换
|
//@ts-ignore TODO code转换
|
||||||
@ -884,8 +933,8 @@ struct UserInfo {
|
|||||||
|
|
||||||
// 检测车门、熄火信号
|
// 检测车门、熄火信号
|
||||||
async checkSignal(): Promise<boolean> {
|
async checkSignal(): Promise<boolean> {
|
||||||
const { isCheckFireOpen } = judgeConfig
|
const {isCheckFireOpen} = judgeConfig
|
||||||
const { systemParam, isBoardPrePareSetPopupOpen } = this;
|
const {systemParam,isBoardPrePareSetPopupOpen} = this;
|
||||||
const Param803Str = systemParam.Param803Str
|
const Param803Str = systemParam.Param803Str
|
||||||
if (Param803Str === '') {
|
if (Param803Str === '') {
|
||||||
return true
|
return true
|
||||||
@ -990,8 +1039,8 @@ struct UserInfo {
|
|||||||
// 开始考试
|
// 开始考试
|
||||||
async beginExam() {
|
async beginExam() {
|
||||||
const carInfo = globalThis.carInfo;
|
const carInfo = globalThis.carInfo;
|
||||||
const { carId, examinationRoomId } = carInfo;
|
const {carId,examinationRoomId} = carInfo;
|
||||||
const { examSubject, plateNo } = carInfo;
|
const { examSubject,plateNo } = carInfo;
|
||||||
const date = new Date()
|
const date = new Date()
|
||||||
globalThis.startHourTime = await getCurrentHourTime()
|
globalThis.startHourTime = await getCurrentHourTime()
|
||||||
const photoBase64 = await this.getPhoto();
|
const photoBase64 = await this.getPhoto();
|
||||||
@ -1095,13 +1144,11 @@ struct UserInfo {
|
|||||||
}
|
}
|
||||||
.width(165 * this.ratio)
|
.width(165 * this.ratio)
|
||||||
.height(85 * this.ratio)
|
.height(85 * this.ratio)
|
||||||
.backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') :
|
.backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') : $r('app.media.userboxbg'))
|
||||||
$r('app.media.userboxbg'))
|
|
||||||
.backgroundImageSize({ width: '100%', height: '100%' })
|
.backgroundImageSize({ width: '100%', height: '100%' })
|
||||||
.onClick(() => {
|
.onClick(() => {
|
||||||
console.log('this.startExam', this.startExam, this.systemParam.Param364, this.isExamStart)
|
console.log('this.startExam', this.startExam, this.systemParam.Param364, this.isExamStart)
|
||||||
if ((this.isExamStart && !globalThis.singlePlay && this.systemParam.Param341) ||
|
if (this.startExam && this.systemParam.Param364 == '2') {
|
||||||
(this.startExam && this.systemParam.Param364 == '2')) {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.currentUser = EmptyCandidateObject
|
this.currentUser = EmptyCandidateObject
|
||||||
@ -1175,6 +1222,9 @@ struct UserInfo {
|
|||||||
// .commStyle()
|
// .commStyle()
|
||||||
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.yydj_btn') })
|
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.yydj_btn') })
|
||||||
.margin({ bottom: 12 * this.ratio })
|
.margin({ bottom: 12 * this.ratio })
|
||||||
|
.onClick(() => {
|
||||||
|
globalThis.judgeUdp.askVoice()
|
||||||
|
})
|
||||||
|
|
||||||
// Image($r('app.media.gx_btn'))
|
// Image($r('app.media.gx_btn'))
|
||||||
// .commStyle()
|
// .commStyle()
|
||||||
@ -1196,17 +1246,14 @@ struct UserInfo {
|
|||||||
.onClick(() => {
|
.onClick(() => {
|
||||||
// this.avPlayer.playAudio(['button_media.wav'])
|
// this.avPlayer.playAudio(['button_media.wav'])
|
||||||
// 已开始考试不能缺考 已考过一次学员不能缺考 车上不能缺考
|
// 已开始考试不能缺考 已考过一次学员不能缺考 车上不能缺考
|
||||||
if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') ||
|
if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') || this.systemParam.Param770Str == '1') {
|
||||||
this.systemParam.Param770Str == '1') {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.ksksLimit = true
|
this.ksksLimit = true
|
||||||
this.qkFlag = true
|
this.qkFlag = true
|
||||||
})
|
})
|
||||||
|
|
||||||
if (this.isBoardPrePareSetPopupOpen &&
|
if (this.isBoardPrePareSetPopupOpen && (this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') && !this.isFirstBoardPrePareSetPopupBtnShow) {
|
||||||
(this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') &&
|
|
||||||
!this.isFirstBoardPrePareSetPopupBtnShow) {
|
|
||||||
//上车准备
|
//上车准备
|
||||||
// Image($r('app.media.sczb_btn')).commStyle()
|
// Image($r('app.media.sczb_btn')).commStyle()
|
||||||
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.sczb_btn') })
|
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.sczb_btn') })
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user