Pre Merge pull request !42 from 樊冲/fix-bug-fanchong

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -222,7 +222,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                         if (sendRtpItem.isTcpActive()) {
                             MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
                             try {
-                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5);
+                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5*1000);
                                 DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(sendRtpItem.getChannelId());
                                 if (deviceChannel != null) {
                                     redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, deviceChannel, platform);

web/src/views/common/jessibuca.vue

@@ -54,10 +54,12 @@ export default {
     }
   },
   created() {
-    const paramUrl = decodeURIComponent(this.$route.params.url)
-    console.log(paramUrl)
-    if (!this.videoUrl && paramUrl) {
-      this.videoUrl = paramUrl
+    if (this.$route.params.url) {
+      const paramUrl = decodeURIComponent(this.$route.params.url)
+      console.log(paramUrl)
+      if (!this.videoUrl) {
+        this.videoUrl = paramUrl
+      }
     }
     this.btnDom = document.getElementById('buttonsBox')
   },
@@ -217,6 +219,10 @@ export default {
       this.play(this.videoUrl)
     },
     play: function(url) {
+      if (!url) {
+        console.warn('Jessibuca -> invalid url, skip play')
+        return
+      }
       this.videoUrl = url
       console.log('Jessibuca -> url: ', url)
       if (!jessibucaPlayer[this._uid]) {

web/src/views/common/mediaInfo.vue

@@ -44,6 +44,9 @@ export default {
   },
   methods: {
     getMediaInfo: function() {
+      if (!this.app || !this.stream || !this.mediaServerId) {
+        return
+      }
       this.$store.dispatch('server/getMediaInfo', {
         app: this.app,
         stream: this.stream,
@@ -52,6 +55,7 @@ export default {
         .then(data => {
           this.info = data
         })
+        .catch(() => {})
     },
     startTask: function() {
       this.task = setInterval(this.getMediaInfo, 1000)

web/src/views/dialog/devicePlayer.vue

@@ -473,10 +473,13 @@ export default {
       this.mediaServerId = streamInfo.mediaServerId
       this.playFromStreamInfo(false, streamInfo)
     },
-    getUrlByStreamInfo() {
-      let streamInfo = this.streamInfo
-      if (this.streamInfo.transcodeStream) {
-        streamInfo = this.streamInfo.transcodeStream
+    getUrlByStreamInfo(streamInfo) {
+      streamInfo = streamInfo || this.streamInfo
+      if (!streamInfo) {
+        return ''
+      }
+      if (streamInfo.transcodeStream) {
+        streamInfo = streamInfo.transcodeStream
       }
       let videoUrl
       if (location.protocol === 'https:') {