Compare commits

...

5 Commits

Author SHA1 Message Date
hunlongyu
15fa6f3bfb 👔 增加切换视频的遮罩 2020-05-07 21:17:50 +08:00
hunlongyu
1e2bc39bde 🙃 更进版本号 2020-05-07 15:47:05 +08:00
hunlongyu
551d11c802 🎃 解决数据库冲突,导致软件启动失败 2020-05-07 15:46:44 +08:00
hunlongyu
c4d8662b51 🚐 测试自动更新 2020-05-07 15:38:13 +08:00
hunlongyu
dea6306acb ☺ 测试自动更新 2020-05-07 15:27:30 +08:00
6 changed files with 25 additions and 13 deletions

View File

@@ -23,13 +23,5 @@ jobs:
yarn
yarn release
shell: pwsh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Release
uses: softprops/action-gh-release@v1
with:
files: |
dist_electron/win-unpacked/*.exe
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,6 +1,6 @@
{
"name": "zy",
"version": "0.9.21",
"version": "0.9.25",
"private": true,
"author": {
"name": "Hunlongyu",

View File

@@ -221,6 +221,9 @@
}
}
}
.mask{
background-color: var(--l-bgc-1);
}
}
.list{
border: 1px solid var(--l-c-3);

View File

@@ -3,6 +3,9 @@
<div class="box">
<div class="title">{{name}}</div>
<div id="xg"></div>
<div class="mask zy-loading" v-show="mask">
<div class="loader"></div>
</div>
<div class="more" v-show="more">
<span class="zy-svg" @click="nextEvent" v-show="showNext">
<svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="forwardIconTitle">
@@ -134,7 +137,8 @@ export default {
more: true,
showNext: false,
isStar: false,
isTop: false
isTop: false,
mask: false
}
},
computed: {
@@ -191,6 +195,7 @@ export default {
methods: {
...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
getUrls () {
this.mask = true
if (this.timer !== null) {
clearInterval(this.timer)
this.timer = null
@@ -225,6 +230,9 @@ export default {
} 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)) {
@@ -233,8 +241,6 @@ export default {
}
this.xg.off('ended')
})
}).catch(err => {
this.$m.error(err)
})
},
changeVideo () {
@@ -292,6 +298,7 @@ export default {
const v = { ...this.video }
const i = v.index + 1
if (i < this.right.listData.length) {
this.video.currentTime = 0
this.video.index++
} else {
this.$m.warning(this.$t('last_video'))
@@ -430,6 +437,14 @@ export default {
cursor: pointer;
}
}
.mask{
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 600;
}
}
.list{
position: absolute;

View File

@@ -1,6 +1,6 @@
import Dexie from 'dexie'
const db = new Dexie('ZYDB')
const db = new Dexie('zy')
db.version(1).stores({
theme: '++id, theme',

View File

@@ -11,6 +11,8 @@ module.exports = {
oneClick: false,
allowToChangeInstallationDirectory: true
},
appId: 'com.hunlongyu.zy',
copyright: 'Copyright @ 2020 Hunlongyu',
productName: 'ZY Player 内测版',
publish: [
{