wvp-pro.git - Gitblit

			@@ -1,6 +1,5 @@
			package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;

			import com.genersoft.iot.vmp.conf.MediaConfig;
			import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
			import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
			import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
			@@ -12,7 +11,6 @@
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Qualifier;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.context.annotation.DependsOn;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.lang.Nullable;
			@@ -23,8 +21,6 @@
			import javax.sip.header.WWWAuthenticateHeader;
			import javax.sip.message.Request;
			import java.text.ParseException;
			import java.util.Timer;
			import java.util.TimerTask;
			import java.util.UUID;

			@Component
			@@ -104,7 +100,7 @@
			if (event != null) {
			logger.info("向上级平台 [ {} ] 注册发上错误： {} ",
			parentPlatform.getServerGBId(),
			event.getResponse().getReasonPhrase());
			event.msg);
			}
			if (errorEvent != null ) {
			errorEvent.response(event);
			@@ -226,7 +222,13 @@
			catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
			catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
			catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");
			catalogXml.append("<Info></Info>\r\n");
			catalogXml.append("<Longitude>" + channel.getLongitude() + "</Longitude>\r\n");
			catalogXml.append("<Latitude>" + channel.getLatitude() + "</Latitude>\r\n");
			catalogXml.append("<IPAddress>" + channel.getIpAddress() + "</IPAddress>\r\n");
			catalogXml.append("<Port>" + channel.getPort() + "</Port>\r\n");
			catalogXml.append("<Info>\r\n");
			catalogXml.append("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
			catalogXml.append("</Info>\r\n");
			}


			@@ -267,10 +269,10 @@
			deviceInfoXml.append("<CmdType>DeviceInfo</CmdType>\r\n");
			deviceInfoXml.append("<SN>" +sn + "</SN>\r\n");
			deviceInfoXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
			deviceInfoXml.append("<DeviceName>WVP-GB28181</DeviceName>\r\n");
			deviceInfoXml.append("<Manufacturer>WVP</Manufacturer>\r\n");
			deviceInfoXml.append("<DeviceName>" + parentPlatform.getName() + "</DeviceName>\r\n");
			deviceInfoXml.append("<Manufacturer>wvp</Manufacturer>\r\n");
			deviceInfoXml.append("<Model>wvp-28181-2.0</Model>\r\n");
			deviceInfoXml.append("<Firmware>2.0.202103</Firmware>\r\n");
			deviceInfoXml.append("<Firmware>2.0.202107</Firmware>\r\n");
			deviceInfoXml.append("<Result>OK</Result>\r\n");
			deviceInfoXml.append("</Response>\r\n");