Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from lawrencehj/wvp-28181-2.0 

解决非默认端口无法Send Bye的问题
pull/38/head
648540858 2021-01-12 14:09:12 +08:00 committed by GitHub
parent d8635682bb 5257c7c9f4
commit 9de1bef821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -409,12 +409,7 @@ public class SIPCommander implements ISIPCommander {
try { try {
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String ssrc = streamSession.createPlayBackSsrc(); String ssrc = streamSession.createPlayBackSsrc();
String streamId = null; String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
if (rtpEnable) {
streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId);
}else {
streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
}
// 添加订阅 // 添加订阅
JSONObject subscribeKey = new JSONObject(); JSONObject subscribeKey = new JSONObject();
subscribeKey.put("app", "rtp"); subscribeKey.put("app", "rtp");
@ -531,7 +526,10 @@ public class SIPCommander implements ISIPCommander {
Pattern p = Pattern.compile("(\\d+\\.\\d+\\.\\d+\\.\\d+)\\:(\\d+)"); Pattern p = Pattern.compile("(\\d+\\.\\d+\\.\\d+\\.\\d+)\\:(\\d+)");
Matcher matcher = p.matcher(vh); Matcher matcher = p.matcher(vh);
if (matcher.find()) { if (matcher.find()) {
byeURI.setHost(matcher.group(1)); String ip = matcher.group(1);
byeURI.setHost(ip);
String port = matcher.group(2);
byeURI.setPort(Integer.parseInt(port));
} }
ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME); ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);
String protocol = viaHeader.getTransport().toUpperCase(); String protocol = viaHeader.getTransport().toUpperCase();

4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
View File

@ -342,7 +342,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
try { try {
// 回复200 OK // 回复200 OK
responseAck(evt); responseAck(evt);
String seqNo = String.valueOf(System.currentTimeMillis()); String uuid = UUID.randomUUID().toString().replace("-", "");
RecordInfo recordInfo = new RecordInfo(); RecordInfo recordInfo = new RecordInfo();
Element rootElement = getRootElement(evt); Element rootElement = getRootElement(evt);
Element deviceIdElement = rootElement.element("DeviceID"); Element deviceIdElement = rootElement.element("DeviceID");
@ -398,7 +398,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
// 为防止连续请求该设备的录像数据，返回数据错乱，特增加sn进行区分 // 为防止连续请求该设备的录像数据，返回数据错乱，特增加sn进行区分
String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn; String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn;
redis.set(cacheKey + "_" + seqNo, recordList, 90); redis.set(cacheKey + "_" + uuid, recordList, 90);
List<Object> cacheKeys = redis.scan(cacheKey + "_*"); List<Object> cacheKeys = redis.scan(cacheKey + "_*");
List<RecordItem> totalRecordList = new ArrayList<RecordItem>(); List<RecordItem> totalRecordList = new ArrayList<RecordItem>();
for (int i = 0; i < cacheKeys.size(); i++) { for (int i = 0; i < cacheKeys.size(); i++) {

8
web_src/src/components/gb28181/devicePlayer.vue
View File

@ -183,7 +183,8 @@ export default {
scanGroup: 0, scanGroup: 0,
tracks: [], tracks: [],
coverPlaying:false, coverPlaying:false,
tracksLoading: false tracksLoading: false,
recordPlay: ""
}; };
}, },
methods: { methods: {
@ -318,6 +319,10 @@ export default {
this.convertStop(); this.convertStop();
} }
this.convertKey = '' this.convertKey = ''
if (this.recordPlay != '') {
this.stopPlayRecord();
}
this.recordPlay = ''
}, },
copySharedInfo: function (data) { copySharedInfo: function (data) {
@ -384,6 +389,7 @@ export default {
var streamInfo = res.data; var streamInfo = res.data;
that.streamId = streamInfo.streamId; that.streamId = streamInfo.streamId;
that.videoUrl = streamInfo.ws_flv; that.videoUrl = streamInfo.ws_flv;
that.recordPlay = true;
}); });
} }
}, },