😱 添加自动更新代码

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
 
       - run: |
           yarn
-          yarn electron:build
+          yarn release
         shell: pwsh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -30,8 +30,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            dist_electron/*.exe
-            dist_electron/*.dmg
-            dist_electron/*.snap
+            dist_electron/win-unpacked/*.exe
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -1,7 +1,12 @@
 {
-  "name": "zyplayer",
-  "version": "0.9.13",
+  "name": "zy",
+  "version": "0.9.19",
   "private": true,
+  "author": {
+    "name": "Hunlongyu",
+    "email": "hunlongyu@gmail.com"
+  },
+  "description": "ZY Player 资源播放器",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -9,7 +14,8 @@
     "electron:build": "vue-cli-service electron:build",
     "dev": "vue-cli-service electron:serve",
     "postinstall": "electron-builder install-app-deps",
-    "postuninstall": "electron-builder install-app-deps"
+    "postuninstall": "electron-builder install-app-deps",
+    "release": "vue-cli-service electron:build -p always"
   },
   "main": "background.js",
   "dependencies": {

src/background.js

@@ -23,7 +23,7 @@ function createWindow () {
     height: 720,
     frame: false,
     resizable: false,
-    transparent: false,
+    transparent: true,
     webPreferences: {
       webSecurity: false,
       nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION

src/components/Film.vue

@@ -11,7 +11,7 @@
         </div>
       </div>
       <!-- tags -->
-      <div class="zy-select" @mouseleave="show.tags = false" v-if="site.tags.length > 0">
+      <div class="zy-select" @mouseleave="show.tags = false" v-if="site.tags.length > 0 && keywords.length <= 0">
         <div class="vs-placeholder" @click="show.tags = true">{{site.tags[tag].title}}</div>
         <div class="vs-options" v-show="show.tags">
           <ul>
@@ -20,7 +20,7 @@
         </div>
       </div>
       <!-- type -->
-      <div class="zy-select" @mouseleave="show.type = false" v-if="site.tags[tag].children.length > 0">
+      <div class="zy-select" @mouseleave="show.type = false" v-if="site.tags[tag].children.length > 0 && keywords.length <= 0">
         <div class="vs-placeholder" @click="show.type = true">{{typeName}}</div>
         <div class="vs-options" v-show="show.type">
           <ul>
@@ -172,18 +172,22 @@ export default {
     },
     siteClick (e) {
       this.site = e
-      this.tb.update = 0
-      this.tb.total = 0
       this.tag = 0
       this.id = e.tags[0].id
-      this.tb.loading = true
       this.show.site = false
-      tools.film_get(e.key, this.id).then(res => {
-        this.tb.list = res.list
-        this.tb.total = res.total
-        this.tb.update = res.update
-        this.tb.loading = false
-      })
+      if (this.keywords.length > 0) {
+        this.searchEvent()
+      } else {
+        this.tb.update = 0
+        this.tb.total = 0
+        this.tb.loading = true
+        tools.film_get(e.key, this.id).then(res => {
+          this.tb.list = res.list
+          this.tb.total = res.total
+          this.tb.update = res.update
+          this.tb.loading = false
+        })
+      }
     },
     tagClick (e, n) {
       this.tb.update = 0

src/components/Play.vue

@@ -230,6 +230,7 @@ export default {
           if (res.m3u8_urls.length > 1 && (res.m3u8_urls.length - 1 > this.video.index)) {
             this.video.index++
           }
+          this.xg.off('ended')
         })
       }).catch(err => {
         this.$m.error(err)

src/lib/site/sites.js

@@ -1082,6 +1082,139 @@ const sites = [
         children: []
       }
     ]
+  },
+  {
+    key: 'okzy',
+    name: 'OK资源网',
+    url: 'https://www.okzy.co',
+    new: 'https://www.okzy.co/?m=vod-index-pg-{page}.html',
+    view: 'https://www.okzy.co/?m=vod-type-id-{id}-page-{page}.html',
+    search: 'https://www.okzy.co/index.php?m=vod-search-pg-{page}-wd-{keywords}.html',
+    type: 0,
+    tags: [
+      {
+        title: '最新',
+        id: 0,
+        children: []
+      },
+      {
+        title: '电影',
+        id: 1,
+        children: [
+          {
+            title: '动作片',
+            id: 5
+          },
+          {
+            title: '喜剧片',
+            id: 6
+          },
+          {
+            title: '爱情片',
+            id: 7
+          },
+          {
+            title: '科幻片',
+            id: 8
+          },
+          {
+            title: '恐怖片',
+            id: 9
+          },
+          {
+            title: '剧情片',
+            id: 10
+          },
+          {
+            title: '战争片',
+            id: 11
+          },
+          {
+            title: '纪录片',
+            id: 19
+          },
+          {
+            title: '微电影',
+            id: 20
+          },
+          {
+            title: '伦理片',
+            id: 21
+          }
+        ]
+      },
+      {
+        title: '连续剧',
+        id: 2,
+        children: [
+          {
+            title: '国产剧',
+            id: 12
+          },
+          {
+            title: '香港剧',
+            id: 13
+          },
+          {
+            title: '韩国剧',
+            id: 14
+          },
+          {
+            title: '欧美剧',
+            id: 15
+          },
+          {
+            title: '台湾剧',
+            id: 16
+          },
+          {
+            title: '日本剧',
+            id: 17
+          },
+          {
+            title: '海外剧',
+            id: 18
+          }
+        ]
+      },
+      {
+        title: '综艺片',
+        id: 3,
+        children: [
+          {
+            title: '内地综艺',
+            id: 26
+          },
+          {
+            title: '港台综艺',
+            id: 27
+          },
+          {
+            title: '日韩综艺',
+            id: 28
+          },
+          {
+            title: '欧美综艺',
+            id: 29
+          }
+        ]
+      },
+      {
+        title: '动漫片',
+        id: 4,
+        children: []
+      },
+      {
+        title: '福利片',
+        id: 22,
+        children: []
+      },
+      {
+        title: '解说',
+        id: 33,
+        children: []
+      }
+    ]
   }
 ]
 

src/lib/site/tools.js

@@ -6,7 +6,7 @@ const zy = {
   page: 1, // 第几页
   keywords: '', // 搜索关键字
   // 获取浏览列表
-  film_get (key, id = 1, page = 1) {
+  film_get (key, id = 0, page = 1) {
     return new Promise((resolve, reject) => {
       const site = getSite(key)
       let url = ''

vue.config.js

@@ -11,7 +11,32 @@ module.exports = {
           oneClick: false,
           allowToChangeInstallationDirectory: true
         },
-        productName: 'ZY Player'
+        productName: 'ZY Player 内测版',
+        publish: [
+          {
+            provider: 'github',
+            owner: 'Hunlongyu',
+            repo: 'ZY-Player'
+          }
+        ],
+        mac: {
+          icon: 'build/icon/icon.icns',
+          category: 'public.app-category.developer-tools',
+          target: 'default',
+          extendInfo: {
+            LSUIElement: 1
+          }
+        },
+        win: {
+          icon: 'build/icons/icon.ico',
+          target: 'nsis'
+        },
+        linux: {
+          icon: 'build/icons/'
+        },
+        snap: {
+          publish: ['github']
+        }
       }
     }
   }