😶 白天写BUG, 晚上改BUG

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "1.0.12",
+  "version": "1.0.16",
   "private": true,
   "author": {
     "name": "Hunlongyu",
@@ -16,7 +16,8 @@
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
     "electron:generate-icons": "electron-icon-builder --input=./public/icon.png --output=build --flatten",
-    "release": "vue-cli-service electron:build -p always"
+    "release": "vue-cli-service electron:build -p always",
+    "dist": "vue-cli-service electron:build --win --ia32"
   },
   "main": "background.js",
   "dependencies": {

src/components/Detail.vue

@@ -299,7 +299,7 @@ export default {
       top: 50px;
       left: 0;
       width: 100%;
-      height: calc(100 - 50px);
+      height: calc(100% - 50px);
       display: flex;
       justify-content: center;
       align-items: center;

src/components/Play.vue

@@ -201,64 +201,71 @@ export default {
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
     getUrls () {
+      this.name = ''
       this.mask = true
       if (this.timer !== null) {
         clearInterval(this.timer)
         this.timer = null
       }
+
       if (this.xg) {
-        this.xg.pause()
+        if (this.xg.hasStart) {
+          this.xg.pause()
+        }
       }
-      this.changeVideo()
+
+      const index = this.video.index
+      let time = 0
+
       history.find({ detail: this.video.detail }).then(item => {
-        let index = 1
-        let time = 0
         if (item) {
-          index = item.index
-          if (this.video.index === index) {
+          if (item.index === index) {
             time = item.currentTime
           }
         }
-        tools.detail_get(this.video.site, this.video.detail).then(res => {
-          this.name = this.video.name
-          this.right.listData = res.m3u8_urls
+        this.playVideo(index, time)
+      })
+    },
+    playVideo (index, time) {
+      tools.detail_get(this.video.site, this.video.detail).then(res => {
+        console.log(res, 'res paly video')
+        this.name = res.name
+        this.right.listData = res.m3u8_urls
 
-          const m = res.m3u8_urls
-          const arr = []
-          for (const i of m) {
-            arr.push(i.split('$')[1])
-          }
-          this.length = arr.length
-          this.xg.src = arr[index]
-          this.showNext = this.length > 1
+        const m = res.m3u8_urls
+        const arr = []
+        for (const i of m) {
+          arr.push(i.split('$')[1])
+        }
+        this.length = arr.length
+        console.log(index, 'play index')
+        this.xg.src = arr[index]
+        this.showNext = this.length > 1
 
-          const currentTime = time
-          if (currentTime !== 0) {
-            this.xg.play()
-            this.xg.once('playing', () => {
-              this.xg.currentTime = currentTime
-            })
-          } else {
-            this.xg.play()
+        if (time !== 0) {
+          this.xg.play()
+          this.xg.once('playing', () => {
+            this.xg.currentTime = time
+          })
+        } else {
+          this.xg.play()
+        }
+        this.xg.once('play', () => {
+          this.mask = false
+        })
+        this.onPlayVideo()
+        this.xg.once('ended', () => {
+          if (res.m3u8_urls.length > 1 && (res.m3u8_urls.length - 1 > this.video.index)) {
+            this.video.currentTime = 0
+            this.video.index++
           }
-          this.xg.once('play', () => {
-            this.mask = false
-          })
-          this.onPlayVideo()
-          this.xg.once('ended', () => {
-            if (res.m3u8_urls.length > 1 && (res.m3u8_urls.length - 1 > this.video.index)) {
-              this.video.currentTime = 0
-              this.video.index++
-            }
-            this.xg.off('ended')
-          })
+          this.xg.off('ended')
         })
       })
     },
     changeVideo () {
       this.checkStar()
       this.checkTop()
-      this.name = ''
     },
     checkStar () {
       video.find({ detail: this.video.detail }).then(res => {
@@ -277,6 +284,7 @@ export default {
     },
     onPlayVideo () {
       this.more = true
+      this.changeVideo()
       const h = { ...this.video }
       history.find({ detail: h.detail }).then(res => {
         if (res) {
@@ -315,21 +323,17 @@ export default {
       this.right.type = ''
     },
     nextEvent () {
-      const v = { ...this.video }
-      const i = v.index + 1
-      if (i < this.right.listData.length) {
-        this.video.currentTime = 0
+      if (this.video.index < this.right.listData.length - 1) {
         this.video.index++
+        this.video.currentTime = 0
       } else {
         this.$m.warning(this.$t('last_video'))
       }
     },
     prevEvent () {
-      const v = { ...this.video }
-      const i = v.index - 1
-      if (i > 0) {
-        this.video.currentTime = 0
+      if (this.video.index > 0) {
         this.video.index--
+        this.video.currentTime = 0
       } else {
         this.$m.warning(this.$t('first_video'))
       }
@@ -407,10 +411,16 @@ export default {
       })
     },
     listItemEvent (n) {
-      this.video.currentTime = 0
-      this.video.index = n
-      this.right.show = false
-      this.right.type = ''
+      history.find({ detail: this.video.detail }).then(item => {
+        if (item) {
+          item.currentTime = 0
+          item.index = n
+          history.update(item.id, item)
+        }
+        this.video.index = n
+        this.right.show = false
+        this.right.type = ''
+      })
     },
     historyItemEvent (e) {
       this.video = e

src/lib/cloud/index.js

@@ -22,6 +22,7 @@ macaddress.one((err, mac) => {
       const zyPlayer = new ZYPlayer()
       zyPlayer.set('os', system)
       zyPlayer.set('mac', mac)
+      zyPlayer.set('times', 1)
       zyPlayer.save()
       return false
     }