From c1372c55896b11510bcb94706f597c87190b0865 Mon Sep 17 00:00:00 2001 From: hectorqin Date: Sun, 2 Aug 2020 11:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E5=92=8C=E4=B8=8A?= =?UTF-8?q?=E6=AC=A1=E6=92=AD=E6=94=BE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/theme/dark.scss | 8 +++++++ src/assets/scss/theme/green.scss | 8 +++++++ src/assets/scss/theme/light.scss | 8 +++++++ src/assets/scss/theme/pink.scss | 8 +++++++ src/components/Play.vue | 38 ++++++++++++++++++++++++++------ 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss index 5d3b3f8..ecb5c70 100644 --- a/src/assets/scss/theme/dark.scss +++ b/src/assets/scss/theme/dark.scss @@ -169,6 +169,11 @@ box-shadow: var(--d-bsc); .title{ color: var(--d-fc-1); + .right { + svg { + fill: var(--d-fc-1); + } + } } .box{ .more{ @@ -192,6 +197,9 @@ fill: var(--d-c-3); } } + &.last-tip { + color: var(--d-fc-1); + } } } } diff --git a/src/assets/scss/theme/green.scss b/src/assets/scss/theme/green.scss index e3097b4..29916c2 100644 --- a/src/assets/scss/theme/green.scss +++ b/src/assets/scss/theme/green.scss @@ -169,6 +169,11 @@ box-shadow: var(--g-bsc); .title{ color: var(--g-fc-1); + .right { + svg { + fill: var(--g-fc-1); + } + } } .box{ .more{ @@ -192,6 +197,9 @@ fill: var(--g-c-3); } } + &.last-tip { + color: var(--g-fc-1); + } } } } diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss index 0f8a984..aa29192 100644 --- a/src/assets/scss/theme/light.scss +++ b/src/assets/scss/theme/light.scss @@ -169,6 +169,11 @@ box-shadow: var(--l-bsc); .title{ color: var(--l-fc-1); + .right { + svg { + fill: var(--l-fc-1); + } + } } .box{ .more{ @@ -192,6 +197,9 @@ fill: var(--l-c-3); } } + &.last-tip { + color: var(--l-fc-1); + } } } } diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss index a085d88..f45b7b4 100644 --- a/src/assets/scss/theme/pink.scss +++ b/src/assets/scss/theme/pink.scss @@ -169,6 +169,11 @@ box-shadow: var(--p-bsc); .title{ color: var(--p-fc-1); + .right { + svg { + fill: var(--p-fc-1); + } + } } .box{ .more{ @@ -192,6 +197,9 @@ fill: var(--p-c-3); } } + &.last-tip { + color: var(--p-fc-1); + } } } } diff --git a/src/components/Play.vue b/src/components/Play.vue index 1945a91..de3121d 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -3,6 +3,11 @@
『第 {{(video.info.index + 1)}} 集』{{name}} + + + + +
@@ -70,6 +75,7 @@ + 上次播放到【{{right.history[0].site}}】{{right.history[0].name}} 第{{right.history[0].index+1}}集
@@ -85,12 +91,12 @@
    -
  • 导出
    • +
  • 导出
  • 无数据
  • {{i | ftName(j)}}
    -
  • 清空
    • +
  • 清空
  • 无数据
  • 【{{m.site}}】{{m.name}} 第{{m.index+1}}集删除
@@ -106,7 +112,7 @@ import zy from '../lib/site/tools' import Player from 'xgplayer' import Hls from 'xgplayer-hls.js' import mt from 'mousetrap' -const { remote, ipcRenderer } = require('electron') +const { remote, ipcRenderer, clipboard } = require('electron') const VIDEO_DETAIL_CACHE = {} @@ -132,7 +138,6 @@ const addPlayerBtn = function (event, svg, attrs) { const addPlayerView = function (event, tpl, attrs) { const player = this - console.log(player) const util = Player.util const rootEl = player.root const viewConfig = player.config[event] @@ -499,9 +504,7 @@ export default { this.right.show = true this.right.type = 'history' } - history.all().then(res => { - this.right.history = res.reverse() - }) + this.getAllhistory() }, getAllhistory () { history.all().then(res => { @@ -573,6 +576,19 @@ export default { info: this.video.info } }, + issueEvent () { + const info = { + video: this.video, + list: this.right.list, + m3u8List: VIDEO_DETAIL_CACHE[this.video.key + '@' + this.video.info.id] || [], + playerError: this.xg.error || '', + playerState: this.xg.readyState || '', + networkState: this.xg.networkState || '' + } + console.log(info) + clipboard.writeText(JSON.stringify(info, null, 4)) + this.$message.success('视频信息复制成功') + }, checkStar () { star.find({ site: this.video.key, ids: this.video.info.id }).then(res => { if (res) { @@ -872,6 +888,7 @@ ${item.link} } }, refreshHistory () { + this.getAllhistory() let ul = document.querySelector('xg-btn-showhistory ul') if (!ul) { ul = document.createElement('ul') @@ -1148,6 +1165,13 @@ ${item.link} height: 40px; line-height: 40px; padding: 0 10px; + .right { + float: right; + svg { + margin-top: 8px; + cursor: pointer; + } + } } .player{ width: 100%;