Commit a683d9f6763cbe7a36dc36dd09502ce2a595f937
1 parent
2d8054be
关闭播放窗口停止回放
回滚回放代码
Showing
2 changed files
with
8 additions
and
7 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
| @@ -409,12 +409,7 @@ public class SIPCommander implements ISIPCommander { | @@ -409,12 +409,7 @@ public class SIPCommander implements ISIPCommander { | ||
| 409 | try { | 409 | try { |
| 410 | MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); | 410 | MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); |
| 411 | String ssrc = streamSession.createPlayBackSsrc(); | 411 | String ssrc = streamSession.createPlayBackSsrc(); |
| 412 | - String streamId = null; | ||
| 413 | - if (rtpEnable) { | ||
| 414 | - streamId = String.format("gb_playback_%s_%s", device.getDeviceId(), channelId); | ||
| 415 | - }else { | ||
| 416 | - streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase(); | ||
| 417 | - } | 412 | + String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase(); |
| 418 | // 添加订阅 | 413 | // 添加订阅 |
| 419 | JSONObject subscribeKey = new JSONObject(); | 414 | JSONObject subscribeKey = new JSONObject(); |
| 420 | subscribeKey.put("app", "rtp"); | 415 | subscribeKey.put("app", "rtp"); |
web_src/src/components/gb28181/devicePlayer.vue
| @@ -183,7 +183,8 @@ export default { | @@ -183,7 +183,8 @@ export default { | ||
| 183 | scanGroup: 0, | 183 | scanGroup: 0, |
| 184 | tracks: [], | 184 | tracks: [], |
| 185 | coverPlaying:false, | 185 | coverPlaying:false, |
| 186 | - tracksLoading: false | 186 | + tracksLoading: false, |
| 187 | + recordPlay: "" | ||
| 187 | }; | 188 | }; |
| 188 | }, | 189 | }, |
| 189 | methods: { | 190 | methods: { |
| @@ -318,6 +319,10 @@ export default { | @@ -318,6 +319,10 @@ export default { | ||
| 318 | this.convertStop(); | 319 | this.convertStop(); |
| 319 | } | 320 | } |
| 320 | this.convertKey = '' | 321 | this.convertKey = '' |
| 322 | + if (this.recordPlay != '') { | ||
| 323 | + this.stopPlayRecord(); | ||
| 324 | + } | ||
| 325 | + this.recordPlay = '' | ||
| 321 | }, | 326 | }, |
| 322 | 327 | ||
| 323 | copySharedInfo: function (data) { | 328 | copySharedInfo: function (data) { |
| @@ -384,6 +389,7 @@ export default { | @@ -384,6 +389,7 @@ export default { | ||
| 384 | var streamInfo = res.data; | 389 | var streamInfo = res.data; |
| 385 | that.streamId = streamInfo.streamId; | 390 | that.streamId = streamInfo.streamId; |
| 386 | that.videoUrl = streamInfo.ws_flv; | 391 | that.videoUrl = streamInfo.ws_flv; |
| 392 | + that.recordPlay = true; | ||
| 387 | }); | 393 | }); |
| 388 | } | 394 | } |
| 389 | }, | 395 | }, |