diff --git a/entry/src/main/ets/common/utils/tempRequest.ts b/entry/src/main/ets/common/utils/tempRequest.ts index 0276e480..aca01882 100644 --- a/entry/src/main/ets/common/utils/tempRequest.ts +++ b/entry/src/main/ets/common/utils/tempRequest.ts @@ -164,7 +164,7 @@ async function xmlToJson(result, url) { let res = deeml(xmlArr); console.log("xmlToJson end",JSON.stringify(res) ); resolve(res) - }, 100) + }, 10000) } else { let res = deeml(xmlArr); console.log("xmlToJson end",JSON.stringify(res) ); diff --git a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets b/entry/src/main/ets/pages/compontents/SignDisplayCom.ets index b076d3be..3c542a9b 100644 --- a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets +++ b/entry/src/main/ets/pages/compontents/SignDisplayCom.ets @@ -99,91 +99,91 @@ export default struct SignDisplayCom { }.width(936 * this.ratio) Column() { - Flex({ direction: FlexDirection.Column }) { - Row() { - Text("发送次数：" + this.signArr[49] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('25%') - .textAlign(TextAlign.Start) - Text("固件版本：" + this.signArr[54] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('30%') - .textAlign(TextAlign.Start) - Text("GPS数据次数/数据长度：" + this.signArr[59] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .textAlign(TextAlign.Start) - }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) - - Row() { - Text("方向盘类型：" + this.signArr[50] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('25%') - .textAlign(TextAlign.Start) - Text("按键数值：" + this.signArr[55] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('30%') - .textAlign(TextAlign.Start) - Text("GPS错误次数：" + this.signArr[60] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .textAlign(TextAlign.Start) - }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) - - Row() { - Text("汽车类型：" + this.signArr[51] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('25%') - .textAlign(TextAlign.Start) - Text("GPS板卡类型：" + this.signArr[56] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('30%') - .textAlign(TextAlign.Start) - Text("已工作时长/设定的工作时长：" + this.signArr[61] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .textAlign(TextAlign.Start) - }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) - - Row() { - Text("接口心跳：" + this.signArr[52] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('25%') - .textAlign(TextAlign.Start) - Text("GPS板卡软件版本：" + this.signArr[57] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('30%') - .textAlign(TextAlign.Start) - Text("改正数次数/改正数大小：" + this.signArr[58] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .textAlign(TextAlign.Start) - }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) - - Row() { - Text("本机IP：" + '192.168.7.170') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .width('25%') - .textAlign(TextAlign.Start) - Text("改正数数据长度*数据长度-基准站RTCM改正数类型：" + this.signArr[62] || '0') - .fontColor('#FFF5E5') - .fontSize(14 * this.ratio) - .textAlign(TextAlign.Start) - }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) - } - .backgroundColor('#282828') - .width(this.ratio * 890) - .height(136 * this.ratio) - .margin({ left: 0 * this.ratio, top: 15 * this.ratio }) + // Flex({ direction: FlexDirection.Column }) { + // Row() { + // Text("发送次数：" + this.signArr[49] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('25%') + // .textAlign(TextAlign.Start) + // Text("固件版本：" + this.signArr[54] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('30%') + // .textAlign(TextAlign.Start) + // Text("GPS数据次数/数据长度：" + this.signArr[59] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .textAlign(TextAlign.Start) + // }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) + // + // Row() { + // Text("方向盘类型：" + this.signArr[50] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('25%') + // .textAlign(TextAlign.Start) + // Text("按键数值：" + this.signArr[55] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('30%') + // .textAlign(TextAlign.Start) + // Text("GPS错误次数：" + this.signArr[60] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .textAlign(TextAlign.Start) + // }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) + // + // Row() { + // Text("汽车类型：" + this.signArr[51] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('25%') + // .textAlign(TextAlign.Start) + // Text("GPS板卡类型：" + this.signArr[56] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('30%') + // .textAlign(TextAlign.Start) + // Text("已工作时长/设定的工作时长：" + this.signArr[61] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .textAlign(TextAlign.Start) + // }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) + // + // Row() { + // Text("接口心跳：" + this.signArr[52] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('25%') + // .textAlign(TextAlign.Start) + // Text("GPS板卡软件版本：" + this.signArr[57] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('30%') + // .textAlign(TextAlign.Start) + // Text("改正数次数/改正数大小：" + this.signArr[58] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .textAlign(TextAlign.Start) + // }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) + // + // Row() { + // Text("本机IP：" + '192.168.7.170') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .width('25%') + // .textAlign(TextAlign.Start) + // Text("改正数数据长度*数据长度-基准站RTCM改正数类型：" + this.signArr[62] || '0') + // .fontColor('#FFF5E5') + // .fontSize(14 * this.ratio) + // .textAlign(TextAlign.Start) + // }.justifyContent(FlexAlign.Start).padding({ left: 10 * this.ratio }).margin({ top: 8 * this.ratio }) + // } + // .backgroundColor('#282828') + // .width(this.ratio * 890) + // .height(136 * this.ratio) + // .margin({ left: 0 * this.ratio, top: 15 * this.ratio }) Row() { Flex({ direction: FlexDirection.Column, wrap: FlexWrap.Wrap }) { @@ -360,20 +360,20 @@ export default struct SignDisplayCom { const getSignal = this.getSignal; const that = this const showBack = this.showBack; - if (showBack) { - globalThis.udpClient.onMessage_1&&globalThis.udpClient.onMessage_1((msg) => { - console.log('getUDPonMessage_1bysignDisplay2', msg) - - getSignal(msg) - }) - } else { - clearInterval(globalThis.signalTimer) - globalThis.signalTimer = setInterval(() => { - //TODO 临时方案 - const msgStr = globalThis.msgStr - getSignal(msgStr) - }, 200) - } + // if (showBack) { + // globalThis.udpClient.onMessage_1&&globalThis.udpClient.onMessage_1((msg) => { + // console.log('getUDPonMessage_1bysignDisplay2', msg) + // + // getSignal(msg) + // }) + // } else { + // clearInterval(globalThis.signalTimer) + // globalThis.signalTimer = setInterval(() => { + // //TODO 临时方案 + // const msgStr = globalThis.msgStr + // getSignal(msgStr) + // }, 200) + // } } diff --git a/entry/src/main/ets/pages/compontents/judge.zip b/entry/src/main/ets/pages/compontents/judge.zip deleted file mode 100644 index 711213e5..00000000 Binary files a/entry/src/main/ets/pages/compontents/judge.zip and /dev/null differ diff --git a/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts b/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts index d6ea58e8..b0956a62 100644 --- a/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts +++ b/entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts @@ -1,6 +1,6 @@ //考试回放开关 export const judgeConfig = { - version:'2024.08.21.01', + version: '2024.08.21.01', //本地目录开关 isTrajectoryOpen: false, //是否开启拍照 @@ -8,22 +8,22 @@ export const judgeConfig = { //扣分语音是否强制开启 kfVoiceOpen: false, //忽略的考试项目 - ignoreProjects:[], + ignoreProjects: [], // 是否忽略考试前熄火、车门检查 isCheckFireOpen: false, //轨迹回放是否开启Udp - udpOpen:true, + udpOpen: true, // 本地模型地址 // modelPath: 'models/model_enc', // 济南科目三 - trajectoryPath: 'logs/2025_04_23_09_50_55_2504755332926_320924199111132926_陈静/judge_exam_data.txt', + trajectoryPath: 'logs/2024_10_12_11_50_10_9999427676823_744299437502336256_隋统/judge_exam_data.txt', //四合一画面配置 - fourInOneScreen:{ + fourInOneScreen: { //gps位数 - gpsDigit:7 + gpsDigit: 7 }, // 杭州科目二 // trajectoryPath: 'logs/2024_07_19/0000000000001_342323199501470011_测试学员1_2024_07_19_06_49_12/judge_exam_data.txt', //TODO 济南临时特殊配置 - systemParamConfig:{} + systemParamConfig: {} } \ No newline at end of file