mirror of
https://github.com/cuiocean/ZY-Player.git
synced 2026-02-14 07:55:27 +08:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0e571efd6f | ||
|
|
79adbd1f81 | ||
|
|
214a267ba5 |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "zy",
|
||||
"version": "1.0.12",
|
||||
"version": "1.0.15",
|
||||
"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": {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -191,11 +191,11 @@ export default {
|
||||
this.right.show = false
|
||||
this.right.type = ''
|
||||
},
|
||||
video: {
|
||||
handler () {
|
||||
this.getUrls()
|
||||
},
|
||||
deep: true
|
||||
'video.index' () {
|
||||
this.getUrls()
|
||||
},
|
||||
'video.detail' () {
|
||||
this.getUrls()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -211,7 +211,7 @@ export default {
|
||||
}
|
||||
this.changeVideo()
|
||||
history.find({ detail: this.video.detail }).then(item => {
|
||||
let index = 1
|
||||
let index = 0
|
||||
let time = 0
|
||||
if (item) {
|
||||
index = item.index
|
||||
@@ -315,21 +315,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'))
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ macaddress.one((err, mac) => {
|
||||
const zyPlayer = new ZYPlayer()
|
||||
zyPlayer.set('os', system)
|
||||
zyPlayer.set('mac', mac)
|
||||
zyPlayer.set('times', 1)
|
||||
zyPlayer.save()
|
||||
return false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user