Compare commits
	
		
			No commits in common. "ee1f1e1636cc4cf2ec4bcc953241dfde3d59806a" and "fe5c1e033196a04870a3045a9032a4de0ccb3f6c" have entirely different histories.
		
	
	
		
			ee1f1e1636
			...
			fe5c1e0331
		
	
		
@ -82,7 +82,6 @@ export default class UdpByOne {
 | 
				
			|||||||
        address: this.OppositeIp,
 | 
					        address: this.OppositeIp,
 | 
				
			||||||
        port: parseInt(this.PLCOppositeIpPort),
 | 
					        port: parseInt(this.PLCOppositeIpPort),
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					 | 
				
			||||||
    })
 | 
					    })
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -123,7 +122,7 @@ export default class UdpByOne {
 | 
				
			|||||||
      let GPGGAMsgArr = GPGGAMatch ? GPGGAMatch[0]?.split(",").slice(0, 15) : [];
 | 
					      let GPGGAMsgArr = GPGGAMatch ? GPGGAMatch[0]?.split(",").slice(0, 15) : [];
 | 
				
			||||||
      //   使用正则提取$GPRMC消息
 | 
					      //   使用正则提取$GPRMC消息
 | 
				
			||||||
      let GPRMCMatch = this.GPSMsg.match(/\$GPRMC[^$]*/);
 | 
					      let GPRMCMatch = this.GPSMsg.match(/\$GPRMC[^$]*/);
 | 
				
			||||||
      let GPRMCMsgArr = GPRMCMatch ? GPRMCMatch[0]?.split(",").slice(0, 14) : [];
 | 
					      let GPRMCMsgArr = GPRMCMatch ? GPRMCMatch?.split(",").slice(0, 14) : [];
 | 
				
			||||||
      //   使用正则表达式提取$GPGST消息
 | 
					      //   使用正则表达式提取$GPGST消息
 | 
				
			||||||
      let GPGSTMatch = this.GPSMsg.match(/\$GPGST[^$]*/);
 | 
					      let GPGSTMatch = this.GPSMsg.match(/\$GPGST[^$]*/);
 | 
				
			||||||
      let GPGSTMsgArr = GPGSTMatch ? GPGSTMatch[0]?.split(",").slice(0, 9) : [];
 | 
					      let GPGSTMsgArr = GPGSTMatch ? GPGSTMatch[0]?.split(",").slice(0, 9) : [];
 | 
				
			||||||
@ -131,6 +130,11 @@ export default class UdpByOne {
 | 
				
			|||||||
      let PTNLMatch = this.GPSMsg.match(/\$PTNL[^$]*/);
 | 
					      let PTNLMatch = this.GPSMsg.match(/\$PTNL[^$]*/);
 | 
				
			||||||
      let PTNLMsgArr = PTNLMatch ? PTNLMatch[0].split(",")?.slice(0, 14) : [];
 | 
					      let PTNLMsgArr = PTNLMatch ? PTNLMatch[0].split(",")?.slice(0, 14) : [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      if(GPGGAMsgArr.length == 0 || GPRMCMsgArr.length ==0 || GPGSTMsgArr.length ==0 || PTNLMsgArr.length ==0){
 | 
				
			||||||
 | 
					        return
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      //   组合GPS数据
 | 
					      //   组合GPS数据
 | 
				
			||||||
      // 状态83
 | 
					      // 状态83
 | 
				
			||||||
      newMessage[83] = GPGGAMsgArr[6];
 | 
					      newMessage[83] = GPGGAMsgArr[6];
 | 
				
			||||||
@ -273,9 +277,7 @@ export default class UdpByOne {
 | 
				
			|||||||
      // 已工作时长/设定的工作时长 61
 | 
					      // 已工作时长/设定的工作时长 61
 | 
				
			||||||
      // 改正数数据长度*数据长度-基准站RTCM改正数类型 62
 | 
					      // 改正数数据长度*数据长度-基准站RTCM改正数类型 62
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return newMessage.map(i=>{
 | 
					    return newMessage.join(",")
 | 
				
			||||||
      return i === undefined?'':i
 | 
					 | 
				
			||||||
    }).join(",")
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  //   PLC接收消息
 | 
					  //   PLC接收消息
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user