diff --git a/entry/src/main/cpp/bin/libJudgeSdk.so b/entry/src/main/cpp/bin/libJudgeSdk.so index a23526e0..0c37192b 100644 Binary files a/entry/src/main/cpp/bin/libJudgeSdk.so and b/entry/src/main/cpp/bin/libJudgeSdk.so differ diff --git a/entry/src/main/ets/common/utils/UdpJudge.ts b/entry/src/main/ets/common/utils/UdpJudge.ts index 1a287d58..470eb0d6 100644 --- a/entry/src/main/ets/common/utils/UdpJudge.ts +++ b/entry/src/main/ets/common/utils/UdpJudge.ts @@ -60,7 +60,7 @@ export const getMessageHeartbeat = async (msg) => { const {fourInOneScreen:{gpsDigit}} = judgeConfig const asclshArr = stringToASC(fillZero( globalThis.singlePlay - ? '1111111111111' + ? '0000000000000' : globalThis.lsh, 13)); const ascksyhArr = stringToASC(fillZero(examSubject == 2 ? '0000000000000':'1111111111111', 13)) diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index c8b58fb6..a20305b2 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -260,7 +260,8 @@ struct Index { //真实监管下发的项目 let kStringArr: string[] = (currentParams.kString?.split(',') || []).filter(item => item); this.mockLight = kStringArr.includes("41700") - console.info('surenjun kStringArr', JSON.stringify(kStringArr)) + console.log("lixiao mockLight", this.mockLight) + console.info('lixiao kStringArr', JSON.stringify(kStringArr)) let isInExam = kStringArr.length > 0; const {isTrajectoryOpen} = judgeConfig @@ -311,7 +312,7 @@ struct Index { allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '') } else if (this.mode == 5 && no1 == 3 && no2 == Number(carNo) && no3 == 63) { // 满分学习项目 - let data = decodeURI(systemParm.txt1)?.split("^").filter(item => item) + let data = decodeURI(systemParm.txt1)?.split("^") allItems = data[0]?.split(",") || [] } if (no1 == 6) { @@ -321,7 +322,7 @@ struct Index { return } // 模拟夜间驾驶 - if (this.mode !== 3 && this.mode !== 5 && no2 == 41) { + if (!this.mockLight && no2 == 41) { return } let isRequired = allItems.includes(no2 + '') @@ -1252,10 +1253,11 @@ struct Index { const projectName = this.artSubject3Projects[index]; const projectCode = this.artSubject3ProjectsCodesArr[index]; const type = this.projectsObj[projectCode].type + const ykType = this.projectsObj[projectCode].ykType if (type == '2') { return projectName } - return (type == '3' || type == '4') ? `${projectName}_red` : `${projectName}_green`; + return (type == '3' || type == '4' || ykType == '3' || ykType == '4') ? `${projectName}_red` : `${projectName}_green`; } // 获取是否能进行人工评判 getIsManualKf = () => {