From fd715b7cfecec26975d98039806b529d44a94002 Mon Sep 17 00:00:00 2001 From: Hunlongyu Date: Fri, 31 Jan 2020 04:00:43 +0800 Subject: [PATCH] =?UTF-8?q?v0.8.3=20=E8=A7=86=E9=A2=91=E8=BF=9E=E6=92=AD?= =?UTF-8?q?=EF=BC=8C=20=E6=B5=8F=E8=A7=88=E5=8A=A0=E8=BD=BD=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=EF=BC=8C=E7=94=9F=E6=88=90=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/player/index.html | 12 ++ package.json | 3 +- src/assets/theme/dark.scss | 1 + src/lib/util.zy.ts | 2 + src/page/film.vue | 4 + src/page/player.vue | 33 ++++- src/page/search.vue | 9 +- src/page/setting.vue | 6 +- src/plugins/element.ts | 3 +- yarn.lock | 245 +++++++++++++++++++++++++++++++++++-- 10 files changed, 298 insertions(+), 20 deletions(-) create mode 100644 docs/player/index.html diff --git a/docs/player/index.html b/docs/player/index.html new file mode 100644 index 0000000..5748781 --- /dev/null +++ b/docs/player/index.html @@ -0,0 +1,12 @@ + + + + + + + ZY Player + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 871185e..3dedfa6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "0.8.2", + "version": "0.8.3", "author": "Hunlongyu", "description": "ZY Player 资源播放器", "private": true, @@ -22,6 +22,7 @@ "electron-updater": "^4.2.0", "element-ui": "^2.4.5", "flyio": "^0.6.14", + "qrcanvas": "^3.0.6", "vue": "^2.6.10", "vue-class-component": "^7.0.2", "vue-property-decorator": "^8.3.0", diff --git a/src/assets/theme/dark.scss b/src/assets/theme/dark.scss index 34e6a4a..3a52ef2 100644 --- a/src/assets/theme/dark.scss +++ b/src/assets/theme/dark.scss @@ -14,6 +14,7 @@ background-color: var(--d-bgc); border-color: var(--d-dbc); } + .el-table--border::after, .el-table--group::after, .el-table::before, .el-table, .el-table th, .el-table tr, .el-table--striped .el-table__body tr.el-table__row--striped td, .el-table--enable-row-hover .el-table__body tr:hover>td, diff --git a/src/lib/util.zy.ts b/src/lib/util.zy.ts index d8a4689..58b37c5 100644 --- a/src/lib/util.zy.ts +++ b/src/lib/util.zy.ts @@ -30,6 +30,8 @@ interface detail { urls?: Array } +fly.config.timeout = 10000 + const zy: ZY = { num: 0, page: 1, diff --git a/src/page/film.vue b/src/page/film.vue index 37e3a0e..4c1bca6 100644 --- a/src/page/film.vue +++ b/src/page/film.vue @@ -107,6 +107,10 @@ export default Vue.extend({ this.filmData = res.list this.filmPage = p this.loading = false + }).catch((err: any) => { + if (err.status === 1) { + this.$message.warning('获取资源超时，请切换分类，或者切换源。') + } }) }, tableBtnClick (type: string, e: any) { diff --git a/src/page/player.vue b/src/page/player.vue index 026a4d1..e6583cb 100644 --- a/src/page/player.vue +++ b/src/page/player.vue @@ -8,10 +8,14 @@ {{ num }} - + + + + + @@ -43,6 +47,7 @@ import 'xgplayer' // @ts-ignore import Hls from 'xgplayer-hls.js' import video from '@/plugins/dexie/video' +import { qrcanvas } from 'qrcanvas' const { ipcRenderer: ipc } = require('electron') export default Vue.extend({ data () { @@ -131,8 +136,16 @@ export default Vue.extend({ this.$nextTick(() => { this.xg = new Hls(this.config) // @ts-ignore - this.xg.on('error', () => { - this.$message.error('播放失败请重试~') + this.xg.on('ended', () => { + if (this.urls.length > 1 && (this.urls.length - 1 > this.video.index)) { + this.$message.success('自动播放下一集') + this.video.index++ + let v: any = this.urls[this.video.index] + let url = v.split('$')[1] + this.num = v.split('$')[0] + // @ts-ignore + this.xg.src = url + } }) }) } @@ -166,6 +179,20 @@ export default Vue.extend({ } }) }, + mobileEvent () { + let info = this.urls[this.video.index] + // @ts-ignore + let time = this.xg.currentTime + const canvas = qrcanvas({ + size: 120, + data: `http://zy.hly120506.top/player/index.html?info=${info}&time=${time}` + }) + const dom = document.getElementById('qrcode') + if (dom) { + dom.innerHTML = '' + dom.appendChild(canvas) + } + }, playBtnClick (i: string, j: number) { if (this.video.index !== j) { let url = i.split('$')[1] diff --git a/src/page/search.vue b/src/page/search.vue index 373daf4..bdcf9e4 100644 --- a/src/page/search.vue +++ b/src/page/search.vue @@ -1,7 +1,7 @@