From a73e39c76291a163df2b25dadc85d7f2a7e969cb Mon Sep 17 00:00:00 2001 From: surenjun Date: Thu, 27 Mar 2025 10:30:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=B8=80=E5=9E=8B=E6=9C=BA=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=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/common/utils/UdpJudge.ts | 5 +++-- entry/src/main/ets/pages/UserInfo.ets | 20 ++++++++++--------- entry/src/main/ets/pages/judgeSDK/judge.ts | 7 ++----- .../ets/pages/judgeSDK/utils/judgeCommon.ts | 9 +++++---- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/entry/src/main/ets/common/utils/UdpJudge.ts b/entry/src/main/ets/common/utils/UdpJudge.ts index f59cc4fb..6d45f1b3 100644 --- a/entry/src/main/ets/common/utils/UdpJudge.ts +++ b/entry/src/main/ets/common/utils/UdpJudge.ts @@ -54,6 +54,7 @@ export const initJudgeUdp = async () => { } export const getMessageHeartbeat = async (msg) => { + console.info('surenjun','getMessageHeartbeat start') const carInfo = globalThis.carInfo; const { examSubject,plateNo } = carInfo; const ksyh='0000000000000' @@ -62,7 +63,7 @@ export const getMessageHeartbeat = async (msg) => { const asclshArr = stringToASC(fillZero( globalThis.singlePlay ? (examSubject == 2 ? '0000000000000' : '0000000000000') - : globalThis.lsh, + : (globalThis.lsh || '0000000000000'), 13)); const ascksyhArr = stringToASC(fillZero(ksyh, 13)) const ascsbxhArr = stringToASC('00000000') @@ -141,7 +142,7 @@ export const getMessageHeartbeat = async (msg) => { arr.forEach(itemArr => { tempArr = tempArr.concat(itemArr) }) - + console.info('surenjun','getMessageHeartbeat end') globalThis.serialIndex = 0; return Array2Byte(tempArr) } diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 24f9133d..3f5ca3f0 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -204,13 +204,11 @@ struct UserInfo { if (!globalThis.singlePlay) { // @ts-ignore if (routerParam.type != 1) { + console.info('surenjun','Judge返回到UserInfo界面') // @ts-ignore this.list = await getSyncData('USERLIST') // @ts-ignore const data = await getSyncData('USER') - console.log('useruser,', JSON.stringify(this.list)) - console.log('useruser1,', JSON.stringify(data)) - const user = data[0] if (user && Number(user.kssycs)) { let flag = false @@ -223,7 +221,11 @@ struct UserInfo { }) if (!flag) { this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject) - globalThis.lsh = this.list.length?this.currentUser.lsh:'1111111111111' + globalThis.lsh = + this.list.length + ? this.currentUser.lsh + :'1111111111111' + console.info('surenjun 当前的流水号1为:' + globalThis.lsh) } } else if (user && (user.kssycs == '0' || user.kssycs == '')) { console.log('datadatadatadata') @@ -237,10 +239,12 @@ struct UserInfo { this.currentUser = this.dataList[0] this.currentUser.ksy2 = globalThis.kgxm globalThis.lsh = this.currentUser.lsh + console.info('surenjun 当前的流水号2为:' + globalThis.lsh) }, 200) } else { this.currentUser = EmptyCandidateObject globalThis.lsh = '1111111111111' + console.info('surenjun 当前的流水号3为:' + globalThis.lsh) } } this.list.forEach((res, index) => { @@ -269,7 +273,6 @@ struct UserInfo { //监听远程开始考试 globalThis.udpEvent.onBeginExam(async () => { - console.info('surenjun', 'userInfo收到UdpEvent事件') if (this.isBoardPrePareSetPopupOpen && !this.isFirstBoardPrePareSetPopupBtnShow) { await this.prePareSCZB() } else { @@ -341,7 +344,6 @@ struct UserInfo { setTimeout(() => { this.currentUser = this.list[0] this.currentUser.ksy2 = globalThis.kgxm - globalThis.lsh = this.currentUser.lsh }, 200) @@ -643,7 +645,8 @@ struct UserInfo { this.startExam = false // await upDateTableByArray('USER', []) // await upDateTableByArray('USERLIST', []) - + await DB.clearTable('USER') + await DB.clearTable('USERLIST') this.type = '2' this.errorDialog.open() this.updateTimeLimit = true @@ -651,8 +654,6 @@ struct UserInfo { try { getExaminationStudentInfo(param).then(async (res) => { console.log("temp log ", JSON.stringify(res)) - await DB.clearTable('USER') - await DB.clearTable('USERLIST') this.errorDialog.close() setTimeout(() => { this.updateTimeLimit = false @@ -734,6 +735,7 @@ struct UserInfo { } } else { this.currentUser = EmptyCandidateObject + globalThis.lsh = '1111111111111' } diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 4b6e82c0..2e02180e 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -1256,14 +1256,11 @@ export default class Judge { const bytes = await this.getMessageHeartbeat(true); globalThis.judgeUdp.send(bytes) } - await endExam() } catch (e) { console.info(judgeTag, JSON.stringify(e)) - // setTimeout(() => { - // // avPlayer.avPlayerStop(); - // router.back(); - // }, 3000) } + await endExam() + }); } diff --git a/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ts b/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ts index e2dc7a8d..5e2cf486 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ts +++ b/entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ts @@ -311,10 +311,11 @@ export const plcStrToJson = async (plc:string) =>{ bklx:p[56], dwzt:p[83], //@ts-ignore 角度差分状态 jdzt:p[92].split('-')[0]*1, - //gps数据 - //TODO 一 精度纬度要取反 - //gps时间 经度 纬度 航向角 俯仰角 海拔高 高度差 速度 - sj:time, jd:p[95], wd:p[96], hxj:p[90], fyj:p[91], hbg:p[85], gdc:p[86], sd:p[97], + //一代机、三代机经纬度数据兼容 + //gps时间 经度 纬度 + sj:time, jd:Math.max(Number(p[95]),Number(p[96])), wd:Math.min(Number(p[95]),Number(p[96])), + //航向角 俯仰角 海拔高 高度差 速度 + hxj:p[90], fyj:p[91], hbg:p[85], gdc:p[86], sd:p[97], //龄期 经度因子 纬度因子 定位搜星数 age:p[87], jdyz:p[89], wdyz:p[88], dwsxs:p[84] || 0, //@ts-ignore 角度搜星数 From d3d9e22beca06166bed2018c90081986b486cf75 Mon Sep 17 00:00:00 2001 From: surenjun Date: Thu, 27 Mar 2025 10:35:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E7=82=B9=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/config/global.ts | 5 ++++- entry/src/main/ets/entryability/EntryAbility.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/entry/src/main/ets/config/global.ts b/entry/src/main/ets/config/global.ts index 6e16dd4d..dd5891e2 100644 --- a/entry/src/main/ets/config/global.ts +++ b/entry/src/main/ets/config/global.ts @@ -16,7 +16,7 @@ export const GlobalConfig={ //杭州 hz:{ km2:['2022.03.14.01','2022.03.17.1'], - km3:[], + km3:['2024.08.21.01','2024.08.24.1'], }, //黑龙江 hlg:{ @@ -37,5 +37,8 @@ export const GlobalConfig={ km2:['2024.08.21.01','2024.08.24.1'], km3:[], }, + wx:{ + km2:['2024.08.21.01','2024.08.24.1'], + } } } diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts index 5e598609..9e7393e9 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ts +++ b/entry/src/main/ets/entryability/EntryAbility.ts @@ -47,8 +47,8 @@ export default class EntryAbility extends UIAbility { // globalThis.judgeVersion ='2024.08.24.1' // globalThis.version ='2023.12.13.01'; - globalThis.version = GlobalConfig.version.jn.km3[0]; - globalThis.judgeVersion = GlobalConfig.version.jn.km3[1]; + globalThis.version = GlobalConfig.version.wx.km2[0]; + globalThis.judgeVersion = GlobalConfig.version.wx.km2[1]; globalThis.tcpSendNum = 0 globalThis.videoVersion = '1.0'