🥱 尝试x86

.github/workflows/x86.yml

@@ -0,0 +1,27 @@
+name: release-build
+
+on:
+  push:
+    tags:
+      - x86
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - run: |
+          yarn
+          yarn dist
+        shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -24,40 +24,41 @@
 
 ## ZY Player 资源播放器
 
-1. 全平台支持. windows, mac, linux.
-2. 12个视频源. 未来更新更多的视频源.
-3. 新增历史播放记录, 并记录播放进度.
-4. 新增分享功能. 一键分享海报图片.
-5. 新增精简模式. 支持修改透明度.
-6. 全新布局配色.
-7. 新增多语言.
-8. 下载功能 (最大资源网和OK资源网支持下载.)
-9. 更详细的视频分类
-10. 收藏夹同步更新视频追剧.(手动更新)
-11. 后台自动更新
+1. 全平台支持. Windows, Mac, Linux
+2. 12个视频源. 未来更新更多的视频源
+3. 新增历史播放记录, 并记录播放进度
+4. 新增分享功能. 一键分享海报图片
+5. 新增精简模式. 支持修改透明度
+6. 收藏夹同步更新视频追剧
+7. 支持演员名称搜索
+8. 更详细的视频分类
+9. 后台自动更新
+10. 全新布局配色
+11. 新增多语言
 12. 全局快捷键
-13. 支持演员名称搜索
+13. 下载功能
 14. ...
 
 觉得软件不错的, 点击右上角 star 收藏关注一波呀~
 
+> Tips: 资源加载不出来时, 点击列表下方链接, 浏览器打开一下网站. 原理是需要通过网站的人机检测.
+
 #### 全局快捷键:
 
 |          快捷键          | 说明       | 主界面 | 小窗口 |
 | :----------------------: | ---------- | :----: | :----: |
-| `⌘ + ➡`  或  `Ctrl + ➡` | 下一集     |   √    |   √    |
-| `⌘ + ⬅`  或  `Ctrl + ⬅` | 上一集     |   √    |   √    |
-| `⌘ + ⬆`  或  `Ctrl + ⬆` | 减少透明度 |        |   √    |
-| `⌘ + ⬇`  或  `Ctrl + ⬇` | 增加透明度 |        |   √    |
-| `Shift + ⬆` | 减少透明度 |    √    |   √    |
-| `Shift + ⬇` | 增加透明度 |    √    |   √    |
-
+| `⌘ + →`  或  `Ctrl + →` | 下一集     |   √    |   √    |
+| `⌘ + ←`  或  `Ctrl + ←` | 上一集     |   √    |   √    |
+| `⌘ + ↑`  或  `Ctrl + ↑` | 减少透明度 |        |   √    |
+| `⌘ + ↓`  或  `Ctrl + ↓` | 增加透明度 |        |   √    |
+| `Shift + ↑` | 增加倍速 + 0.25 |    √    |   √    |
+| `Shift + ↓` | 减少倍速 - 0.25 |    √    |   √    |
 
 #### 下载:
 
-1. [Github -- 官方下载](https://github.com/Hunlongyu/ZY-Player/releases)
+1. [Github -- 官方下载(最新版)](https://github.com/Hunlongyu/ZY-Player/releases)
 
-2. [蓝奏云 -- 快速下载](https://www.lanzous.com/b04s6a3re) 密码:95px
+2. [蓝奏云 -- 快速下载(老版本)](https://www.lanzous.com/b04s6a3re) 密码:95px
 
 #### 截图: 
 1. 浏览 ⇣ ↓

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "1.0.10",
+  "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/assets/scss/style.scss

@@ -151,6 +151,9 @@
       padding-left: 10px;
       font-size: 12px;
     }
+    .btn{
+      cursor: pointer;
+    }
   }
 }
 

src/background.js

@@ -76,6 +76,9 @@ function createMini () {
 
 app.allowRendererProcessReuse = true
 app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
+if (process.platform === 'Linux') {
+  app.disableHardwareAcceleration()
+}
 
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {

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/Film.vue

@@ -69,6 +69,7 @@
         </div>
         <div class="tFooter">
           <span class="tFooter-span">今日更新: {{ tb.update }} 条</span>
+          <span class="tFooter-span btn" @click="goWebsite">加载不出来,点这里</span>
           <el-pagination small :page-size="tb.size" :total="tb.total" :current-page="tb.page" @current-change="tbPageChange" layout="total, prev, pager, next, jumper"></el-pagination>
         </div>
       </div>
@@ -81,6 +82,7 @@ import { sites, getSite } from '../lib/site/sites'
 import tools from '../lib/site/tools'
 import video from '../lib/dexie/video'
 import setting from '../lib/dexie/setting'
+import { shell } from 'electron'
 const { clipboard } = require('electron')
 export default {
   name: 'film',
@@ -297,6 +299,9 @@ export default {
         this.tb.list = res.list
         this.tb.loading = false
       })
+    },
+    goWebsite () {
+      shell.openExternal(this.site.url)
     }
   },
   created () {

src/components/Play.vue

@@ -201,39 +201,51 @@ 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()
-      }
-      this.changeVideo()
-      tools.detail_get(this.video.site, this.video.detail).then(res => {
-        this.name = this.video.name
-        this.right.listData = res.m3u8_urls
-        if (res.m3u8_urls.length > 1) {
-          const m3 = res.m3u8_urls
-          const arr = []
-          for (const i of m3) {
-            arr.push(i.split('$')[1])
-          }
-          this.length = arr.length
-          this.xg.src = arr[this.video.index]
-          this.showNext = true
-        } else {
-          const link = res.m3u8_urls[this.video.index]
-          const src = link.split('$')[1]
-          this.length = 1
-          this.xg.src = src
-          this.showNext = false
+        if (this.xg.hasStart) {
+          this.xg.pause()
         }
-        const currentTime = this.video.currentTime
-        if (currentTime !== '') {
+      }
+
+      const index = this.video.index
+      let time = 0
+
+      history.find({ detail: this.video.detail }).then(item => {
+        if (item) {
+          if (item.index === index) {
+            time = item.currentTime
+          }
+        }
+        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
+        console.log(index, 'play index')
+        this.xg.src = arr[index]
+        this.showNext = this.length > 1
+
+        if (time !== 0) {
           this.xg.play()
           this.xg.once('playing', () => {
-            this.xg.currentTime = currentTime
+            this.xg.currentTime = time
           })
         } else {
           this.xg.play()
@@ -254,7 +266,6 @@ export default {
     changeVideo () {
       this.checkStar()
       this.checkTop()
-      this.name = ''
     },
     checkStar () {
       video.find({ detail: this.video.detail }).then(res => {
@@ -273,6 +284,7 @@ export default {
     },
     onPlayVideo () {
       this.more = true
+      this.changeVideo()
       const h = { ...this.video }
       history.find({ detail: h.detail }).then(res => {
         if (res) {
@@ -296,6 +308,14 @@ export default {
             history.update(res.id, h)
           }
         })
+        video.find({ detail: d }).then(res => {
+          if (res) {
+            const h = { ...this.video }
+            delete h.id
+            delete h.currentTime
+            video.update(res.id, h)
+          }
+        })
       }, 10000)
     },
     closeEvent () {
@@ -303,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'))
       }
@@ -395,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

@@ -1,32 +1,44 @@
-import setting from '../dexie/setting'
-
 const os = require('os')
-const macadress = require('macaddress')
+const macaddress = require('macaddress')
 const AV = require('leancloud-storage')
 
-setting.find().then(res => {
-  const cloud = res.cloud
-  if (!cloud) {
-    macadress.one((err, mac) => {
-      if (err) {
-        return false
-      }
-      const system = os.hostname() + ' ' + os.type() + ' ' + os.arch()
-      AV.init({
-        appId: 'X6TRIcMjgOG7EJ0t1l5r9In1-gzGzoHsz',
-        appKey: 'JmkGF9UqkWGQNYDcJ2g1QV1b',
-        serverURL: 'https://x6tricmj.lc-cn-n1-shared.com'
-      })
+macaddress.one((err, mac) => {
+  if (err) {
+    return false
+  }
+  AV.init({
+    appId: 'X6TRIcMjgOG7EJ0t1l5r9In1-gzGzoHsz',
+    appKey: 'JmkGF9UqkWGQNYDcJ2g1QV1b',
+    serverURL: 'https://x6tricmj.lc-cn-n1-shared.com'
+  })
+  const system = os.hostname() + ' ' + os.type() + ' ' + os.arch()
+  const query = new AV.Query('ZYPlayer')
+  query.equalTo('os', system)
+  query.equalTo('mac', mac)
+  query.find().then(res => {
+    // 存储新用户数据
+    if (res.length === 0) {
       const ZYPlayer = AV.Object.extend('ZYPlayer')
       const zyPlayer = new ZYPlayer()
       zyPlayer.set('os', system)
       zyPlayer.set('mac', mac)
-      zyPlayer.save().then(e => {
-        const id = e.id
-        res.cloud = true
-        res.cloudKey = id
-        setting.update(res)
-      })
-    })
-  }
+      zyPlayer.set('times', 1)
+      zyPlayer.save()
+      return false
+    }
+    // 统计启动次数
+    if (res.length === 1) {
+      const id = res[0].id
+      const times = AV.Object.createWithoutData('ZYPlayer', id)
+      times.increment('times', 1)
+      times.save()
+      return false
+    }
+    // 清除冗余数据
+    if (res.length > 1) {
+      const arr = res
+      arr.shift()
+      AV.Object.destroyAll(arr)
+    }
+  })
 })

src/mini/Mini.vue

@@ -92,6 +92,7 @@ export default {
           this.xg.on('ended', () => {
             if (this.d.m3u8_urls.length > 1 && (this.d.m3u8_urls.length - 1 > this.index)) {
               this.video.currentTime = 0
+              this.video.index++
               this.index++
               let src = this.d.m3u8_urls[this.index]
               src = src.split('$')[1]
@@ -122,6 +123,7 @@ export default {
           if (res) {
             const v = res
             v.currentTime = this.xg.currentTime
+            v.index = this.index
             const id = v.id
             delete v.id
             history.update(id, v)