reghao 1 год назад
Родитель
Сommit
f393090261
3 измененных файлов с 11 добавлено и 10 удалено
  1. 9 4
      src/components/VideoPlayer.vue
  2. 0 5
      src/views/disk/FileAudio.vue
  3. 2 1
      src/views/home/AudioPage.vue

+ 9 - 4
src/components/VideoPlayer.vue

@@ -117,7 +117,8 @@ export default {
       player.on('progress', function() {
       player.on('progress', function() {
         if (event) {
         if (event) {
           const payload = {}
           const payload = {}
-          payload.videoId = videoId
+          payload.mediaId = videoId
+          payload.mediaType = 1
           payload.currentTime = player.video.currentTime
           payload.currentTime = player.video.currentTime
           payload.ended = false
           payload.ended = false
 
 
@@ -131,13 +132,15 @@ export default {
       player.on('ended', () => {
       player.on('ended', () => {
         if (event) {
         if (event) {
           const payload = {}
           const payload = {}
-          payload.videoId = videoId
+          payload.mediaId = videoId
+          payload.mediaType = 1
           payload.currentTime = player.video.currentTime
           payload.currentTime = player.video.currentTime
           payload.ended = true
           payload.ended = true
 
 
           const jsonData = {}
           const jsonData = {}
           jsonData.event = 'progress'
           jsonData.event = 'progress'
           jsonData.payload = JSON.stringify(payload)
           jsonData.payload = JSON.stringify(payload)
+          console.log(jsonData)
           SocketInstance.send(jsonData)
           SocketInstance.send(jsonData)
         }
         }
       })
       })
@@ -180,7 +183,8 @@ export default {
       player.on('progress', function() {
       player.on('progress', function() {
         if (event) {
         if (event) {
           const payload = {}
           const payload = {}
-          payload.videoId = videoId
+          payload.mediaId = videoId
+          payload.mediaType = 1
           payload.currentTime = player.video.currentTime
           payload.currentTime = player.video.currentTime
           payload.ended = false
           payload.ended = false
 
 
@@ -194,7 +198,8 @@ export default {
       player.on('ended', () => {
       player.on('ended', () => {
         if (event) {
         if (event) {
           const payload = {}
           const payload = {}
-          payload.videoId = videoId
+          payload.mediaId = videoId
+          payload.mediaType = 1
           payload.currentTime = player.video.currentTime
           payload.currentTime = player.video.currentTime
           payload.ended = true
           payload.ended = true
 
 

+ 0 - 5
src/views/disk/FileAudio.vue

@@ -87,7 +87,6 @@ export default {
     },
     },
     // 播放前做的事
     // 播放前做的事
     handleBeforePlay(next) {
     handleBeforePlay(next) {
-      // this.$refs.audioPlayer.$refs.audio.currentTime = this.audioInfo.currentTime
       next()
       next()
     },
     },
     handlePlaySpecify() {
     handlePlaySpecify() {
@@ -100,10 +99,6 @@ export default {
       })
       })
     },
     },
     onPlaying() {
     onPlaying() {
-      /* const jsonData = {}
-      jsonData.videoId = this.audioInfo.audioId
-      jsonData.currentTime = this.$refs.audioPlayer.$refs.audio.currentTime
-      SocketInstance.send(jsonData)*/
     },
     },
     onProgressMove(event) {
     onProgressMove(event) {
     },
     },

+ 2 - 1
src/views/home/AudioPage.vue

@@ -124,7 +124,8 @@ export default {
     },
     },
     onPlaying() {
     onPlaying() {
       const jsonData = {}
       const jsonData = {}
-      jsonData.videoId = this.audioInfo.audioId
+      jsonData.mediaId = this.audioInfo.audioId
+      jsonData.mediaType = 2
       jsonData.currentTime = this.$refs.audioPlayer.$refs.audio.currentTime
       jsonData.currentTime = this.$refs.audioPlayer.$refs.audio.currentTime
       SocketInstance.send(jsonData)
       SocketInstance.send(jsonData)
     },
     },