guzijian / wvp-GB28181-pro · Commits

Commit 408df377b760766a2b140f5c70f2f44f854b39af

Authored by 64850858
1 parent 95ed6629

添加user-agent，修复deviceINfo查询设备名称

Inline Side-by-side
Showing 2 changed files with 18 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
  View file @408df37
@@ -15,6 +15,7 @@ import javax.sip.message.Request; @@ -15,6 +15,7 @@ import javax.sip.message.Request;
15 import javax.validation.constraints.NotNull; 15 import javax.validation.constraints.NotNull;
16 import java.text.ParseException; 16 import java.text.ParseException;
17 import java.util.ArrayList; 17 import java.util.ArrayList;
  18 +import java.util.List;
18 import java.util.UUID; 19 import java.util.UUID;
19 20
20 /** 21 /**
@@ -60,6 +61,12 @@ public class SIPRequestHeaderPlarformProvider { @@ -60,6 +61,12 @@ public class SIPRequestHeaderPlarformProvider {
60 61
61 request = sipFactory.createMessageFactory().createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader, 62 request = sipFactory.createMessageFactory().createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,
62 toHeader, viaHeaders, maxForwards); 63 toHeader, viaHeaders, maxForwards);
  64 +
  65 + List<String> agentParam = new ArrayList<>();
  66 + agentParam.add("wvp-pro");
  67 + UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
  68 + request.addHeader(userAgentHeader);
  69 +
63 ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml"); 70 ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
64 request.setContent(content, contentTypeHeader); 71 request.setContent(content, contentTypeHeader);
65 return request; 72 return request;
@@ -103,6 +110,11 @@ public class SIPRequestHeaderPlarformProvider { @@ -103,6 +110,11 @@ public class SIPRequestHeaderPlarformProvider {
103 ExpiresHeader expires = sipFactory.createHeaderFactory().createExpiresHeader(Integer.parseInt(platform.getExpires())); 110 ExpiresHeader expires = sipFactory.createHeaderFactory().createExpiresHeader(Integer.parseInt(platform.getExpires()));
104 request.addHeader(expires); 111 request.addHeader(expires);
105 112
  113 + List<String> agentParam = new ArrayList<>();
  114 + agentParam.add("wvp-pro");
  115 + UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
  116 + request.addHeader(userAgentHeader);
  117 +
106 return request; 118 return request;
107 } 119 }
108 120
@@ -202,6 +214,11 @@ public class SIPRequestHeaderPlarformProvider { @@ -202,6 +214,11 @@ public class SIPRequestHeaderPlarformProvider {
202 messageFactory.setDefaultContentEncodingCharset("gb2312"); 214 messageFactory.setDefaultContentEncodingCharset("gb2312");
203 request = messageFactory.createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader, 215 request = messageFactory.createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,
204 toHeader, viaHeaders, maxForwards); 216 toHeader, viaHeaders, maxForwards);
  217 + List<String> agentParam = new ArrayList<>();
  218 + agentParam.add("wvp-pro");
  219 + UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
  220 + request.addHeader(userAgentHeader);
  221 +
205 ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "MANSCDP+xml"); 222 ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "MANSCDP+xml");
206 request.setContent(content, contentTypeHeader); 223 request.setContent(content, contentTypeHeader);
207 return request; 224 return request;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @408df37
@@ -263,7 +263,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -263,7 +263,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
263 deviceInfoXml.append("<CmdType>DeviceInfo</CmdType>\r\n"); 263 deviceInfoXml.append("<CmdType>DeviceInfo</CmdType>\r\n");
264 deviceInfoXml.append("<SN>" +sn + "</SN>\r\n"); 264 deviceInfoXml.append("<SN>" +sn + "</SN>\r\n");
265 deviceInfoXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n"); 265 deviceInfoXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
266 - deviceInfoXml.append("<DeviceName>WVP-GB28181</DeviceName>\r\n"); 266 + deviceInfoXml.append("<DeviceName>" + parentPlatform.getName() + "</DeviceName>\r\n");
267 deviceInfoXml.append("<Manufacturer>WVP</Manufacturer>\r\n"); 267 deviceInfoXml.append("<Manufacturer>WVP</Manufacturer>\r\n");
268 deviceInfoXml.append("<Model>wvp-28181-2.0</Model>\r\n"); 268 deviceInfoXml.append("<Model>wvp-28181-2.0</Model>\r\n");
269 deviceInfoXml.append("<Firmware>2.0.202103</Firmware>\r\n"); 269 deviceInfoXml.append("<Firmware>2.0.202103</Firmware>\r\n");