搭配zgyw，实现gb28181
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
648540858
2021-12-20 22efd0f56c20e1aedb18fa7b9bcdc48007fcc954 
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java


@@ -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);


@@ -267,10 +263,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");