Commit 7db2bf7b51015a7e989ea5b0f4d9486dfd99d4bd

Authored by 648540858
1 parent b46e5efa

使用equalsIgnoreCase代替equals,忽略大小写差异

src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -128,7 +128,7 @@ public class ProxyServletConfig { @@ -128,7 +128,7 @@ public class ProxyServletConfig {
128 MediaServerItem getMediaInfoByUri(String uri){ 128 MediaServerItem getMediaInfoByUri(String uri){
129 String[] split = uri.split("/"); 129 String[] split = uri.split("/");
130 String mediaServerId = split[2]; 130 String mediaServerId = split[2];
131 - if ("default".equals(mediaServerId)) { 131 + if ("default".equalsIgnoreCase(mediaServerId)) {
132 return mediaServerService.getDefaultMediaServer(); 132 return mediaServerService.getDefaultMediaServer();
133 }else { 133 }else {
134 return mediaServerService.getOne(mediaServerId); 134 return mediaServerService.getOne(mediaServerId);
@@ -246,7 +246,7 @@ public class ProxyServletConfig { @@ -246,7 +246,7 @@ public class ProxyServletConfig {
246 MediaServerItem getMediaInfoByUri(String uri){ 246 MediaServerItem getMediaInfoByUri(String uri){
247 String[] split = uri.split("/"); 247 String[] split = uri.split("/");
248 String mediaServerId = split[2]; 248 String mediaServerId = split[2];
249 - if ("default".equals(mediaServerId)) { 249 + if ("default".equalsIgnoreCase(mediaServerId)) {
250 return mediaServerService.getDefaultMediaServer(); 250 return mediaServerService.getDefaultMediaServer();
251 }else { 251 }else {
252 return mediaServerService.getOne(mediaServerId); 252 return mediaServerService.getOne(mediaServerId);
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -47,12 +47,16 @@ public class SipLayer{ @@ -47,12 +47,16 @@ public class SipLayer{
47 /** 47 /**
48 * 完整配置参考 gov.nist.javax.sip.SipStackImpl,需要下载源码 48 * 完整配置参考 gov.nist.javax.sip.SipStackImpl,需要下载源码
49 * gov/nist/javax/sip/SipStackImpl.class 49 * gov/nist/javax/sip/SipStackImpl.class
  50 + * sip消息的解析在 gov.nist.javax.sip.stack.UDPMessageChannel的processIncomingDataPacket方法
50 */ 51 */
  52 +// * gov/nist/javax/sip/SipStackImpl.class
51 if (logger.isDebugEnabled()) { 53 if (logger.isDebugEnabled()) {
52 properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false"); 54 properties.setProperty("gov.nist.javax.sip.LOG_MESSAGE_CONTENT", "false");
53 } 55 }
54 // 接收所有notify请求,即使没有订阅 56 // 接收所有notify请求,即使没有订阅
55 properties.setProperty("gov.nist.javax.sip.DELIVER_UNSOLICITED_NOTIFY", "true"); 57 properties.setProperty("gov.nist.javax.sip.DELIVER_UNSOLICITED_NOTIFY", "true");
  58 + properties.setProperty("gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING", "false");
  59 + properties.setProperty("gov.nist.javax.sip.CANCEL_CLIENT_TRANSACTION_CHECKED", "false");
56 // 为_NULL _对话框传递_终止的_事件 60 // 为_NULL _对话框传递_终止的_事件
57 properties.setProperty("gov.nist.javax.sip.DELIVER_TERMINATED_EVENT_FOR_NULL_DIALOG", "true"); 61 properties.setProperty("gov.nist.javax.sip.DELIVER_TERMINATED_EVENT_FOR_NULL_DIALOG", "true");
58 // 会话清理策略 62 // 会话清理策略
@@ -64,7 +68,7 @@ public class SipLayer{ @@ -64,7 +68,7 @@ public class SipLayer{
64 * sip_server_log.log 和 sip_debug_log.log ERROR, INFO, WARNING, OFF, DEBUG, TRACE 68 * sip_server_log.log 和 sip_debug_log.log ERROR, INFO, WARNING, OFF, DEBUG, TRACE
65 */ 69 */
66 properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "ERROR"); 70 properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "ERROR");
67 - properties.setProperty("gov.nist.javax.sip.SIP_MESSAGE_VALVE", "com.genersoft.iot.vmp.gb28181.session.SipMessagePreprocessing"); 71 +// properties.setProperty("gov.nist.javax.sip.SIP_MESSAGE_VALVE", "com.genersoft.iot.vmp.gb28181.session.SipMessagePreprocessing");
68 // if (logger.isDebugEnabled()) { 72 // if (logger.isDebugEnabled()) {
69 // properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "DEBUG"); 73 // properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "DEBUG");
70 // } 74 // }
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
@@ -218,7 +218,7 @@ public class DigestServerAuthenticationHelper { @@ -218,7 +218,7 @@ public class DigestServerAuthenticationHelper {
218 logger.debug("qop: " + qop); 218 logger.debug("qop: " + qop);
219 String KD = HA1 + ":" + nonce; 219 String KD = HA1 + ":" + nonce;
220 220
221 - if (qop != null && qop.equals("auth") ) { 221 + if (qop != null && qop.equalsIgnoreCase("auth") ) {
222 if (nc != -1) { 222 if (nc != -1) {
223 KD += ":" + ncStr; 223 KD += ":" + ncStr;
224 } 224 }
src/main/java/com/genersoft/iot/vmp/gb28181/session/SipMessagePreprocessing.java deleted 100644 → 0
1 -package com.genersoft.iot.vmp.gb28181.session;  
2 -  
3 -import gov.nist.javax.sip.message.SIPRequest;  
4 -import gov.nist.javax.sip.stack.MessageChannel;  
5 -import gov.nist.javax.sip.stack.SIPMessageValve;  
6 -  
7 -import javax.sip.SipStack;  
8 -import javax.sip.message.Response;  
9 -  
10 -public class SipMessagePreprocessing implements SIPMessageValve {  
11 - @Override  
12 - public boolean processRequest(SIPRequest sipRequest, MessageChannel messageChannel) {  
13 - return false;  
14 - }  
15 -  
16 - @Override  
17 - public boolean processResponse(Response response, MessageChannel messageChannel) {  
18 - return false;  
19 - }  
20 -  
21 - @Override  
22 - public void init(SipStack sipStack) {  
23 -  
24 - }  
25 -  
26 - @Override  
27 - public void destroy() {  
28 -  
29 - }  
30 -}  
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
@@ -28,7 +28,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver { @@ -28,7 +28,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver {
28 28
29 private final static Logger logger = LoggerFactory.getLogger(SIPProcessorObserver.class); 29 private final static Logger logger = LoggerFactory.getLogger(SIPProcessorObserver.class);
30 30
31 - private static Map<String, ISIPRequestProcessor> requestProcessorMap = new ConcurrentHashMap<>(); 31 + private static Map<String, ISIPRequestProcessor> requestProcessorMap = new ConcurrentHashMap<>();
32 private static Map<String, ISIPResponseProcessor> responseProcessorMap = new ConcurrentHashMap<>(); 32 private static Map<String, ISIPResponseProcessor> responseProcessorMap = new ConcurrentHashMap<>();
33 private static ITimeoutProcessor timeoutProcessor; 33 private static ITimeoutProcessor timeoutProcessor;
34 34
@@ -72,6 +72,9 @@ public class SIPProcessorObserver implements ISIPProcessorObserver { @@ -72,6 +72,9 @@ public class SIPProcessorObserver implements ISIPProcessorObserver {
72 @Async 72 @Async
73 public void processRequest(RequestEvent requestEvent) { 73 public void processRequest(RequestEvent requestEvent) {
74 String method = requestEvent.getRequest().getMethod(); 74 String method = requestEvent.getRequest().getMethod();
  75 + if ("NOTIFY".equalsIgnoreCase(requestEvent.getRequest().getMethod())) {
  76 + System.out.println();
  77 + }
75 ISIPRequestProcessor sipRequestProcessor = requestProcessorMap.get(method); 78 ISIPRequestProcessor sipRequestProcessor = requestProcessorMap.get(method);
76 if (sipRequestProcessor == null) { 79 if (sipRequestProcessor == null) {
77 logger.warn("不支持方法{}的request", method); 80 logger.warn("不支持方法{}的request", method);
@@ -91,7 +94,8 @@ public class SIPProcessorObserver implements ISIPProcessorObserver { @@ -91,7 +94,8 @@ public class SIPProcessorObserver implements ISIPProcessorObserver {
91 Response response = responseEvent.getResponse(); 94 Response response = responseEvent.getResponse();
92 int status = response.getStatusCode(); 95 int status = response.getStatusCode();
93 96
94 - if (((status >= 200) && (status < 300)) || status == Response.UNAUTHORIZED) { // Success! 97 + // Success
  98 + if (((status >= Response.OK) && (status < Response.MULTIPLE_CHOICES)) || status == Response.UNAUTHORIZED) {
95 CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME); 99 CSeqHeader cseqHeader = (CSeqHeader) responseEvent.getResponse().getHeader(CSeqHeader.NAME);
96 String method = cseqHeader.getMethod(); 100 String method = cseqHeader.getMethod();
97 ISIPResponseProcessor sipRequestProcessor = responseProcessorMap.get(method); 101 ISIPResponseProcessor sipRequestProcessor = responseProcessorMap.get(method);
@@ -109,7 +113,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver { @@ -109,7 +113,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver {
109 } 113 }
110 } 114 }
111 } 115 }
112 - } else if ((status >= 100) && (status < 200)) { 116 + } else if ((status >= Response.TRYING) && (status < Response.OK)) {
113 // 增加其它无需回复的响应,如101、180等 117 // 增加其它无需回复的响应,如101、180等
114 } else { 118 } else {
115 logger.warn("接收到失败的response响应!status:" + status + ",message:" + response.getReasonPhrase()); 119 logger.warn("接收到失败的response响应!status:" + status + ",message:" + response.getReasonPhrase());
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
@@ -146,12 +146,12 @@ public class SIPRequestHeaderPlarformProvider { @@ -146,12 +146,12 @@ public class SIPRequestHeaderPlarformProvider {
146 String cNonce = null; 146 String cNonce = null;
147 String nc = "00000001"; 147 String nc = "00000001";
148 if (qop != null) { 148 if (qop != null) {
149 - if ("auth".equals(qop)) { 149 + if ("auth".equalsIgnoreCase(qop)) {
150 // 客户端随机数,这是一个不透明的字符串值,由客户端提供,并且客户端和服务器都会使用,以避免用明文文本。 150 // 客户端随机数,这是一个不透明的字符串值,由客户端提供,并且客户端和服务器都会使用,以避免用明文文本。
151 // 这使得双方都可以查验对方的身份,并对消息的完整性提供一些保护 151 // 这使得双方都可以查验对方的身份,并对消息的完整性提供一些保护
152 cNonce = UUID.randomUUID().toString(); 152 cNonce = UUID.randomUUID().toString();
153 153
154 - }else if ("auth-int".equals(qop)){ 154 + }else if ("auth-int".equalsIgnoreCase(qop)){
155 // TODO 155 // TODO
156 } 156 }
157 } 157 }
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -247,7 +247,7 @@ public class SIPCommander implements ISIPCommander { @@ -247,7 +247,7 @@ public class SIPCommander implements ISIPCommander {
247 247
248 String tm = Long.toString(System.currentTimeMillis()); 248 String tm = Long.toString(System.currentTimeMillis());
249 249
250 - CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 250 + CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
251 : udpSipProvider.getNewCallId(); 251 : udpSipProvider.getNewCallId();
252 252
253 Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader); 253 Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
@@ -290,7 +290,7 @@ public class SIPCommander implements ISIPCommander { @@ -290,7 +290,7 @@ public class SIPCommander implements ISIPCommander {
290 290
291 String tm = Long.toString(System.currentTimeMillis()); 291 String tm = Long.toString(System.currentTimeMillis());
292 292
293 - CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 293 + CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
294 : udpSipProvider.getNewCallId(); 294 : udpSipProvider.getNewCallId();
295 295
296 Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader); 296 Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
@@ -326,7 +326,7 @@ public class SIPCommander implements ISIPCommander { @@ -326,7 +326,7 @@ public class SIPCommander implements ISIPCommander {
326 326
327 String tm = Long.toString(System.currentTimeMillis()); 327 String tm = Long.toString(System.currentTimeMillis());
328 328
329 - CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 329 + CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
330 : udpSipProvider.getNewCallId(); 330 : udpSipProvider.getNewCallId();
331 331
332 Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader); 332 Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);
@@ -353,7 +353,7 @@ public class SIPCommander implements ISIPCommander { @@ -353,7 +353,7 @@ public class SIPCommander implements ISIPCommander {
353 if (device == null) { 353 if (device == null) {
354 return; 354 return;
355 } 355 }
356 - String streamMode = device.getStreamMode().toUpperCase(); 356 +// String streamMode = device.getStreamMode().toUpperCase();
357 357
358 logger.info("{} 分配的ZLM为: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort()); 358 logger.info("{} 分配的ZLM为: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
359 HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", stream, true, "rtmp", mediaServerItem.getId()); 359 HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", stream, true, "rtmp", mediaServerItem.getId());
@@ -372,11 +372,11 @@ public class SIPCommander implements ISIPCommander { @@ -372,11 +372,11 @@ public class SIPCommander implements ISIPCommander {
372 content.append("t=0 0\r\n"); 372 content.append("t=0 0\r\n");
373 373
374 if (userSetting.isSeniorSdp()) { 374 if (userSetting.isSeniorSdp()) {
375 - if("TCP-PASSIVE".equals(streamMode)) { 375 + if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {
376 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n"); 376 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
377 - }else if ("TCP-ACTIVE".equals(streamMode)) { 377 + }else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) {
378 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n"); 378 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
379 - }else if("UDP".equals(streamMode)) { 379 + }else if("UDP".equalsIgnoreCase(device.getStreamMode())) {
380 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n"); 380 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");
381 } 381 }
382 content.append("a=recvonly\r\n"); 382 content.append("a=recvonly\r\n");
@@ -388,19 +388,19 @@ public class SIPCommander implements ISIPCommander { @@ -388,19 +388,19 @@ public class SIPCommander implements ISIPCommander {
388 content.append("a=rtpmap:99 H265/90000\r\n"); 388 content.append("a=rtpmap:99 H265/90000\r\n");
389 content.append("a=rtpmap:98 H264/90000\r\n"); 389 content.append("a=rtpmap:98 H264/90000\r\n");
390 content.append("a=rtpmap:97 MPEG4/90000\r\n"); 390 content.append("a=rtpmap:97 MPEG4/90000\r\n");
391 - if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式 391 + if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())){ // tcp被动模式
392 content.append("a=setup:passive\r\n"); 392 content.append("a=setup:passive\r\n");
393 content.append("a=connection:new\r\n"); 393 content.append("a=connection:new\r\n");
394 - }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式 394 + }else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp主动模式
395 content.append("a=setup:active\r\n"); 395 content.append("a=setup:active\r\n");
396 content.append("a=connection:new\r\n"); 396 content.append("a=connection:new\r\n");
397 } 397 }
398 }else { 398 }else {
399 - if("TCP-PASSIVE".equals(streamMode)) { 399 + if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {
400 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n"); 400 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
401 - }else if ("TCP-ACTIVE".equals(streamMode)) { 401 + }else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) {
402 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n"); 402 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
403 - }else if("UDP".equals(streamMode)) { 403 + }else if("UDP".equalsIgnoreCase(device.getStreamMode())) {
404 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n"); 404 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
405 } 405 }
406 content.append("a=recvonly\r\n"); 406 content.append("a=recvonly\r\n");
@@ -408,10 +408,10 @@ public class SIPCommander implements ISIPCommander { @@ -408,10 +408,10 @@ public class SIPCommander implements ISIPCommander {
408 content.append("a=rtpmap:98 H264/90000\r\n"); 408 content.append("a=rtpmap:98 H264/90000\r\n");
409 content.append("a=rtpmap:97 MPEG4/90000\r\n"); 409 content.append("a=rtpmap:97 MPEG4/90000\r\n");
410 content.append("a=rtpmap:99 H265/90000\r\n"); 410 content.append("a=rtpmap:99 H265/90000\r\n");
411 - if ("TCP-PASSIVE".equals(streamMode)) { // tcp被动模式 411 + if ("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp被动模式
412 content.append("a=setup:passive\r\n"); 412 content.append("a=setup:passive\r\n");
413 content.append("a=connection:new\r\n"); 413 content.append("a=connection:new\r\n");
414 - } else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式 414 + } else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp主动模式
415 content.append("a=setup:active\r\n"); 415 content.append("a=setup:active\r\n");
416 content.append("a=connection:new\r\n"); 416 content.append("a=connection:new\r\n");
417 } 417 }
@@ -423,7 +423,7 @@ public class SIPCommander implements ISIPCommander { @@ -423,7 +423,7 @@ public class SIPCommander implements ISIPCommander {
423 423
424 String tm = Long.toString(System.currentTimeMillis()); 424 String tm = Long.toString(System.currentTimeMillis());
425 425
426 - CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 426 + CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
427 : udpSipProvider.getNewCallId(); 427 : udpSipProvider.getNewCallId();
428 428
429 Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "FromInvt" + tm, null, ssrcInfo.getSsrc(), callIdHeader); 429 Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "FromInvt" + tm, null, ssrcInfo.getSsrc(), callIdHeader);
@@ -470,14 +470,14 @@ public class SIPCommander implements ISIPCommander { @@ -470,14 +470,14 @@ public class SIPCommander implements ISIPCommander {
470 content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" " 470 content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "
471 +DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n"); 471 +DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");
472 472
473 - String streamMode = device.getStreamMode().toUpperCase(); 473 + String streamMode = device.getStreamMode();
474 474
475 if (userSetting.isSeniorSdp()) { 475 if (userSetting.isSeniorSdp()) {
476 - if("TCP-PASSIVE".equals(streamMode)) { 476 + if("TCP-PASSIVE".equalsIgnoreCase(streamMode)) {
477 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n"); 477 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
478 - }else if ("TCP-ACTIVE".equals(streamMode)) { 478 + }else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) {
479 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n"); 479 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
480 - }else if("UDP".equals(streamMode)) { 480 + }else if("UDP".equalsIgnoreCase(streamMode)) {
481 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n"); 481 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");
482 } 482 }
483 content.append("a=recvonly\r\n"); 483 content.append("a=recvonly\r\n");
@@ -489,19 +489,19 @@ public class SIPCommander implements ISIPCommander { @@ -489,19 +489,19 @@ public class SIPCommander implements ISIPCommander {
489 content.append("a=rtpmap:99 H265/90000\r\n"); 489 content.append("a=rtpmap:99 H265/90000\r\n");
490 content.append("a=rtpmap:98 H264/90000\r\n"); 490 content.append("a=rtpmap:98 H264/90000\r\n");
491 content.append("a=rtpmap:97 MPEG4/90000\r\n"); 491 content.append("a=rtpmap:97 MPEG4/90000\r\n");
492 - if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式 492 + if("TCP-PASSIVE".equalsIgnoreCase(streamMode)){ // tcp被动模式
493 content.append("a=setup:passive\r\n"); 493 content.append("a=setup:passive\r\n");
494 content.append("a=connection:new\r\n"); 494 content.append("a=connection:new\r\n");
495 - }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式 495 + }else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) { // tcp主动模式
496 content.append("a=setup:active\r\n"); 496 content.append("a=setup:active\r\n");
497 content.append("a=connection:new\r\n"); 497 content.append("a=connection:new\r\n");
498 } 498 }
499 }else { 499 }else {
500 - if("TCP-PASSIVE".equals(streamMode)) { 500 + if("TCP-PASSIVE".equalsIgnoreCase(streamMode)) {
501 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n"); 501 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
502 - }else if ("TCP-ACTIVE".equals(streamMode)) { 502 + }else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) {
503 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n"); 503 content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
504 - }else if("UDP".equals(streamMode)) { 504 + }else if("UDP".equalsIgnoreCase(streamMode)) {
505 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n"); 505 content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
506 } 506 }
507 content.append("a=recvonly\r\n"); 507 content.append("a=recvonly\r\n");
@@ -509,10 +509,10 @@ public class SIPCommander implements ISIPCommander { @@ -509,10 +509,10 @@ public class SIPCommander implements ISIPCommander {
509 content.append("a=rtpmap:97 MPEG4/90000\r\n"); 509 content.append("a=rtpmap:97 MPEG4/90000\r\n");
510 content.append("a=rtpmap:98 H264/90000\r\n"); 510 content.append("a=rtpmap:98 H264/90000\r\n");
511 content.append("a=rtpmap:99 H265/90000\r\n"); 511 content.append("a=rtpmap:99 H265/90000\r\n");
512 - if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式 512 + if("TCP-PASSIVE".equalsIgnoreCase(streamMode)){ // tcp被动模式
513 content.append("a=setup:passive\r\n"); 513 content.append("a=setup:passive\r\n");
514 content.append("a=connection:new\r\n"); 514 content.append("a=connection:new\r\n");
515 - }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式 515 + }else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) { // tcp主动模式
516 content.append("a=setup:active\r\n"); 516 content.append("a=setup:active\r\n");
517 content.append("a=connection:new\r\n"); 517 content.append("a=connection:new\r\n");
518 } 518 }
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -92,10 +92,10 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -92,10 +92,10 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
92 String tm = Long.toString(System.currentTimeMillis()); 92 String tm = Long.toString(System.currentTimeMillis());
93 if (!registerAgain ) { 93 if (!registerAgain ) {
94 CallIdHeader callIdHeader = null; 94 CallIdHeader callIdHeader = null;
95 - if(parentPlatform.getTransport().equals("TCP")) { 95 + if(parentPlatform.getTransport().equalsIgnoreCase("TCP")) {
96 callIdHeader = tcpSipProvider.getNewCallId(); 96 callIdHeader = tcpSipProvider.getNewCallId();
97 } 97 }
98 - if(parentPlatform.getTransport().equals("UDP")) { 98 + if(parentPlatform.getTransport().equalsIgnoreCase("UDP")) {
99 callIdHeader = udpSipProvider.getNewCallId(); 99 callIdHeader = udpSipProvider.getNewCallId();
100 } 100 }
101 101
@@ -119,7 +119,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -119,7 +119,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
119 }); 119 });
120 120
121 }else { 121 }else {
122 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 122 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
123 : udpSipProvider.getNewCallId(); 123 : udpSipProvider.getNewCallId();
124 request = headerProviderPlarformProvider.createRegisterRequest(parentPlatform, "FromRegister" + tm, null, callId, www, callIdHeader, isRegister); 124 request = headerProviderPlarformProvider.createRegisterRequest(parentPlatform, "FromRegister" + tm, null, callId, www, callIdHeader, isRegister);
125 } 125 }
@@ -152,7 +152,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -152,7 +152,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
152 keepaliveXml.append("<Status>OK</Status>\r\n"); 152 keepaliveXml.append("<Status>OK</Status>\r\n");
153 keepaliveXml.append("</Notify>\r\n"); 153 keepaliveXml.append("</Notify>\r\n");
154 154
155 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 155 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
156 : udpSipProvider.getNewCallId(); 156 : udpSipProvider.getNewCallId();
157 157
158 Request request = headerProviderPlarformProvider.createKeetpaliveMessageRequest( 158 Request request = headerProviderPlarformProvider.createKeetpaliveMessageRequest(
@@ -180,10 +180,10 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -180,10 +180,10 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
180 180
181 private void transmitRequest(ParentPlatform parentPlatform, Request request, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws SipException { 181 private void transmitRequest(ParentPlatform parentPlatform, Request request, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws SipException {
182 logger.debug("\n发送消息:\n{}", request); 182 logger.debug("\n发送消息:\n{}", request);
183 - if("TCP".equals(parentPlatform.getTransport())) { 183 + if("TCP".equalsIgnoreCase(parentPlatform.getTransport())) {
184 tcpSipProvider.sendRequest(request); 184 tcpSipProvider.sendRequest(request);
185 185
186 - } else if("UDP".equals(parentPlatform.getTransport())) { 186 + } else if("UDP".equalsIgnoreCase(parentPlatform.getTransport())) {
187 udpSipProvider.sendRequest(request); 187 udpSipProvider.sendRequest(request);
188 } 188 }
189 189
@@ -219,7 +219,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -219,7 +219,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
219 String catalogXml = getCatalogXml(channels, sn, parentPlatform, size); 219 String catalogXml = getCatalogXml(channels, sn, parentPlatform, size);
220 220
221 // callid 221 // callid
222 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 222 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
223 : udpSipProvider.getNewCallId(); 223 : udpSipProvider.getNewCallId();
224 224
225 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, catalogXml.toString(), fromTag, callIdHeader); 225 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, catalogXml.toString(), fromTag, callIdHeader);
@@ -305,7 +305,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -305,7 +305,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
305 } 305 }
306 String catalogXml = getCatalogXml(deviceChannels, sn, parentPlatform, channels.size()); 306 String catalogXml = getCatalogXml(deviceChannels, sn, parentPlatform, channels.size());
307 // callid 307 // callid
308 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 308 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
309 : udpSipProvider.getNewCallId(); 309 : udpSipProvider.getNewCallId();
310 310
311 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, catalogXml, fromTag, callIdHeader); 311 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, catalogXml, fromTag, callIdHeader);
@@ -345,7 +345,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -345,7 +345,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
345 deviceInfoXml.append("<Result>OK</Result>\r\n"); 345 deviceInfoXml.append("<Result>OK</Result>\r\n");
346 deviceInfoXml.append("</Response>\r\n"); 346 deviceInfoXml.append("</Response>\r\n");
347 347
348 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 348 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
349 : udpSipProvider.getNewCallId(); 349 : udpSipProvider.getNewCallId();
350 350
351 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, deviceInfoXml.toString(), fromTag, callIdHeader); 351 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, deviceInfoXml.toString(), fromTag, callIdHeader);
@@ -383,7 +383,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -383,7 +383,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
383 deviceStatusXml.append("<Status>OK</Status>\r\n"); 383 deviceStatusXml.append("<Status>OK</Status>\r\n");
384 deviceStatusXml.append("</Response>\r\n"); 384 deviceStatusXml.append("</Response>\r\n");
385 385
386 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 386 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
387 : udpSipProvider.getNewCallId(); 387 : udpSipProvider.getNewCallId();
388 388
389 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, deviceStatusXml.toString(), fromTag, callIdHeader); 389 Request request = headerProviderPlarformProvider.createMessageRequest(parentPlatform, deviceStatusXml.toString(), fromTag, callIdHeader);
@@ -421,7 +421,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -421,7 +421,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
421 deviceStatusXml.append("<Altitude>" + gpsMsgInfo.getAltitude() + "</Altitude>\r\n"); 421 deviceStatusXml.append("<Altitude>" + gpsMsgInfo.getAltitude() + "</Altitude>\r\n");
422 deviceStatusXml.append("</Notify>\r\n"); 422 deviceStatusXml.append("</Notify>\r\n");
423 423
424 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 424 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
425 : udpSipProvider.getNewCallId(); 425 : udpSipProvider.getNewCallId();
426 callIdHeader.setCallId(subscribeInfo.getCallId()); 426 callIdHeader.setCallId(subscribeInfo.getCallId());
427 427
@@ -466,7 +466,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -466,7 +466,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
466 deviceStatusXml.append("</info>\r\n"); 466 deviceStatusXml.append("</info>\r\n");
467 deviceStatusXml.append("</Notify>\r\n"); 467 deviceStatusXml.append("</Notify>\r\n");
468 468
469 - CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() 469 + CallIdHeader callIdHeader = parentPlatform.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
470 : udpSipProvider.getNewCallId(); 470 : udpSipProvider.getNewCallId();
471 471
472 String tm = Long.toString(System.currentTimeMillis()); 472 String tm = Long.toString(System.currentTimeMillis());
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
@@ -66,7 +66,7 @@ public abstract class SIPRequestProcessorParent { @@ -66,7 +66,7 @@ public abstract class SIPRequestProcessorParent {
66 boolean isTcp = false; 66 boolean isTcp = false;
67 ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME); 67 ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
68 String transport = reqViaHeader.getTransport(); 68 String transport = reqViaHeader.getTransport();
69 - if (transport.equals("TCP")) { 69 + if (transport.equalsIgnoreCase("TCP")) {
70 isTcp = true; 70 isTcp = true;
71 } 71 }
72 72
@@ -142,7 +142,7 @@ public abstract class SIPRequestProcessorParent { @@ -142,7 +142,7 @@ public abstract class SIPRequestProcessorParent {
142 return; 142 return;
143 } 143 }
144 serverTransaction.sendResponse(response); 144 serverTransaction.sendResponse(response);
145 - if (statusCode >= 200 && !"NOTIFY".equals(evt.getRequest().getMethod())) { 145 + if (statusCode >= 200 && !"NOTIFY".equalsIgnoreCase(evt.getRequest().getMethod())) {
146 146
147 if (serverTransaction.getDialog() != null) { 147 if (serverTransaction.getDialog() != null) {
148 serverTransaction.getDialog().delete(); 148 serverTransaction.getDialog().delete();
@@ -155,7 +155,7 @@ public abstract class SIPRequestProcessorParent { @@ -155,7 +155,7 @@ public abstract class SIPRequestProcessorParent {
155 response.setReasonPhrase(msg); 155 response.setReasonPhrase(msg);
156 ServerTransaction serverTransaction = getServerTransaction(evt); 156 ServerTransaction serverTransaction = getServerTransaction(evt);
157 serverTransaction.sendResponse(response); 157 serverTransaction.sendResponse(response);
158 - if (statusCode >= 200 && !"NOTIFY".equals(evt.getRequest().getMethod())) { 158 + if (statusCode >= 200 && !"NOTIFY".equalsIgnoreCase(evt.getRequest().getMethod())) {
159 if (serverTransaction.getDialog() != null) { 159 if (serverTransaction.getDialog() != null) {
160 serverTransaction.getDialog().delete(); 160 serverTransaction.getDialog().delete();
161 } 161 }
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -248,16 +248,16 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -248,16 +248,16 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
248 String protocol = media.getProtocol(); 248 String protocol = media.getProtocol();
249 249
250 // 区分TCP发流还是udp, 当前默认udp 250 // 区分TCP发流还是udp, 当前默认udp
251 - if ("TCP/RTP/AVP".equals(protocol)) { 251 + if ("TCP/RTP/AVP".equalsIgnoreCase(protocol)) {
252 String setup = mediaDescription.getAttribute("setup"); 252 String setup = mediaDescription.getAttribute("setup");
253 if (setup != null) { 253 if (setup != null) {
254 mediaTransmissionTCP = true; 254 mediaTransmissionTCP = true;
255 - if ("active".equals(setup)) { 255 + if ("active".equalsIgnoreCase(setup)) {
256 tcpActive = true; 256 tcpActive = true;
257 // 不支持tcp主动 257 // 不支持tcp主动
258 responseAck(evt, Response.NOT_IMPLEMENTED, "tcp active not support"); // 目录不支持点播 258 responseAck(evt, Response.NOT_IMPLEMENTED, "tcp active not support"); // 目录不支持点播
259 return; 259 return;
260 - } else if ("passive".equals(setup)) { 260 + } else if ("passive".equalsIgnoreCase(setup)) {
261 tcpActive = false; 261 tcpActive = false;
262 } 262 }
263 } 263 }
@@ -302,7 +302,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -302,7 +302,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
302 return; 302 return;
303 } 303 }
304 sendRtpItem.setCallId(callIdHeader.getCallId()); 304 sendRtpItem.setCallId(callIdHeader.getCallId());
305 - sendRtpItem.setPlayType("Play".equals(sessionName) ? InviteStreamType.PLAY : InviteStreamType.PLAYBACK); 305 + sendRtpItem.setPlayType("Play".equalsIgnoreCase(sessionName) ? InviteStreamType.PLAY : InviteStreamType.PLAYBACK);
306 306
307 Long finalStartTime = startTime; 307 Long finalStartTime = startTime;
308 Long finalStopTime = stopTime; 308 Long finalStopTime = stopTime;
@@ -321,7 +321,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -321,7 +321,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
321 content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItemInUSe.getSdpIp() + "\r\n"); 321 content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItemInUSe.getSdpIp() + "\r\n");
322 content.append("s=" + sessionName + "\r\n"); 322 content.append("s=" + sessionName + "\r\n");
323 content.append("c=IN IP4 " + mediaServerItemInUSe.getSdpIp() + "\r\n"); 323 content.append("c=IN IP4 " + mediaServerItemInUSe.getSdpIp() + "\r\n");
324 - if ("Playback".equals(sessionName)) { 324 + if ("Playback".equalsIgnoreCase(sessionName)) {
325 content.append("t=" + finalStartTime + " " + finalStopTime + "\r\n"); 325 content.append("t=" + finalStartTime + " " + finalStopTime + "\r\n");
326 } else { 326 } else {
327 content.append("t=0 0\r\n"); 327 content.append("t=0 0\r\n");
@@ -365,7 +365,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -365,7 +365,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
365 } 365 }
366 }); 366 });
367 sendRtpItem.setApp("rtp"); 367 sendRtpItem.setApp("rtp");
368 - if ("Playback".equals(sessionName)) { 368 + if ("Playback".equalsIgnoreCase(sessionName)) {
369 sendRtpItem.setPlayType(InviteStreamType.PLAYBACK); 369 sendRtpItem.setPlayType(InviteStreamType.PLAYBACK);
370 SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true, true); 370 SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true, true);
371 sendRtpItem.setStreamId(ssrcInfo.getStream()); 371 sendRtpItem.setStreamId(ssrcInfo.getStream());
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -159,7 +159,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen @@ -159,7 +159,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
159 // 判断TCP还是UDP 159 // 判断TCP还是UDP
160 ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME); 160 ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
161 String transport = reqViaHeader.getTransport(); 161 String transport = reqViaHeader.getTransport();
162 - device.setTransport("TCP".equals(transport) ? "TCP" : "UDP"); 162 + device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
163 } 163 }
164 164
165 sendResponse(evt, response); 165 sendResponse(evt, response);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -132,7 +132,7 @@ public class SubscribeRequestProcessor extends SIPRequestProcessorParent impleme @@ -132,7 +132,7 @@ public class SubscribeRequestProcessor extends SIPRequestProcessorParent impleme
132 return; 132 return;
133 } 133 }
134 if (evt.getServerTransaction() == null) { 134 if (evt.getServerTransaction() == null) {
135 - ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest()) 135 + ServerTransaction serverTransaction = "TCP".equalsIgnoreCase(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
136 : udpSipProvider.getNewServerTransaction(evt.getRequest()); 136 : udpSipProvider.getNewServerTransaction(evt.getRequest());
137 subscribeInfo.setTransaction(serverTransaction); 137 subscribeInfo.setTransaction(serverTransaction);
138 Dialog dialog = serverTransaction.getDialog(); 138 Dialog dialog = serverTransaction.getDialog();
@@ -188,7 +188,7 @@ public class SubscribeRequestProcessor extends SIPRequestProcessorParent impleme @@ -188,7 +188,7 @@ public class SubscribeRequestProcessor extends SIPRequestProcessorParent impleme
188 } 188 }
189 SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId); 189 SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
190 if (evt.getServerTransaction() == null) { 190 if (evt.getServerTransaction() == null) {
191 - ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest()) 191 + ServerTransaction serverTransaction = "TCP".equalsIgnoreCase(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
192 : udpSipProvider.getNewServerTransaction(evt.getRequest()); 192 : udpSipProvider.getNewServerTransaction(evt.getRequest());
193 subscribeInfo.setTransaction(serverTransaction); 193 subscribeInfo.setTransaction(serverTransaction);
194 Dialog dialog = serverTransaction.getDialog(); 194 Dialog dialog = serverTransaction.getDialog();
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
@@ -96,7 +96,7 @@ public class InfoRequestProcessor extends SIPRequestProcessorParent implements I @@ -96,7 +96,7 @@ public class InfoRequestProcessor extends SIPRequestProcessorParent implements I
96 ContentTypeHeader header = (ContentTypeHeader)evt.getRequest().getHeader(ContentTypeHeader.NAME); 96 ContentTypeHeader header = (ContentTypeHeader)evt.getRequest().getHeader(ContentTypeHeader.NAME);
97 String contentType = header.getContentType(); 97 String contentType = header.getContentType();
98 String contentSubType = header.getContentSubType(); 98 String contentSubType = header.getContentSubType();
99 - if ("Application".equals(contentType) && "MANSRTSP".equals(contentSubType)) { 99 + if ("Application".equalsIgnoreCase(contentType) && "MANSRTSP".equalsIgnoreCase(contentSubType)) {
100 SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, null, callIdHeader.getCallId()); 100 SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, null, callIdHeader.getCallId());
101 String streamId = sendRtpItem.getStreamId(); 101 String streamId = sendRtpItem.getStreamId();
102 StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null); 102 StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java
@@ -76,7 +76,7 @@ public class DeviceStatusResponseMessageHandler extends SIPRequestProcessorParen @@ -76,7 +76,7 @@ public class DeviceStatusResponseMessageHandler extends SIPRequestProcessorParen
76 logger.debug(json.toJSONString()); 76 logger.debug(json.toJSONString());
77 } 77 }
78 String text = onlineElement.getText(); 78 String text = onlineElement.getText();
79 - if (Objects.equals(text.trim().toUpperCase(), "ONLINE")) { 79 + if ("ONLINE".equalsIgnoreCase(text.trim())) {
80 deviceService.online(device); 80 deviceService.online(device);
81 }else { 81 }else {
82 deviceService.offline(device.getDeviceId()); 82 deviceService.offline(device.getDeviceId());
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
@@ -77,7 +77,7 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent @@ -77,7 +77,7 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
77 Element itemOne = itemListIterator.next(); 77 Element itemOne = itemListIterator.next();
78 String name = itemOne.getName(); 78 String name = itemOne.getName();
79 String textTrim = itemOne.getTextTrim(); 79 String textTrim = itemOne.getTextTrim();
80 - if("PresetID".equals(name)){ 80 + if("PresetID".equalsIgnoreCase(name)){
81 presetQuerySipReq.setPresetId(textTrim); 81 presetQuerySipReq.setPresetId(textTrim);
82 }else { 82 }else {
83 presetQuerySipReq.setPresetName(textTrim); 83 presetQuerySipReq.setPresetName(textTrim);