diff --git a/package.json b/package.json index 3734f90..ea948bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "1.0.7", + "version": "1.0.8", "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", diff --git a/src/background.js b/src/background.js index adccab1..b3c9322 100644 --- a/src/background.js +++ b/src/background.js @@ -75,6 +75,7 @@ function createMini () { } app.allowRendererProcessReuse = true +app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors') app.on('window-all-closed', () => { if (process.platform !== 'darwin') { diff --git a/src/components/Play.vue b/src/components/Play.vue index 88226e4..d3be6fa 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -417,8 +417,7 @@ export default { if (rate > 0.25) { rate = rate + e this.xg.playbackRate = rate - // this.xg.video.playbackRate = rate - console.log(rate, 'rate') + this.$m.success(this.$t('rate') + rate) } } }, @@ -442,7 +441,6 @@ export default { } }) ipc.on('playbackRateUp', () => { - console.log('opacity up') if (this.xg) { if (this.xg.hasStart) { this.playbackRateEvent(0.25) @@ -450,7 +448,6 @@ export default { } }) ipc.on('playbackRateDown', () => { - console.log('opacity down') if (this.xg) { if (this.xg.hasStart) { this.playbackRateEvent(-0.25) diff --git a/src/locales/en.json b/src/locales/en.json index 13f5c80..065f0e6 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -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: " } diff --git a/src/locales/zh-cn.json b/src/locales/zh-cn.json index fbfbd0f..2c57a48 100644 --- a/src/locales/zh-cn.json +++ b/src/locales/zh-cn.json @@ -47,5 +47,6 @@ "async_success": "同步成功, 查询到更新。", "no_history": "无历史记录", "clearDB": "重置软件", - "clearTips": "软件没有问题,请勿重置软件,否则数据丢失概不负责.点击即清空数据库,并关闭软件." + "clearTips": "软件没有问题,请勿重置软件,否则数据丢失概不负责.点击即清空数据库,并关闭软件.", + "rate": "当前视频播放倍速为:" } diff --git a/yarn.lock b/yarn.lock index 0b4034e..cd05fa7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3649,10 +3649,10 @@ 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" @@ -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"