Compare commits

...

4 Commits

Author SHA1 Message Date
hunlongyu
0ed25643fc 😅 升级依赖 2020-05-25 22:04:18 +08:00
hunlongyu
ba99e65bcb 😅 新增快捷键视频倍速 2020-05-25 22:00:23 +08:00
hunlongyu
169b28ab33 💦 播放速度 2020-05-25 18:23:03 +08:00
hunlongyu
cbcffd7587 😣x86 fail 2020-05-24 14:57:39 +08:00
7 changed files with 71 additions and 39 deletions

View File

@@ -25,11 +25,3 @@ jobs:
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": "1.0.6",
"version": "1.0.9",
"private": true,
"author": {
"name": "Hunlongyu",
@@ -23,17 +23,17 @@
"axios": "^0.19.2",
"core-js": "^3.6.5",
"dexie": "^2.0.4",
"electron-updater": "^4.2.5",
"element-ui": "^2.13.1",
"electron-updater": "^4.3.1",
"element-ui": "^2.13.2",
"html2canvas": "^1.0.0-rc.5",
"leancloud-storage": "^4.5.3",
"macaddress": "^0.2.9",
"macaddress": "^0.5.1",
"modern-normalize": "^0.6.0",
"qrcode.vue": "^1.7.0",
"vue": "^2.6.11",
"vue-i18n": "^8.17.0",
"vuex": "^3.1.3",
"xgplayer": "^2.6.24",
"vue-i18n": "^8.17.7",
"vuex": "^3.4.0",
"xgplayer": "^2.7.1",
"xgplayer-hls.js": "^2.2.2"
},
"devDependencies": {
@@ -44,7 +44,7 @@
"@vue/eslint-config-standard": "^5.1.2",
"babel-eslint": "^10.1.0",
"babel-plugin-component": "^1.1.1",
"electron": "^8.3.0",
"electron": "^9.0.0",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",

View File

@@ -75,7 +75,7 @@ function createMini () {
}
app.allowRendererProcessReuse = true
app.commandLine.appendSwitch('--no-sandbox')
app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
@@ -154,6 +154,22 @@ if (!gotTheLock) {
mini.webContents.send('down', 0)
}
})
globalShortcut.register('shift+up', function () {
if (win) {
win.webContents.send('playbackRateUp', 0)
}
if (mini) {
mini.webContents.send('playbackRateUp', 0)
}
})
globalShortcut.register('shift+down', function () {
if (win) {
win.webContents.send('playbackRateDown', 0)
}
if (mini) {
mini.webContents.send('playbackRateDown', 0)
}
})
if (!process.env.WEBPACK_DEV_SERVER_URL) {
createProtocol('app')
}

View File

@@ -411,6 +411,14 @@ export default {
this.right.historyData = e.reverse()
})
})
},
playbackRateEvent (e) {
let rate = this.xg.playbackRate
if (rate > 0.25) {
rate = rate + e
this.xg.playbackRate = rate
this.$m.success(this.$t('rate') + rate)
}
}
},
mounted () {
@@ -432,6 +440,20 @@ export default {
}
}
})
ipc.on('playbackRateUp', () => {
if (this.xg) {
if (this.xg.hasStart) {
this.playbackRateEvent(0.25)
}
}
})
ipc.on('playbackRateDown', () => {
if (this.xg) {
if (this.xg.hasStart) {
this.playbackRateEvent(-0.25)
}
}
})
}
}
</script>

View File

@@ -47,5 +47,6 @@
"async_success": "Synchronization succeeded, update found.",
"no_history": "No history data.",
"clearDB": "Reset software",
"clearTips": "Click to clear the database and close the software"
"clearTips": "Click to clear the database and close the software",
"rate": "The current video speed is: "
}

View File

@@ -47,5 +47,6 @@
"async_success": "同步成功, 查询到更新。",
"no_history": "无历史记录",
"clearDB": "重置软件",
"clearTips": "软件没有问题,请勿重置软件,否则数据丢失概不负责.点击即清空数据库,并关闭软件."
"clearTips": "软件没有问题,请勿重置软件,否则数据丢失概不负责.点击即清空数据库,并关闭软件.",
"rate": "当前视频播放倍速为:"
}

View File

@@ -3636,9 +3636,9 @@ electron-to-chromium@^1.3.413:
resolved "https://mirrors.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.3.445.tgz#ce2a2989864d233eeb80437b13069dbca900cd00"
integrity sha512-utucmBYnRyjO3GCsgn7vwTJyDWIyftZW5vuGoxHj2Mnt6yF/alOq1ZGqBGNVZs/vKvgfNZu56y5xpn37i3n0ew==
electron-updater@^4.2.5:
electron-updater@^4.3.1:
version "4.3.1"
resolved "https://mirrors.huaweicloud.com/repository/npm/electron-updater/-/electron-updater-4.3.1.tgz#9d485b6262bc56fcf7ee62b1dc1b3b105a3e96a7"
resolved "https://registry.npmjs.org/electron-updater/-/electron-updater-4.3.1.tgz#9d485b6262bc56fcf7ee62b1dc1b3b105a3e96a7"
integrity sha512-UDC5AHCgeiHJYDYWZG/rsl1vdAFKqI/Lm7whN57LKAk8EfhTewhcEHzheRcncLgikMcQL8gFo1KeX51tf5a5Wg==
dependencies:
"@types/semver" "^7.1.0"
@@ -3649,18 +3649,18 @@ electron-updater@^4.2.5:
lodash.isequal "^4.5.0"
semver "^7.1.3"
electron@^8.3.0:
version "8.3.0"
resolved "https://mirrors.huaweicloud.com/repository/npm/electron/-/electron-8.3.0.tgz#c2b565a4c10d6d287d20164bcd5a478468b940a9"
integrity sha512-XRjiIJICZCgUr2vKSUI2PTkfP0gPFqCtqJUaTJSfCTuE3nTrxBKOUNeRMuCzEqspKkpFQU3SB3MdbMSHmZARlQ==
electron@^9.0.0:
version "9.0.0"
resolved "https://registry.npmjs.org/electron/-/electron-9.0.0.tgz#335cd426a8a542ad8d4c96c0c40a8668ab5527b8"
integrity sha512-JsaSQNPh+XDYkLj8APtVKTtvpb86KIG57W5OOss4TNrn8L3isC9LsCITwfnVmGIXHhvX6oY/weCtN5hAAytjVg==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
extract-zip "^1.0.3"
element-ui@^2.13.1:
element-ui@^2.13.2:
version "2.13.2"
resolved "https://mirrors.huaweicloud.com/repository/npm/element-ui/-/element-ui-2.13.2.tgz#582bf47aaaaaafe23ea1958fae217a687ad06447"
resolved "https://registry.npmjs.org/element-ui/-/element-ui-2.13.2.tgz#582bf47aaaaaafe23ea1958fae217a687ad06447"
integrity sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==
dependencies:
async-validator "~1.8.1"
@@ -6209,10 +6209,10 @@ lru-cache@^5.1.1:
dependencies:
yallist "^3.0.2"
macaddress@^0.2.9:
version "0.2.9"
resolved "https://mirrors.huaweicloud.com/repository/npm/macaddress/-/macaddress-0.2.9.tgz#3579b8b9acd5b96b4553abf0f394185a86813cb3"
integrity sha512-k4F1JUof6cQXxNFzx3thLby4oJzXTXQueAOOts944Vqizn+Rjc2QNFenT9FJSLU1CH3PmrHRSyZs2E+Cqw+P2w==
macaddress@^0.5.1:
version "0.5.1"
resolved "https://registry.npmjs.org/macaddress/-/macaddress-0.5.1.tgz#5d717ad50337f96085655d5db06ebc60df11fc59"
integrity sha512-et8b+V48uHaOB2fyNhPWwlm2PenfcfkGmHUwuVT3lxFEhfwaKwq5VmM4Cw4MYDwMrujvF0ktA2sSJidCjZBSzg==
make-dir@^2.0.0:
version "2.1.0"
@@ -9713,9 +9713,9 @@ vue-hot-reload-api@^2.3.0:
resolved "https://mirrors.huaweicloud.com/repository/npm/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
vue-i18n@^8.17.0:
vue-i18n@^8.17.7:
version "8.17.7"
resolved "https://mirrors.huaweicloud.com/repository/npm/vue-i18n/-/vue-i18n-8.17.7.tgz#d87e653e815a07f86e2c2dfe35261e6ea105c38a"
resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.17.7.tgz#d87e653e815a07f86e2c2dfe35261e6ea105c38a"
integrity sha512-7IQJ+72IIIxfR6Mt+X6EDmMP1i5oETFpc0FttnWKA9cgacf1DAlyho1aTItekG+AkbNs6nz4q3sYrXaPdC0irA==
vue-loader@^15.9.1:
@@ -9755,9 +9755,9 @@ vue@^2.6.11:
resolved "https://mirrors.huaweicloud.com/repository/npm/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
vuex@^3.1.3:
vuex@^3.4.0:
version "3.4.0"
resolved "https://mirrors.huaweicloud.com/repository/npm/vuex/-/vuex-3.4.0.tgz#20cc086062d750769fce1febb34e7fceeaebde45"
resolved "https://registry.npmjs.org/vuex/-/vuex-3.4.0.tgz#20cc086062d750769fce1febb34e7fceeaebde45"
integrity sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg==
watchpack-chokidar2@^2.0.0:
@@ -10060,10 +10060,10 @@ xgplayer-hls.js@^2.2.2:
deepmerge "2.0.1"
event-emitter "^0.3.5"
xgplayer@^2.6.24:
version "2.7.0"
resolved "https://mirrors.huaweicloud.com/repository/npm/xgplayer/-/xgplayer-2.7.0.tgz#71238f558d12e614f6f872caa20e9bffff9acf54"
integrity sha512-bb1z7XmlO3vugvjTfXrD/NJh/ipI2rh5cjUuc+syn0yYJuwcLXytcHzuKmXFccwfmXKF2VmdcItKDC3ZViIUSQ==
xgplayer@^2.7.1:
version "2.7.1"
resolved "https://registry.npmjs.org/xgplayer/-/xgplayer-2.7.1.tgz#dcb0dcce709d744d3f8fb4d86271188471bbcf46"
integrity sha512-MpKKIc/9RLULLKE69EIkVQgfmoTTj9/1CI4bwU9VYKgYIj3Px0zMf5G0hYDI362yHXukM4HZZ8LMMUfWm7DcIQ==
dependencies:
chalk "^2.3.2"
commander "^2.15.1"