🚁 版本更新

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-<img src="https://i.loli.net/2020/02/22/jvfBbnEuOq5RS9J.png" >
+<img src="https://i.loli.net/2020/05/07/9kLvPnWVCp7538c.png" >
 </p>
 <p align="center">
 <img src="https://forthebadge.com/images/badges/built-with-love.svg">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "0.9.26",
+  "version": "0.9.30",
   "private": true,
   "author": {
     "name": "Hunlongyu",
@@ -21,7 +21,7 @@
   "main": "background.js",
   "dependencies": {
     "axios": "^0.19.2",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "dexie": "^2.0.4",
     "electron-updater": "^4.2.5",
     "element-ui": "^2.13.1",
@@ -33,8 +33,8 @@
     "vue": "^2.6.11",
     "vue-i18n": "^8.17.0",
     "vuex": "^3.1.3",
-    "xgplayer": "^2.6.14",
-    "xgplayer-hls.js": "^2.1.6"
+    "xgplayer": "^2.6.19",
+    "xgplayer-hls.js": "^2.2.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.3.0",
@@ -44,8 +44,7 @@
     "@vue/eslint-config-standard": "^5.1.2",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
-    "electron": "^8.2.1",
-    "electron-icon-builder": "^1.0.2",
+    "electron": "^8.2.5",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",

src/assets/scss/theme/dark.scss

@@ -1,8 +1,5 @@
 .theme-dark{
   background-color: var(--d-bgc-1);
-  .xgplayer-skin-default video{
-    background-color: var(--d-bgc-2);
-  }
   .el-pagination{
     background-color: var(--d-bgc-1);
     color: var(--d-fc-1);

src/assets/scss/theme/green.scss

@@ -1,8 +1,5 @@
 .theme-green{
   background-color: var(--g-bgc-1);
-  .xgplayer-skin-default video{
-    background-color: var(--g-bgc-2);
-  }
   .el-pagination{
     background-color: var(--g-bgc-1);
     color: var(--g-fc-1);

src/assets/scss/theme/light.scss

@@ -1,8 +1,5 @@
 .theme-light{
   background-color: var(--l-bgc-1);
-  .xgplayer-skin-default video{
-    background-color: var(--l-bgc-2);
-  }
   .el-pagination{
     color: var(--l-fc-1);
     .el-pagination__total, .el-pagination__jump, .el-input__inner{

src/background.js

@@ -114,12 +114,26 @@ ipcMain.on('miniOpacity', (e, arg) => {
   mini.setOpacity(arg)
 })
 
-app.on('ready', async () => {
-  if (!process.env.WEBPACK_DEV_SERVER_URL) {
-    createProtocol('app')
-  }
-  createWindow()
-})
+const gotTheLock = app.requestSingleInstanceLock()
+if (!gotTheLock) {
+  app.quit()
+} else {
+  app.on('second-instance', (event, commandLine, workingDirectory) => {
+    // 当运行第二个实例时,将会聚焦到win这个窗口
+    if (win) {
+      if (win.isMinimized()) win.restore()
+      win.focus()
+    }
+  })
+
+  // 创建 win, 加载应用的其余部分, etc...
+  app.on('ready', () => {
+    if (!process.env.WEBPACK_DEV_SERVER_URL) {
+      createProtocol('app')
+    }
+    createWindow()
+  })
+}
 
 // Exit cleanly on request from parent process in development mode.
 if (isDevelopment) {

src/components/Play.vue

@@ -128,6 +128,7 @@ export default {
         screenShot: true,
         keyShortcut: 'on',
         crossOrigin: true,
+        cssFullscreen: true,
         defaultPlaybackRate: 1,
         playbackRate: [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 3, 4, 5]
       },
@@ -444,6 +445,7 @@ export default {
       width: 100%;
       height: 100%;
       z-index: 600;
+      opacity: 0.98;
     }
   }
   .list{

src/components/Setting.vue

@@ -4,7 +4,7 @@
       <div class="logo"><img src="@/assets/image/logo.png"></div>
       <div class="info">
         <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player')">{{$t('website')}}</a>
-        <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/issues')">{{$t('issues')}} v{{pkg.version}}</a>
+        <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/issues')">v{{pkg.version}} {{$t('issues')}}</a>
       </div>
       <div class="change">
         <div class="zy-select" @mouseleave="show.language = false">

src/lib/site/sites.js

@@ -4,7 +4,7 @@ const sites = [
     name: '最大资源网',
     url: 'http://www.zuidazy5.com',
     new: 'http://www.zuidazy5.com/?m=vod-index-pg-{page}.html',
-    view: 'http://www.zuidazy5.com/?m=vod-type-id-{id}-page-{page}.html',
+    view: 'http://www.zuidazy5.com/?m=vod-type-id-{id}-pg-{page}.html',
     search: 'http://www.zuidazy5.com/index.php?m=vod-search-pg-{page}-wd-{keywords}.html',
     type: 0,
     tags: [

yarn.lock

@@ -2892,9 +2892,9 @@ core-js@^2.4.0, core-js@^2.6.5:
   resolved "https://mirrors.huaweicloud.com/repository/npm/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-js@^3.6.4:
+core-js@^3.6.4, core-js@^3.6.5:
   version "3.6.5"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+  resolved "https://mirrors.huaweicloud.com/repository/npm/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
   integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
@@ -3628,10 +3628,10 @@ electron-updater@^4.2.5:
     pako "^1.0.11"
     semver "^7.1.3"
 
-electron@^8.2.1:
-  version "8.2.2"
-  resolved "https://registry.npmjs.org/electron/-/electron-8.2.2.tgz#6ddb27c1f15fda5f6e891e1ad13c0a0d15b0f133"
-  integrity sha512-GH4RCbpuzEn3XpTmsf+wLaJ2KOPSOoBJvQ0s6ftTLs5+IQEgKZvkdYCj8TCBNXFhss31RT3BUqoEQQUyZErK0A==
+electron@^8.2.5:
+  version "8.2.5"
+  resolved "https://mirrors.huaweicloud.com/repository/npm/electron/-/electron-8.2.5.tgz#ae3cb23d5517b2189fd35298e487198d65d1a291"
+  integrity sha512-LxSCUwmlfJtRwthd3ofpYaZ+1C2hQSW8Ep1DD9K3VbnDItO+kb3t1z35daJgAab78j54aOwo9gMxJtvU0Ftj6w==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -10022,18 +10022,18 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
-xgplayer-hls.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://mirrors.huaweicloud.com/repository/npm/xgplayer-hls.js/-/xgplayer-hls.js-2.1.6.tgz#1e969a77a7546114a5e1b4509e89401fe74536da"
-  integrity sha512-va/xmx0ES5oerbZ6bMVlXEw38Alz9dwEnvC0iwGOC6Kf543hv0ma/9qJ9JxWOPFsvAblmburT4rbAUxoMKGUDA==
+xgplayer-hls.js@^2.2.0:
+  version "2.2.0"
+  resolved "https://mirrors.huaweicloud.com/repository/npm/xgplayer-hls.js/-/xgplayer-hls.js-2.2.0.tgz#e9eed21a957acebf48e965b835ca8c6b84fbae30"
+  integrity sha512-u0bYCg6mjxCZSSp+FSlQBZs7qc25UedYDHfjf2oe6kyl/Cqhr0v5VfZXa/2IGVfnCYUaySFVML09NEbznk26rQ==
   dependencies:
     deepmerge "2.0.1"
     event-emitter "^0.3.5"
 
-xgplayer@^2.6.14:
-  version "2.6.14"
-  resolved "https://mirrors.huaweicloud.com/repository/npm/xgplayer/-/xgplayer-2.6.14.tgz#991c8bdfa507db7cadea93cd14d9b448737fd65c"
-  integrity sha512-lFwuUzSWt6f63KFDvoqHXDaF+8lWT3NPR30dFizzZp6/dUbtFnUigjXIc4HrN191v5gYQDss3wulQUFAfOo6KA==
+xgplayer@^2.6.19:
+  version "2.6.19"
+  resolved "https://mirrors.huaweicloud.com/repository/npm/xgplayer/-/xgplayer-2.6.19.tgz#1b3c2c7127ea4bdd7b4d071e778cd18edbe86afc"
+  integrity sha512-JVHOTiEvKmALnnCkJTY+Pk9SUztJQZDB+IiBvXKuY7C6GFPPEJobxtYiEumODk7JvmcW7hAW/otzzhkxvMQXHQ==
   dependencies:
     chalk "^2.3.2"
     commander "^2.15.1"