diff --git a/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts b/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts index cbf815a5..2a7eeebb 100644 --- a/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts +++ b/entry/src/main/ets/common/rearEndUnitsTool/tool/UdpByOne.ts @@ -82,6 +82,7 @@ export default class UdpByOne { address: this.OppositeIp, port: parseInt(this.PLCOppositeIpPort), } + }) } @@ -122,7 +123,7 @@ export default class UdpByOne { let GPGGAMsgArr = GPGGAMatch ? GPGGAMatch[0]?.split(",").slice(0, 15) : []; // 使用正则提取$GPRMC消息 let GPRMCMatch = this.GPSMsg.match(/\$GPRMC[^$]*/); - let GPRMCMsgArr = GPRMCMatch ? GPRMCMatch?.split(",").slice(0, 14) : []; + let GPRMCMsgArr = GPRMCMatch ? GPRMCMatch[0]?.split(",").slice(0, 14) : []; // 使用正则表达式提取$GPGST消息 let GPGSTMatch = this.GPSMsg.match(/\$GPGST[^$]*/); let GPGSTMsgArr = GPGSTMatch ? GPGSTMatch[0]?.split(",").slice(0, 9) : []; @@ -130,11 +131,6 @@ export default class UdpByOne { let PTNLMatch = this.GPSMsg.match(/\$PTNL[^$]*/); let PTNLMsgArr = PTNLMatch ? PTNLMatch[0].split(",")?.slice(0, 14) : []; - if(GPGGAMsgArr.length == 0 || GPRMCMsgArr.length ==0 || GPGSTMsgArr.length ==0 || PTNLMsgArr.length ==0){ - return - } - - // 组合GPS数据 // 状态83 newMessage[83] = GPGGAMsgArr[6]; @@ -277,7 +273,9 @@ export default class UdpByOne { // 已工作时长/设定的工作时长 61 // 改正数数据长度*数据长度-基准站RTCM改正数类型 62 } - return newMessage.join(",") + return newMessage.map(i=>{ + return i === undefined?'':i + }).join(",") } // PLC接收消息