🚲 全新版本,从心出发

fix(Play.vue):播放界面自适应窗口

.github/workflows/x86.yml

@@ -0,0 +1,35 @@
+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 }}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: dist_electron
+          path: dist_electron/*.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -43,6 +43,20 @@
 
 > Tips: 资源加载不出来时, 点击列表下方链接, 浏览器打开一下网站. 原理是需要通过网站的人机检测.
 
+### 全新版本,从心出发
+
+新版本开发计划已写好, 由于功能很多,且还有其他平台, 个人精力终归有限, 所以招募小伙伴, 一起完成这个项目.
+
+主要招募: 移动端(IOS, Android), 以及TV端(Android)
+
+我会提供接口, 接口文档, 桌面端与移动端交互说明
+
+欢迎各路大神参与开发维护项目. 也欢迎吃瓜群众入群尝鲜测试, 提出建议.
+
+微信群: 
+![微信群](https://i.loli.net/2020/06/17/uhYeHUVOrkB8fxL.jpg)
+
+
 #### 全局快捷键:
 
 |          快捷键          | 说明       | 主界面 | 小窗口 |
@@ -56,11 +70,17 @@
 
 #### 下载:
 
-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
+
+3. 适用于32位操作系统的x86软件,在蓝奏云网盘里, 后缀名: ZY Player * 32位.exe
 
 #### 截图: 
+
+0. 分享 ⇣ ↓
+![share.gif](https://i.loli.net/2020/06/05/hbJwBXlx194umcO.gif)
+
 1. 浏览 ⇣ ↓
 ![01浏览.png](https://i.loli.net/2020/05/18/MshDLnXq2CTpoBy.png)
 2. 搜索 ⇣ ↓

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "1.0.13",
+  "version": "1.0.20",
   "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/background.js

@@ -16,7 +16,7 @@ let mini
 // Scheme must be registered before the app is ready
 protocol.registerSchemesAsPrivileged([{ scheme: 'app', privileges: { secure: true, standard: true } }])
 
-function createWindow () {
+function createWindow() {
   win = new BrowserWindow({
     width: 1080,
     height: 720,
@@ -44,7 +44,7 @@ function createWindow () {
   })
 }
 
-function createMini () {
+function createMini() {
   mini = new BrowserWindow({
     width: 550,
     minWidth: 260,
@@ -74,6 +74,10 @@ function createMini () {
   })
 }
 
+if (process.platform === 'darwin') {
+  app.dock.show()
+}
+
 app.allowRendererProcessReuse = true
 app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
 if (process.platform === 'Linux') {
@@ -81,9 +85,7 @@ if (process.platform === 'Linux') {
 }
 
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
+  app.quit()
 })
 
 app.on('activate', () => {

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

@@ -125,8 +125,8 @@ export default {
         id: 'xg',
         lang: 'zh-cn',
         url: '',
-        width: 900,
-        height: 500,
+        width: '100%',
+        height: '100%',
         autoplay: false,
         videoInit: true,
         screenShot: true,
@@ -201,68 +201,69 @@ 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 = 0
-        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 => {
+        this.name = res.name
+        this.right.listData = res.m3u8_urls
 
-          const m = res.m3u8_urls
-          console.log(m, 'm3u8 url')
-          const arr = []
-          for (const i of m) {
-            arr.push(i.split('$')[1])
-          }
-          console.log(arr)
-          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
+        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()
-          }
-          this.xg.once('play', () => {
-            this.mask = false
+        if (time !== 0) {
+          this.xg.play()
+          this.xg.once('playing', () => {
+            this.xg.currentTime = time
           })
-          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')
-          })
-
-          console.log(this.xg.src, 'src')
+        } 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.off('ended')
         })
       })
     },
     changeVideo () {
       this.checkStar()
       this.checkTop()
-      this.name = ''
     },
     checkStar () {
       video.find({ detail: this.video.detail }).then(res => {
@@ -281,6 +282,7 @@ export default {
     },
     onPlayVideo () {
       this.more = true
+      this.changeVideo()
       const h = { ...this.video }
       history.find({ detail: h.detail }).then(res => {
         if (res) {
@@ -319,21 +321,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'))
       }
@@ -411,10 +409,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
@@ -497,8 +501,9 @@ export default {
       align-items: center;
     }
     .xgBox{
-      width: 900px;
+      width: 100%;
       height: 500px;
+      flex: 1;
     }
     .more{
       width: 100%;

src/components/Share.vue

@@ -32,7 +32,7 @@ export default {
         name: '',
         png: ''
       },
-      value: 'https://www.baidu.com',
+      value: '',
       loading: true
     }
   },