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

feat: 苏州科目二问题修改

Browse Source
This commit is contained in:
surenjun 2025-01-07 12:07:53 +08:00
parent 77e6dbc78a
commit 0f47c181ff
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
entry/src/main/ets/api/judge.ts
View File

@ -196,4 +196,3 @@ export async function uploadHarmonyLiCheng(data) {
method: 'post', method: 'post',
}) })
} }

15
entry/src/main/ets/api/judgeNew.ts
View File

@ -36,7 +36,7 @@ export default async function writeObjectOutNew(data,filePath): Promise<WR> {
// let connectTimeout = sjbs === '02-21-000014' ?60000:1 // let connectTimeout = sjbs === '02-21-000014' ?60000:1
console.info('surenjun','调用旧监管') console.info('surenjun','调用新监管')
const temp = await request({ const temp = await request({
host: globalThis.JGHOST, host: globalThis.JGHOST,
@ -69,12 +69,13 @@ export default async function writeObjectOutNew(data,filePath): Promise<WR> {
await fileUtil.initFolder(filePath); await fileUtil.initFolder(filePath);
fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`,JSON.stringify(temp) +`\n`); fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`,JSON.stringify(temp) +`\n`);
} }
const {code} = temp; // const {code} = temp;
if(code == '2300007' || code == '2300028'){ // if(code == '2300007' || code == '2300028'){
return await writeObjectOutNew(params,filePath) // return await writeObjectOutNew(params,filePath)
}else{ // }else{
return temp // return temp
} // }
return temp
} }

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

@ -72,6 +72,7 @@ export default class Judge {
this.kfArr = judgeUI.kfArr this.kfArr = judgeUI.kfArr
this.xmmcStr = ''; this.xmmcStr = '';
this.xmmcCode = ''; this.xmmcCode = '';
this.xmmcEndCode = undefined;
this.carztStr = ''; this.carztStr = '';
this.testKmItems = {}; this.testKmItems = {};
// 考试回放配置 // 考试回放配置
@ -387,6 +388,7 @@ export default class Judge {
this.xmmcStr = xmmcStr; this.xmmcStr = xmmcStr;
this.xmmcCode = xmmcCode; this.xmmcCode = xmmcCode;
this.xmmcSingleCode = xmmcSingleCode this.xmmcSingleCode = xmmcSingleCode
this.xmmcEndCode = xmmcCode
this.xmdm = xmdm; this.xmdm = xmdm;
this.xmxh = xmxh; this.xmxh = xmxh;
this.judgeUI.isProjectIn = true this.judgeUI.isProjectIn = true
@ -484,7 +486,7 @@ export default class Judge {
case 10:{ case 10:{
const param611 = judgeConfigObj['611'] || ''; const param611 = judgeConfigObj['611'] || '';
const [f,s] = param611.split('/') const [f,s] = param611.split('/')
const {xmdm} = precast; const {xmdm,xmxh} = precast;
const xmmcCode = judgeUI.projectsObj[xmdm].projectCodeCenter; const xmmcCode = judgeUI.projectsObj[xmdm].projectCodeCenter;
const xmmcSingleCode = judgeUI.projectsObj[xmdm].projectCode; const xmmcSingleCode = judgeUI.projectsObj[xmdm].projectCode;
// if(examSubject == 2 && ((xmdm == 0 && f == 1) || (xmdm == 1 && s == 1) || xmdm == 3)){ // 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}`) console.info(judgeTag, `项目结束-${xmdm}-${projectsObj[xmdm].name}`)
await endProject(xmdm); await endProject(xmdm);
this.xmmcSingleCode = 0; this.xmmcSingleCode = 0;
this.xmmcEndCode = undefined;
}, {isDelay: true}) }, {isDelay: true})
} }
} }
@ -766,7 +769,7 @@ export default class Judge {
const carInfo = globalThis.carInfo; const carInfo = globalThis.carInfo;
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,xmmcEndCode,filePath} = this;
const {lsh,idCard,serialNumber,ksdd,projectsObj} = judgeUI const {lsh,idCard,serialNumber,ksdd,projectsObj} = judgeUI
const time = await getCurrentTime(); const time = await getCurrentTime();
const project = getProjectInfo(ksxm); const project = getProjectInfo(ksxm);
@ -790,7 +793,7 @@ export default class Judge {
ksxm: project == undefined ksxm: project == undefined
? (commonKsxm ? (commonKsxm
? (projectsObj[commonKsxm].projectCodeCenter) ? (projectsObj[commonKsxm].projectCodeCenter)
: (examSubject == 3 ? 30000 : 10000)) : (examSubject == 3 ? 30000 : (xmmcEndCode == undefined ? 10000 : xmmcEndCode)))
: project.projectCodeCenter , : project.projectCodeCenter ,
kfxm: kf.markcatalog, kfxm: kf.markcatalog,
kfxmmx: `${ksxm},${kf.markserial}`, kfxmmx: `${ksxm},${kf.markserial}`,
@ -1033,7 +1036,8 @@ export default class Judge {
const { examSubject ,plateNo} = carInfo; const { examSubject ,plateNo} = carInfo;
const {judgeUI,ksjs,getPhoto,uploadProgressData,uploadDisConnectData,avPlayer,kfArr,judgeTask,filePath} = this; const {judgeUI,ksjs,getPhoto,uploadProgressData,uploadDisConnectData,avPlayer,kfArr,judgeTask,filePath} = this;
const {lsh,idCard,serialNumber,kssycs,totalScore,judgeConfigObj,isAllProjectsEnd,passingScore} = judgeUI const {lsh,idCard,serialNumber,kssycs,totalScore,judgeConfigObj,isAllProjectsEnd,passingScore} = judgeUI
await uploadDisConnectData(); //TODO 断网考试结束补传
// await uploadDisConnectData();
const time = await getCurrentTime(); const time = await getCurrentTime();
const photoBase64 = await getPhoto(); const photoBase64 = await getPhoto();
const {d1,d2,d3,d4,d5} = ksjs const {d1,d2,d3,d4,d5} = ksjs
@ -1673,6 +1677,7 @@ export default class Judge {
private xmmcStr: string private xmmcStr: string
private xmmcCode: string private xmmcCode: string
private xmmcSingleCode: number private xmmcSingleCode: number
private xmmcEndCode?:number
private xmdm: string | number private xmdm: string | number
private xmxh: string private xmxh: string
private fileModel: FileModel private fileModel: FileModel