From 0f47c181ffc1d4513d5f7f145526de016cfecbb5 Mon Sep 17 00:00:00 2001 From: surenjun Date: Tue, 7 Jan 2025 12:07:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=8B=8F=E5=B7=9E=E7=A7=91?= =?UTF-8?q?=E7=9B=AE=E4=BA=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/api/judge.ts | 1 - entry/src/main/ets/api/judgeNew.ts | 15 ++++++++------- entry/src/main/ets/pages/judgeSDK/judge.ts | 13 +++++++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/entry/src/main/ets/api/judge.ts b/entry/src/main/ets/api/judge.ts index 45e664cc..ca68eae1 100644 --- a/entry/src/main/ets/api/judge.ts +++ b/entry/src/main/ets/api/judge.ts @@ -196,4 +196,3 @@ export async function uploadHarmonyLiCheng(data) { method: 'post', }) } - diff --git a/entry/src/main/ets/api/judgeNew.ts b/entry/src/main/ets/api/judgeNew.ts index d25a4d9a..04eb23a9 100644 --- a/entry/src/main/ets/api/judgeNew.ts +++ b/entry/src/main/ets/api/judgeNew.ts @@ -36,7 +36,7 @@ export default async function writeObjectOutNew(data,filePath): Promise { // let connectTimeout = sjbs === '02-21-000014' ?60000:1 - console.info('surenjun','调用旧监管') + console.info('surenjun','调用新监管') const temp = await request({ host: globalThis.JGHOST, @@ -69,12 +69,13 @@ export default async function writeObjectOutNew(data,filePath): Promise { await fileUtil.initFolder(filePath); fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`,JSON.stringify(temp) +`\n`); } - const {code} = temp; - if(code == '2300007' || code == '2300028'){ - return await writeObjectOutNew(params,filePath) - }else{ - return temp - } + // const {code} = temp; + // if(code == '2300007' || code == '2300028'){ + // return await writeObjectOutNew(params,filePath) + // }else{ + // return temp + // } + return temp } diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index b6b89a69..04e60b17 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -72,6 +72,7 @@ export default class Judge { this.kfArr = judgeUI.kfArr this.xmmcStr = ''; this.xmmcCode = ''; + this.xmmcEndCode = undefined; this.carztStr = ''; this.testKmItems = {}; // 考试回放配置 @@ -387,6 +388,7 @@ export default class Judge { this.xmmcStr = xmmcStr; this.xmmcCode = xmmcCode; this.xmmcSingleCode = xmmcSingleCode + this.xmmcEndCode = xmmcCode this.xmdm = xmdm; this.xmxh = xmxh; this.judgeUI.isProjectIn = true @@ -484,7 +486,7 @@ export default class Judge { case 10:{ const param611 = judgeConfigObj['611'] || ''; const [f,s] = param611.split('/') - const {xmdm} = precast; + const {xmdm,xmxh} = precast; const xmmcCode = judgeUI.projectsObj[xmdm].projectCodeCenter; const xmmcSingleCode = judgeUI.projectsObj[xmdm].projectCode; // if(examSubject == 2 && ((xmdm == 0 && f == 1) || (xmdm == 1 && s == 1) || xmdm == 3)){ @@ -598,6 +600,7 @@ export default class Judge { console.info(judgeTag, `项目结束-${xmdm}-${projectsObj[xmdm].name}`) await endProject(xmdm); this.xmmcSingleCode = 0; + this.xmmcEndCode = undefined; }, {isDelay: true}) } } @@ -766,7 +769,7 @@ export default class Judge { const carInfo = globalThis.carInfo; const deviceNo = globalThis.deviceNo; const { examSubject,plateNo,carNo } = carInfo; - const {judgeUI,getProjectInfo,fileLog,xmmcSingleCode,filePath} = this; + const {judgeUI,getProjectInfo,fileLog,xmmcSingleCode,xmmcEndCode,filePath} = this; const {lsh,idCard,serialNumber,ksdd,projectsObj} = judgeUI const time = await getCurrentTime(); const project = getProjectInfo(ksxm); @@ -790,7 +793,7 @@ export default class Judge { ksxm: project == undefined ? (commonKsxm ? (projectsObj[commonKsxm].projectCodeCenter) - : (examSubject == 3 ? 30000 : 10000)) + : (examSubject == 3 ? 30000 : (xmmcEndCode == undefined ? 10000 : xmmcEndCode))) : project.projectCodeCenter , kfxm: kf.markcatalog, kfxmmx: `${ksxm},${kf.markserial}`, @@ -1033,7 +1036,8 @@ export default class Judge { const { examSubject ,plateNo} = carInfo; const {judgeUI,ksjs,getPhoto,uploadProgressData,uploadDisConnectData,avPlayer,kfArr,judgeTask,filePath} = this; const {lsh,idCard,serialNumber,kssycs,totalScore,judgeConfigObj,isAllProjectsEnd,passingScore} = judgeUI - await uploadDisConnectData(); + //TODO 断网考试结束补传 + // await uploadDisConnectData(); const time = await getCurrentTime(); const photoBase64 = await getPhoto(); const {d1,d2,d3,d4,d5} = ksjs @@ -1673,6 +1677,7 @@ export default class Judge { private xmmcStr: string private xmmcCode: string private xmmcSingleCode: number + private xmmcEndCode?:number private xmdm: string | number private xmxh: string private fileModel: FileModel From 3481502c588098fb02ee4aef0768cd3daac4a707 Mon Sep 17 00:00:00 2001 From: surenjun Date: Tue, 7 Jan 2025 12:11:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=B1=8F=E8=94=BDwebrtc=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/UserInfo.ets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 83942af1..73392faf 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -145,10 +145,9 @@ struct UserInfo { this.updateTimeLimit = false this.ksksLimit = false this.currentUser = EmptyCandidateObject - const mediaTest = new FilePhoto(this.context); this.filePhoto = new FilePhoto(this.context); //语音功能on - new WebRTCVoice(this.context); + // new WebRTCVoice(this.context); //初始化数据 this.initData() //身份证读卡器初始化 From f5c701dcda47c712c6a140e64a8711b8f4012ba8 Mon Sep 17 00:00:00 2001 From: surenjun Date: Tue, 7 Jan 2025 15:25:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E8=AF=84=E5=88=A4udp=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/utils/UdpJudge.ts | 2 +- entry/src/main/ets/pages/judgeSDK/judge.ts | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/entry/src/main/ets/common/utils/UdpJudge.ts b/entry/src/main/ets/common/utils/UdpJudge.ts index db45435f..b741dfa1 100644 --- a/entry/src/main/ets/common/utils/UdpJudge.ts +++ b/entry/src/main/ets/common/utils/UdpJudge.ts @@ -94,7 +94,7 @@ export const getMessageHeartbeat = async (msg) => { //考试员号 ascksyhArr.map(ksyh => string2Bytes(ksyh, 8)[0]), //科目类型(0:未考试 1:科目二 2:科目三) + 考试开始时间 - string2Bytes(`${0}${'00:00:00'}`, 4 * 8), + string2Bytes(`${0}${'00:00:000'}`, 4 * 8), // 消息序号 string2Bytes(serialIndex, 2 * 8), translateSignals, diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 04e60b17..035df47c 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -1219,7 +1219,12 @@ export default class Judge { return } const {zfxd,yfxd,shtd,ygd,jgd,skd,dh1,dh2,lhq,jsc,ssc,fsc,lb,mkg,aqd,ygq,cs,fdjzs,dw} = sensor - const {jd,wd, hxj, fyj, hbg,sd} = gps + const {jd,wd, hxj, fyj, hbg,sd} = gps; + + //过滤错误数据 + if(jd == 0){ + return + } const translateProject = getTranslateProject(); const sbxh = getSbxh(xmdm, xmxh) const {carzt,dcjl,qjjl,dxjl,bxjl} = performInfo || {}; @@ -1298,9 +1303,8 @@ export default class Judge { tempArr = tempArr.concat(itemArr) }) this.serialIndex += 1; - fileLog.setFourAndOneLogData(`${startHourTime},${translateJd},${translateWd}`); + fileLog.setFourAndOneLogData(`${lsh},${ksyh},${examType}${globalThis.startHourTime || startHourTime},`); fileLog.setFourAndOneLogDataBytes(tempArr.toString()); - return Array2Byte(tempArr) } //获取场地序号 @@ -1587,7 +1591,7 @@ export default class Judge { const bytes = await this.getMessageHeartbeat(); bytes && globalThis.judgeUdp.send(bytes) - }, 20) + }, 200) globalThis.judgeTimer = judgeTimer; }