Pre Merge pull request !34 from WangXuewen/master

web/src/views/common/jessibuca.vue

@@ -54,12 +54,10 @@ export default {
     }
   },
   created() {
-    if (this.$route.params.url) {
+    const paramUrl = decodeURIComponent(this.$route.params.url)
-      const paramUrl = decodeURIComponent(this.$route.params.url)
+    console.log(paramUrl)
-      console.log(paramUrl)
+    if (!this.videoUrl && paramUrl) {
-      if (!this.videoUrl) {
+      this.videoUrl = paramUrl
-        this.videoUrl = paramUrl
-      }
     }
     this.btnDom = document.getElementById('buttonsBox')
   },
@@ -219,10 +217,6 @@ 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,9 +44,6 @@ export default {
   },
   methods: {
     getMediaInfo: function() {
-      if (!this.app || !this.stream || !this.mediaServerId) {
-        return
-      }
       this.$store.dispatch('server/getMediaInfo', {
         app: this.app,
         stream: this.stream,
@@ -55,7 +52,6 @@ export default {
         .then(data => {
           this.info = data
         })
-        .catch(() => {})
     },
     startTask: function() {
       this.task = setInterval(this.getMediaInfo, 1000)

web/src/views/dialog/devicePlayer.vue

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