harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

dev #63

Merged
wangzhongjie merged 206 commits from dev into main 2024-12-16 10:31:20 +08:00
Conversation 0 Commits 206 Files Changed 1354 +18 -9
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 05f8798973 - Show all commits

2
entry/src/main/ets/common/utils/UdpJudge.ts
View File

@ -74,7 +74,7 @@ export const getMessageHeartbeat = async (msg) => {
string2Bytes(serialIndex, 2 * 8), string2Bytes(serialIndex, 2 * 8),
translateSignals, translateSignals,
//@ts-ignore //@ts-ignore
string2Bytes(Math.floor(gps.sd*1.852*100) , 2 * 8), string2Bytes(fdjzs / 100, 8), string2Bytes(translateJd, 4 * 8), string2Bytes(translateWd, 4 * 8), string2Bytes(1, 8), string2Bytes(Math.floor((Math.floor(gps.sd))*1.852*100) , 2 * 8), string2Bytes(fdjzs / 100, 8), string2Bytes(translateJd, 4 * 8), string2Bytes(translateWd, 4 * 8), string2Bytes(1, 8),
//GPS东向距离 //GPS东向距离
string2Bytes(0, 4 * 8), string2Bytes(0, 4 * 8),
//GPS北向距离 //GPS北向距离

25
entry/src/main/ets/pages/judgeSDK/judge.ts
View File

@ -650,27 +650,36 @@ export default class Judge {
const deviceNo = globalThis.deviceNo; const deviceNo = globalThis.deviceNo;
const { examSubject,plateNo,carNo } = carInfo; const { examSubject,plateNo,carNo } = carInfo;
const {judgeUI,getProjectInfo,fileLog,xmmcSingleCode,filePath} = this; const {judgeUI,getProjectInfo,fileLog,xmmcSingleCode,filePath} = this;
const {lsh,idCard,serialNumber,ksdd} = judgeUI const {lsh,idCard,serialNumber,ksdd,projectsObj} = judgeUI
const time = await getCurrentTime(); const time = await getCurrentTime();
const project = getProjectInfo(ksxm); const project = getProjectInfo(ksxm);
//科目三上车准备、模拟灯光、夜间行驶出现通用评判，ksxm为当前进行的项目 //科目三夜间行驶.模拟灯光、上车准备出现通用评判，ksxm为当前进行的项目
const checkProjects = ['1', '41', '17'] const checkProjects = ['17', '41', '1'];
console.info(judgeTag + 'ksxm=>',ksxm) //获取正在进行的项目
console.info(judgeTag + 'xmmcSingleCode=>',xmmcSingleCode) const inProjects = Reflect.ownKeys(projectsObj).filter(projectKey => projectsObj[projectKey].type == 2);
let commonKsxm = '';
checkProjects.forEach(projectCode=>{
if(inProjects.includes(projectCode)){
commonKsxm = projectCode
}
})
const data = { const data = {
xtlb: '17', jkxlh: serialNumber, jkid: '17C53', xtlb: '17', jkxlh: serialNumber, jkid: '17C53',
drvexam: { drvexam: {
lsh, lsh,
kskm: examSubject, kskm: examSubject,
ksxm: project == undefined ksxm: project == undefined
? (checkProjects.includes(xmmcSingleCode + '') ? (commonKsxm
? '40100' ? (projectsObj[commonKsxm].projectCodeCenter)
: (examSubject == 3 ? 30000 : 10000)) : (examSubject == 3 ? 30000 : 10000))
: project.projectCodeCenter , : project.projectCodeCenter ,
kfxm: kf.markcatalog, kfxm: kf.markcatalog,
kfxmmx: `${ksxm},${kf.markserial}`, kfxmmx: `${ksxm},${kf.markserial}`,
sfzmhm: idCard, sfzmhm: idCard,
kchp: encodeURI(carInfo.plateNo), kchp: encodeURI(carInfo.plateNo),
//扣分方式
kffs: kf.type == 0 ? 1 : 2, kffs: kf.type == 0 ? 1 : 2,
ksdd: encodeURI(ksdd), ksdd: encodeURI(ksdd),
kfsj: time kfsj: time
@ -1281,7 +1290,7 @@ export default class Judge {
this.judgeUI.isDwztRight = plcData.gps.dwzt == 4; this.judgeUI.isDwztRight = plcData.gps.dwzt == 4;
this.judgeUI.sd = (Math.floor(((plcData.gps.sd as number) || 0) * 1.852)) + ''; this.judgeUI.sd = (Math.floor(((plcData.gps.sd as number) || 0) * 1.852)) + '';
this.judgeUI.dw = (Math.floor(plcData.sensor.dw as number) || 0) + '' this.judgeUI.dw = (Math.floor(plcData.sensor.dw as number) || 0) + ''
if(isExamEnd){ if(!isExamEnd){
await examJudgeRealExam(plcData) await examJudgeRealExam(plcData)
} }
const udpIndex = globalThis.udpIndex; const udpIndex = globalThis.udpIndex;