guzijian / wvp-GB28181-pro · Commits

Commit 8a00a036c43697d7447dbd238e5500bd8e4c6175

Authored by lawrencehj
1 parent a71063dd

优化代码

Inline Side-by-side
Showing 2 changed files with 9 additions and 23 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
  View file @8a00a03
... ... @@ -4,7 +4,10 @@ import java.util.HashMap;
4 4 import java.util.Map;
5 5  
6 6 import javax.sip.*;
7   -//import javax.sip.message.Request;
  7 +import javax.sip.address.SipURI;
  8 +import javax.sip.header.FromHeader;
  9 +import javax.sip.header.HeaderAddress;
  10 +import javax.sip.header.ToHeader;
8 11  
9 12 import com.genersoft.iot.vmp.common.StreamInfo;
10 13 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
... ... @@ -12,14 +15,11 @@ import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcesso
12 15 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
13 16 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
14 17  
15   -import org.springframework.stereotype.Component;
16   -
17 18 /**
18 19 * @Description:ACK请求处理器
19 20 * @author: swwheihei
20 21 * @date: 2020年5月3日 下午5:31:45
21 22 */
22   -@Component
23 23 public class AckRequestProcessor extends SIPRequestAbstractProcessor {
24 24  
25 25 private IRedisCatchStorage redisCatchStorage;
... ... @@ -38,10 +38,8 @@ public class AckRequestProcessor extends SIPRequestAbstractProcessor {
38 38 if (dialog == null) return;
39 39 //DialogState state = dialog.getState();
40 40 if (/*request.getMethod().equals(Request.INVITE) &&*/ dialog.getState()== DialogState.CONFIRMED) {
41   - String remoteUri = dialog.getRemoteParty().getURI().toString();
42   - String localUri = dialog.getLocalParty().getURI().toString();
43   - String platformGbId = remoteUri.substring(remoteUri.indexOf(":") + 1, remoteUri.indexOf("@"));
44   - String channelId = localUri.substring(remoteUri.indexOf(":") + 1, remoteUri.indexOf("@"));
  41 + String platformGbId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
  42 + String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
45 43 SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId);
46 44 String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
47 45 String deviceId = sendRtpItem.getDeviceId();
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java
  View file @8a00a03
... ... @@ -75,20 +75,6 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
75 75 SipURI sipURI = (SipURI) request.getRequestURI();
76 76 String channelId = sipURI.getUser();
77 77 String platformId = null;
78   -// SubjectHeader subjectHeader = (SubjectHeader)request.getHeader(SubjectHeader.NAME);
79   -// // 查询通道是否存在 不存在回复404
80   -// if (subjectHeader != null) { // 存在则从subjectHeader 获取平台信息
81   -// String subject = subjectHeader.getSubject();
82   -// if (subject != null) {
83   -// String[] info1 = subject.split(",");
84   -// if (info1 != null && info1 .length == 2) {
85   -// String[] info2 = info1[1].split(":");
86   -// if (info2 != null && info2.length == 2) {
87   -// platformId = info2[0];
88   -// }
89   -// }
90   -// }
91   -// }
92 78  
93 79 FromHeader fromHeader = (FromHeader)request.getHeader(FromHeader.NAME);
94 80 AddressImpl address = (AddressImpl) fromHeader.getAddress();
... ... @@ -224,7 +210,9 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
224 210 e.printStackTrace();
225 211 }
226 212 }));
227   - playResult.getResult();
  213 + if (logger.isDebugEnabled()) {
  214 + logger.debug(playResult.getResult().toString());
  215 + }
228 216  
229 217 } catch (SipException | InvalidArgumentException | ParseException e) {
230 218 e.printStackTrace();
... ...