From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java | 67 ---------------------------------
1 files changed, 1 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
index 43e2690..1c2e611 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
@@ -68,9 +68,6 @@
toHeader, viaHeaders, maxForwards);
List<String> agentParam = new ArrayList<>();
- agentParam.add("wvp-pro");
- UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
- request.addHeader(userAgentHeader);
ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
request.setContent(content, contentTypeHeader);
@@ -115,10 +112,6 @@
ExpiresHeader expires = sipFactory.createHeaderFactory().createExpiresHeader(Integer.parseInt(platform.getExpires()));
request.addHeader(expires);
- List<String> agentParam = new ArrayList<>();
- agentParam.add("wvp-pro");
- UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
- request.addHeader(userAgentHeader);
return request;
}
@@ -223,70 +216,12 @@
CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(Request.MESSAGE), Request.MESSAGE);
MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipFactory.createMessageFactory();
// 璁剧疆缂栫爜锛� 闃叉涓枃涔辩爜
- messageFactory.setDefaultContentEncodingCharset("gb2312");
+ messageFactory.setDefaultContentEncodingCharset(parentPlatform.getCharacterSet());
request = messageFactory.createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,
toHeader, viaHeaders, maxForwards);
- List<String> agentParam = new ArrayList<>();
- agentParam.add("wvp-pro");
- UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
- request.addHeader(userAgentHeader);
ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
request.setContent(content, contentTypeHeader);
return request;
}
-
-// public Request createNotifyRequest(ParentPlatform parentPlatform, String content, CallIdHeader callIdHeader, String viaTag, String fromTag, SubscribeInfo subscribeInfo) throws PeerUnavailableException, ParseException, InvalidArgumentException {
-// Request request = null;
-// // sipuri
-// SipURI requestURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerIP()+ ":" + parentPlatform.getServerPort());
-// // via
-// ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
-// ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(parentPlatform.getDeviceIp(), Integer.parseInt(parentPlatform.getDevicePort()),
-// parentPlatform.getTransport(), viaTag);
-// viaHeader.setRPort();
-// viaHeaders.add(viaHeader);
-// // from
-// SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getDeviceGBId(),
-// parentPlatform.getDeviceIp() + ":" + parentPlatform.getDevicePort());
-// Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI);
-// FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag);
-// // to
-// SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerGBDomain());
-// Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI);
-// ToHeader toHeader = sipFactory.createHeaderFactory().createToHeader(toAddress, subscribeInfo.getFromTag());
-//
-// // Forwards
-// MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);
-// // ceq
-// CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(redisCatchStorage.getCSEQ(Request.NOTIFY), Request.NOTIFY);
-// MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipFactory.createMessageFactory();
-// // 璁剧疆缂栫爜锛� 闃叉涓枃涔辩爜
-// messageFactory.setDefaultContentEncodingCharset("gb2312");
-// request = messageFactory.createRequest(requestURI, Request.NOTIFY, callIdHeader, cSeqHeader, fromHeader,
-// toHeader, viaHeaders, maxForwards);
-// List<String> agentParam = new ArrayList<>();
-// agentParam.add("wvp-pro");
-// UserAgentHeader userAgentHeader = sipFactory.createHeaderFactory().createUserAgentHeader(agentParam);
-// request.addHeader(userAgentHeader);
-//
-// EventHeader event = sipFactory.createHeaderFactory().createEventHeader(subscribeInfo.getEventType());
-// if (subscribeInfo.getEventId() != null) {
-// event.setEventId(subscribeInfo.getEventId());
-// }
-//
-// request.addHeader(event);
-//
-// SubscriptionStateHeader active = sipFactory.createHeaderFactory().createSubscriptionStateHeader("active");
-// request.setHeader(active);
-//
-// String sipAddress = sipConfig.getIp() + ":" + sipConfig.getPort();
-// Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory()
-// .createSipURI(parentPlatform.getDeviceGBId(), sipAddress));
-// request.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));
-//
-// ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
-// request.setContent(content, contentTypeHeader);
-// return request;
-// }
}
--
Gitblit v1.8.0