From b04201f80384496e58ce26bd746f235b1627661d Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:52:51 +0800
Subject: [PATCH 01/19] =?UTF-8?q?Play=E5=B0=86win=E5=B8=B8=E9=87=8F?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=87=BA=E6=9D=A5=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index 1ad6c4c..31c1d41 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -230,6 +230,7 @@ import { directive as onClickaway } from 'vue-clickaway'
 import { exec, execFile } from 'child_process'
 
 const { remote, clipboard } = require('electron')
+const win = remote.getCurrentWindow()
 const PinyinMatch = require('pinyin-match')
 
 const VIDEO_DETAIL_CACHE = {}
@@ -642,7 +643,6 @@ export default {
       this.timerEvent()
     },
     changeVideo () {
-      const win = remote.getCurrentWindow()
       win.setProgressBar(-1)
       this.checkStar()
       this.checkTop()
@@ -652,7 +652,6 @@ export default {
         const endTime = this.xg.duration
         const currentTime = this.xg.currentTime
         const progress = parseFloat((currentTime / endTime).toFixed(2))
-        const win = remote.getCurrentWindow()
         win.setProgressBar(progress)
         const db = await history.find({ site: this.video.key, ids: this.video.info.id })
         if (db) {
@@ -768,7 +767,6 @@ export default {
       }
     },
     async miniEvent () {
-      const win = remote.getCurrentWindow()
       this.mainWindowBounds = JSON.parse(JSON.stringify(win.getBounds()))
       let miniWindowBounds
       await mini.find().then(res => { if (res) miniWindowBounds = res.bounds })
@@ -778,7 +776,6 @@ export default {
       this.miniMode = true
     },
     async exitMiniEvent () {
-      const win = remote.getCurrentWindow()
       await mini.find().then(res => {
         let doc = {}
         doc = {
@@ -873,7 +870,6 @@ export default {
       }
     },
     checkTop () {
-      const win = remote.getCurrentWindow()
       this.isTop = win.isAlwaysOnTop()
     },
     closeListEvent () {
@@ -1023,7 +1019,7 @@ export default {
           if (this.xg.paused) {
             this.xg.play()
             // 继续播放时,隐藏进度条
-            remote.getCurrentWindow().setProgressBar(-1)
+            win.setProgressBar(-1)
           } else {
             this.xg.pause()
           }
@@ -1061,7 +1057,6 @@ export default {
         return false
       }
       if (e === 'top') {
-        const win = remote.getCurrentWindow()
         if (win.isAlwaysOnTop()) {
           win.setAlwaysOnTop(false)
         } else {
@@ -1109,7 +1104,6 @@ export default {
         return false
       }
       if (e === 'opacityUp') {
-        const win = remote.getCurrentWindow()
         const num = win.getOpacity()
         if (num > 0.1) {
           win.setOpacity(num - 0.1)
@@ -1117,7 +1111,6 @@ export default {
         return false
       }
       if (e === 'opacityDown') {
-        const win = remote.getCurrentWindow()
         const num = win.getOpacity()
         if (num < 1) {
           win.setOpacity(num + 0.1)
@@ -1319,7 +1312,6 @@ export default {
       })
     },
     videoStop () {
-      const win = remote.getCurrentWindow()
       win.setProgressBar(-1)
       if (this.xg.fullscreen) {
         this.xg.exitFullscreen()
@@ -1340,7 +1332,6 @@ export default {
       }, 1000)
     },
     minMaxEvent () {
-      const win = remote.getCurrentWindow()
       win.on('minimize', () => {
         if (this.xg && this.xg.hasStart) {
           this.xg.pause()

From 4dc88469e8d3660bc1e38065fd7e6442fe4d4364 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:55:08 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E8=B0=83=E6=95=B4iptv=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=B4=EF=BC=8C=E4=B8=A4=E7=A7=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IPTV.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index cf878b8..dd550f1 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -91,7 +91,7 @@
             align="right"
             :width="200">
             <template #header>
-              <span>总频道数:{{ iptvList.length }}</span>
+              <span>{{ enableBatchEdit ? `频道总数:${channelList.length}` : `资源总数:${iptvList.length}` }}</span>
             </template>
             <template slot-scope="scope">
               <el-button @click.stop="moveToTopEvent(scope.row)" type="text" v-if="scope.row.channels">置顶</el-button>

From 3323a56671dae5d038bf5fa6dfeba7c887953a32 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sat, 21 Nov 2020 16:11:56 +0800
Subject: [PATCH 03/19] =?UTF-8?q?fix:=E7=BD=AE=E9=A1=B6=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Frame.vue | 18 +++++++++++-------
 src/components/Play.vue  | 16 +++++++++++++---
 src/store/index.js       | 12 ++++++------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/components/Frame.vue b/src/components/Frame.vue
index 7e81e9b..02471c9 100644
--- a/src/components/Frame.vue
+++ b/src/components/Frame.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="frame">
     <span class="top" @click="frameClickEvent('top')" title="置顶">
-      <svg t="1595919317571" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1188" style="width:10px;height:14px"><path d="M43.072 974.72l380.864-301.952 151.936 161.6c0 0 63.424 17.28 67.328-30.72l-3.904-163.584 225.088-259.648 98.048-5.696c0 0 76.928-15.488 21.184-82.752l-275.072-276.928c0 0-74.944-9.6-69.248 59.584l0 75.008L383.552 367.104 225.856 376.64c0 0-57.728 19.2-36.608 69.248l148.16 146.176L43.072 974.72 43.072 974.72z" p-id="1189" :fill="isAlwaysOnTop ? '#555555' : '#ffffff'"></path></svg>
+      <svg t="1595919317571" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1188" style="width:10px;height:14px"><path d="M43.072 974.72l380.864-301.952 151.936 161.6c0 0 63.424 17.28 67.328-30.72l-3.904-163.584 225.088-259.648 98.048-5.696c0 0 76.928-15.488 21.184-82.752l-275.072-276.928c0 0-74.944-9.6-69.248 59.584l0 75.008L383.552 367.104 225.856 376.64c0 0-57.728 19.2-36.608 69.248l148.16 146.176L43.072 974.72 43.072 974.72z" p-id="1189" :fill="appState.windowIsOnTop ? '#555555' : '#ffffff'"></path></svg>
     </span>
     <span class="min" @click="frameClickEvent('min')" title="最小化">
       <svg t="1595917239849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1155" style="width:8px;height:14px"><path d="M0 479.936C0 444.64 28.448 416 64.064 416L959.936 416C995.328 416 1024 444.736 1024 479.936L1024 544.064C1024 579.392 995.552 608 959.936 608L64.064 608C28.672 608 0 579.264 0 544.064L0 479.936Z" p-id="1156" fill="#ffffff"></path></svg>
@@ -18,10 +18,14 @@
 const { remote } = require('electron')
 export default {
   name: 'frame',
-  data () {
-    const win = remote.getCurrentWindow()
-    return {
-      isAlwaysOnTop: win.isAlwaysOnTop()
+  computed: {
+    appState: {
+      get () {
+        return this.$store.getters.getAppState
+      },
+      set (val) {
+        this.SET_APPSTATE(val)
+      }
     }
   },
   methods: {
@@ -37,8 +41,8 @@ export default {
         win.destroy()
       }
       if (e === 'top') {
-        this.isAlwaysOnTop = !this.isAlwaysOnTop
-        win.setAlwaysOnTop(this.isAlwaysOnTop)
+        this.appState.windowIsOnTop = !this.appState.windowIsOnTop
+        win.setAlwaysOnTop(this.appState.windowIsOnTop)
       }
     }
   }
diff --git a/src/components/Play.vue b/src/components/Play.vue
index 31c1d41..7287a29 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -383,6 +383,14 @@ export default {
         this.SET_SHARE(val)
       }
     },
+    appState: {
+      get () {
+        return this.$store.getters.getAppState
+      },
+      set (val) {
+        this.SET_APPSTATE(val)
+      }
+    },
     setting () {
       return this.$store.getters.getSetting
     }
@@ -428,7 +436,7 @@ export default {
     }
   },
   methods: {
-    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
+    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE', 'SET_APPSTATE']),
     handleNodeClick (node) {
       if (node.channel) {
         this.playChannel(node.channel)
@@ -870,7 +878,7 @@ export default {
       }
     },
     checkTop () {
-      this.isTop = win.isAlwaysOnTop()
+      this.isTop = this.appState.windowIsOnTop
     },
     closeListEvent () {
       this.right.show = false
@@ -1057,10 +1065,12 @@ export default {
         return false
       }
       if (e === 'top') {
-        if (win.isAlwaysOnTop()) {
+        if (this.appState.windowIsOnTop) {
           win.setAlwaysOnTop(false)
+          this.appState.windowIsOnTop = false
         } else {
           win.setAlwaysOnTop(true)
+          this.appState.windowIsOnTop = true
         }
         return false
       }
diff --git a/src/store/index.js b/src/store/index.js
index 88819d9..0b70e0d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -26,8 +26,8 @@ export default new Vuex.Store({
       key: '',
       info: {}
     },
-    editSites: {
-      sites: []
+    appState: {
+      windowIsOnTop: false
     }
   },
   getters: {
@@ -46,8 +46,8 @@ export default new Vuex.Store({
     getVideo: state => {
       return state.video
     },
-    getEditSites: state => {
-      return state.editSites
+    getAppState: state => {
+      return state.appState
     }
   },
   mutations: {
@@ -66,8 +66,8 @@ export default new Vuex.Store({
     SET_VIDEO: (state, payload) => {
       state.video = payload
     },
-    SET_EDITSITES: (state, payload) => {
-      state.editSites = payload
+    SET_APPSTATE: (state, payload) => {
+      state.appState = payload
     }
   }
 })

From 39edb9ce35dfb563a328bbecd62c379249bae4f0 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sat, 21 Nov 2020 16:44:50 +0800
Subject: [PATCH 04/19] v2.6.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 14d8037..9f43aae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

From a8b0e7e6a834a2dbb9f61e9e4a957723f33b177e Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sat, 21 Nov 2020 23:20:17 +0800
Subject: [PATCH 05/19] =?UTF-8?q?fix:=E7=9B=B4=E6=92=AD=E6=97=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E5=88=87=E6=8D=A2=E9=A2=91=E9=81=93=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index 7287a29..e3a39bf 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -673,7 +673,7 @@ export default {
     },
     prevEvent () {
       if (this.video.iptv) {
-        var index = this.channelList.findIndex(obj => obj.prefer === this.video.iptv.id)
+        var index = this.channelList.findIndex(obj => obj.id === this.video.iptv.channelID)
         if (index >= 1) {
           var channel = this.channelList[index - 1]
           this.playChannel(channel)
@@ -691,7 +691,7 @@ export default {
     },
     nextEvent () {
       if (this.video.iptv) {
-        var index = this.channelList.findIndex(obj => obj.prefer === this.video.iptv.id)
+        var index = this.channelList.findIndex(obj => obj.id === this.video.iptv.channelID)
         if (index < (this.channelList.length - 1)) {
           var channel = this.channelList[index + 1]
           this.playChannel(channel)

From 2dd91f78c9d665b2469e0b6e7818afb629ff21aa Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 17:59:21 +0100
Subject: [PATCH 06/19] =?UTF-8?q?=E7=89=9B=E7=89=9B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=B7=B2=E5=A4=B1=E6=95=88,=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/dexie/iniData/Sites.json | 58 +++++++++++++-------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/lib/dexie/iniData/Sites.json b/src/lib/dexie/iniData/Sites.json
index ad73f59..72b5bd5 100644
--- a/src/lib/dexie/iniData/Sites.json
+++ b/src/lib/dexie/iniData/Sites.json
@@ -11,16 +11,6 @@
   },
   {
     "id": 2,
-    "key": "niuniucj",
-    "name": "牛牛资源",
-    "api": "http://v.niuniucj.com/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 3,
     "key": "88zyw",
     "name": "88 影视资源站",
     "api": "http://www.88zyw.net/inc/api.php",
@@ -30,7 +20,7 @@
     "status": "可用"
   },
   {
-    "id": 4,
+    "id": 3,
     "key": "apibdzy",
     "name": "百度云资源",
     "api": "https://api.apibdzy.com/api.php/provide/vod/at/xml",
@@ -40,7 +30,7 @@
     "status": "可用"
   },
   {
-    "id": 5,
+    "id": 4,
     "key": "mbo",
     "name": "秒播资源",
     "api": "http://caiji.mb77.vip/inc/api.php",
@@ -50,7 +40,7 @@
     "status": "可用"
   },
   {
-    "id": 6,
+    "id": 5,
     "key": "zuidazy",
     "name": "最大资源网",
     "api": "http://www.zdziyuan.com/inc/api.php",
@@ -60,7 +50,7 @@
     "status": "可用"
   },
   {
-    "id": 7,
+    "id": 6,
     "key": "123ku",
     "name": "123 资源",
     "api": "http://cj.123ku2.com:12315/inc/api.php",
@@ -70,7 +60,7 @@
     "status": "可用"
   },
   {
-    "id": 8,
+    "id": 7,
     "key": "okzy",
     "name": "OK 资源网",
     "api": "http://cj.okzy.tv/inc/api.php",
@@ -80,7 +70,7 @@
     "status": "可用"
   },
   {
-    "id": 9,
+    "id": 8,
     "key": "kuyunzy",
     "name": "酷云资源",
     "api": "http://caiji.kuyun98.com/inc/ldg_api.php",
@@ -90,7 +80,7 @@
     "status": "可用"
   },
   {
-    "id": 10,
+    "id": 9,
     "key": "kubozy",
     "name": "酷播资源",
     "api": "http://api.kbzyapi.com/inc/api.php",
@@ -100,7 +90,7 @@
     "status": "可用"
   },
   {
-    "id": 11,
+    "id": 10,
     "key": "yongjiuzy",
     "name": "永久资源",
     "api": "http://cj.yongjiuzyw.com/inc/api.php",
@@ -110,7 +100,7 @@
     "status": "可用"
   },
   {
-    "id": 12,
+    "id": 11,
     "key": "rrzy",
     "name": "人人资源",
     "api": "https://www.rrzyw.cc/api.php/provide/vod/from/rrm3u8/at/xml/",
@@ -120,7 +110,7 @@
     "status": "可用"
   },
   {
-    "id": 13,
+    "id": 12,
     "key": "bbkdj",
     "name": "步步高顶尖资源网",
     "api": "http://api.bbkdj.com/api",
@@ -130,7 +120,7 @@
     "status": "可用"
   },
   {
-    "id": 14,
+    "id": 13,
     "key": "solezy",
     "name": "搜乐资源网",
     "api": "https://www.caijizy.vip/api.php/provide/vod/at/xml/",
@@ -140,7 +130,7 @@
     "status": "可用"
   },
   {
-    "id": 15,
+    "id": 14,
     "key": "zuixinzy",
     "name": "最新资源",
     "api": "http://api.zuixinapi.com/inc/api.php",
@@ -150,7 +140,7 @@
     "status": "可用"
   },
   {
-    "id": 16,
+    "id": 15,
     "key": "605zy",
     "name": "605资源",
     "api": "http://www.605zy.net/inc/seacmsapi.php",
@@ -160,7 +150,7 @@
     "status": "可用"
   },
   {
-    "id": 17,
+    "id": 16,
     "key": "subo988",
     "name": "速播资源站",
     "api": "https://www.subo988.com/inc/api.php",
@@ -170,7 +160,7 @@
     "status": "可用"
   },
   {
-    "id": 18,
+    "id": 17,
     "key": "1886zy",
     "name": "1886 资源",
     "api": "http://cj.1886zy.co/inc/api.php",
@@ -180,7 +170,7 @@
     "status": "可用"
   },
   {
-    "id": 19,
+    "id": 18,
     "key": "doubanzy",
     "name": "豆瓣电影资源",
     "api": "http://v.1988cj.com/inc/api.php",
@@ -190,7 +180,7 @@
     "status": "可用"
   },
   {
-    "id": 20,
+    "id": 19,
     "key": "135zy",
     "name": "135 资源网",
     "api": "http://cj.zycjw1.com/inc/api.php",
@@ -200,7 +190,7 @@
     "status": "可用"
   },
   {
-    "id": 21,
+    "id": 20,
     "key": "mgtvzy",
     "name": "芒果 TV 资源网",
     "api": "https://api.shijiapi.com/api.php/provide/vod/at/xml/",
@@ -210,7 +200,7 @@
     "status": "可用"
   },
   {
-    "id": 22,
+    "id": 21,
     "key": "209zy",
     "name": "209 资源",
     "api": "http://cj.1156zy.com/inc/api.php",
@@ -220,7 +210,7 @@
     "status": "可用"
   },
   {
-    "id": 23,
+    "id": 22,
     "key": "kkzy",
     "name": "快快资源",
     "api": "https://api.kkzy.tv/inc/api.php",
@@ -230,7 +220,7 @@
     "status": "可用"
   },
   {
-    "id": 24,
+    "id": 23,
     "key": "wolongzy",
     "name": "卧龙资源",
     "api": "http://cj.wlzy.tv/inc/api_mac.php",
@@ -240,7 +230,7 @@
     "status": "可用"
   },
   {
-    "id": 25,
+    "id": 24,
     "key": "mokazy",
     "name": "魔卡资源网",
     "api": "https://cj.heiyap.com/api.php/provide/vod/at/xml/",
@@ -250,7 +240,7 @@
     "status": "可用"
   },
   {
-    "id": 26,
+    "id": 25,
     "key": "158zy",
     "name": "壹伍捌资源网",
     "api": "http://cj.158zyz.net:158/inc/api.php",
@@ -260,7 +250,7 @@
     "status": "可用"
   },
   {
-    "id": 27,
+    "id": 26,
     "key": "kyzy",
     "name": "快影资源站",
     "api": "https://www.kyzy.tv/api.php/kyyun/vod/at/xml/",

From da22abd25d116079ab87e01ded6374d5913c5e23 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 18:35:56 +0100
Subject: [PATCH 07/19] =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E8=B5=84=E6=BA=90=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index e0c19d3..0686a46 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -494,7 +494,7 @@ export default {
       const type = this.type.tid
       const page = this.pagecount
       this.statusText = ' '
-      if (key && page < 1) { // OK资源前几类硬是去不掉
+      if (key === undefined || page < 1 || type === undefined) { // OK资源前几类硬是去不掉
         $state.complete()
         this.statusText = '暂无数据'
         return false

From a5c8d206355f25e7524a2bd278e215933b2ea8ea Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 18:39:33 +0100
Subject: [PATCH 08/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=BA=BB=E8=8A=B1?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=9A=84api=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/dexie/iniData/Sites.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/dexie/iniData/Sites.json b/src/lib/dexie/iniData/Sites.json
index 72b5bd5..0c58305 100644
--- a/src/lib/dexie/iniData/Sites.json
+++ b/src/lib/dexie/iniData/Sites.json
@@ -3,7 +3,7 @@
     "id": 1,
     "key": "mahuazy",
     "name": "麻花资源",
-    "api": "https://www.mhapi123.com/inc/api.php",
+    "api": "http://www.mhapi123.com/inc/ldg_api.php",
     "download": "",
     "group": "默认",
     "isActive": true,

From eff69db0633b52a52741bde768143c130d811902 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 18:52:33 +0100
Subject: [PATCH 09/19] =?UTF-8?q?infiniteId=E4=BC=9A=E5=9C=A8classClick?=
 =?UTF-8?q?=E9=87=8C=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 0686a46..7a42770 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -425,7 +425,6 @@ export default {
         this.classList = []
         this.type = {}
         this.getClass().then(res => {
-          this.infiniteId += 1
           this.classClick(this.classList[0].name)
         })
       }

From f92af48a4ea9ea2cf11b9e8e2c714ec860dd5558 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 19:07:05 +0100
Subject: [PATCH 10/19] =?UTF-8?q?mini=E6=A8=A1=E5=BC=8F,=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F,=E6=97=A0=E9=9C=80?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue | 19 ++-----------------
 src/lib/dexie/dexie.js  |  2 --
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index e3a39bf..533c223 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -221,7 +221,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { star, history, setting, shortcut, mini, channelList, iptvSearch, sites } from '../lib/dexie'
+import { star, history, setting, shortcut, channelList, iptvSearch, sites } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Player from 'xgplayer'
 import HlsJsPlayer from 'xgplayer-hls.js'
@@ -775,27 +775,12 @@ export default {
       }
     },
     async miniEvent () {
-      this.mainWindowBounds = JSON.parse(JSON.stringify(win.getBounds()))
-      let miniWindowBounds
-      await mini.find().then(res => { if (res) miniWindowBounds = res.bounds })
-      if (!miniWindowBounds) miniWindowBounds = { x: win.getPosition()[0], y: win.getPosition()[1], width: 550, height: 340 }
+      const miniWindowBounds = { x: win.getPosition()[0], y: win.getPosition()[1], width: win.getSize()[0], height: win.getSize()[1] }
       win.setBounds(miniWindowBounds)
       this.xg.getCssFullscreen()
       this.miniMode = true
     },
     async exitMiniEvent () {
-      await mini.find().then(res => {
-        let doc = {}
-        doc = {
-          id: 0,
-          bounds: win.getBounds()
-        }
-        if (res) {
-          mini.update(doc)
-        } else {
-          mini.add(doc)
-        }
-      })
       win.setBounds(this.mainWindowBounds)
       this.xg.exitCssFullscreen()
       this.miniMode = false
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 7c6ddf7..fc477ca 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -12,8 +12,6 @@ db.version(4).stores({
   recommendation: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
   sites: '++id, key, name, api, download, isActive, group',
   history: '++id, [site+ids], name, type, year, index, time, duration, detail',
-  // mini: 'id, mode, site, ids, name, index, time, url',
-  mini: 'id, bounds',
   iptv: '++id, name, url, isActive',
   channelList: '++id, name, prefer, channels, group, isActive'
 })

From e032f86d3d870d03a9253ec9d842acaa6ec3837a Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 22:16:06 +0100
Subject: [PATCH 11/19] =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=97=B6,=E6=97=A0=E9=9C=80=E6=9B=B4=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=92=8C=E6=94=B9=E5=8F=98infiniteId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 7a42770..69fa930 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -611,9 +611,6 @@ export default {
           if (this.$refs.filmWaterfall) {
             this.$refs.filmWaterfall.refresh()
           }
-          this.getPage().then(() => {
-            this.infiniteId += 1
-          })
         }
       }
     },

From 429eb4aac0c116893b75d66d31f3ce2fb185076d Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 22:27:26 +0100
Subject: [PATCH 12/19] =?UTF-8?q?=E7=A7=BB=E5=8A=A8getChannelList=E5=88=B0?=
 =?UTF-8?q?if=E9=87=8C,=E9=81=BF=E5=85=8D=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E5=BC=80=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index 533c223..f8159e8 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -400,8 +400,10 @@ export default {
       this.right.show = false
       this.right.type = ''
       if (this.view === 'Play') {
-        this.getChannelList()
-        if (this.video.key === '' && !this.video.iptv) this.channelListShow = true
+        if (this.video.key === '' && !this.video.iptv) {
+          this.getChannelList()
+          this.channelListShow = true
+        }
       }
     },
     video: {

From aca487f7966c006b89f5189136b1972736b449ee Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 22:35:21 +0100
Subject: [PATCH 13/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 9f43aae..e68635a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "cheerio": "^1.0.0-rc.3",
     "core-js": "^3.7.0",
     "cors": "^2.8.5",
-    "dexie": "^3.0.2",
+    "dexie": "^3.0.3",
     "electron-localshortcut": "^3.2.1",
     "electron-proxy-agent": "^1.2.0",
     "electron-updater": "^4.3.5",
@@ -47,7 +47,7 @@
     "vue-waterfall-plugin": "^1.1.0",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.5.1",
-    "xgplayer": "^2.13.0",
+    "xgplayer": "^2.13.1",
     "xgplayer-hls.js": "^2.2.5"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "@vue/eslint-config-standard": "^5.1.2",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
-    "electron": "^10.1.5",
+    "electron": "^10.1.6",
     "electron-devtools-installer": "^3.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.22.1",

From 5fc1020e79125dad71bb3c6e9957cc799543ab90 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 22:48:44 +0100
Subject: [PATCH 14/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index e68635a..c71d20a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "electron-localshortcut": "^3.2.1",
     "electron-proxy-agent": "^1.2.0",
     "electron-updater": "^4.3.5",
-    "element-ui": "^2.14.0",
+    "element-ui": "^2.14.1",
     "express": "^4.17.1",
     "fast-xml-parser": "^3.17.4",
     "html2canvas": "^1.0.0-rc.7",
@@ -51,24 +51,24 @@
     "xgplayer-hls.js": "^2.2.5"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.4.0",
-    "@vue/cli-plugin-eslint": "~4.4.0",
-    "@vue/cli-plugin-vuex": "~4.4.0",
-    "@vue/cli-service": "~4.4.0",
+    "@vue/cli-plugin-babel": "~4.5.9",
+    "@vue/cli-plugin-eslint": "~4.5.9",
+    "@vue/cli-plugin-vuex": "~4.5.9",
+    "@vue/cli-service": "~4.5.9",
     "@vue/eslint-config-standard": "^5.1.2",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
-    "electron": "^10.1.6",
-    "electron-devtools-installer": "^3.1.0",
-    "eslint": "^6.7.2",
+    "electron": "^11.0.2",
+    "electron-devtools-installer": "^3.1.1",
+    "eslint": "^7.14.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.2",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-vue": "^7.1.0",
     "sass": "^1.29.0",
-    "sass-loader": "^8.0.2",
-    "vue-cli-plugin-electron-builder": "2.0.0-rc.4",
+    "sass-loader": "^10.1.0",
+    "vue-cli-plugin-electron-builder": "2.0.0-rc.5",
     "vue-template-compiler": "^2.6.12"
   }
 }

From 014dac0b648d2289f54bff8e82e9bbd28c5b6cfb Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 21 Nov 2020 23:35:56 +0100
Subject: [PATCH 15/19] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=BA=90=E7=AB=99,?=
 =?UTF-8?q?=E6=8A=8A=E5=8F=AF=E7=94=A8=E7=9A=84=E6=94=BE=E4=B8=8A=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/dexie/iniData/Sites.json | 325 +++++++++++++++----------------
 1 file changed, 161 insertions(+), 164 deletions(-)

diff --git a/src/lib/dexie/iniData/Sites.json b/src/lib/dexie/iniData/Sites.json
index 0c58305..db7cf20 100644
--- a/src/lib/dexie/iniData/Sites.json
+++ b/src/lib/dexie/iniData/Sites.json
@@ -11,156 +11,6 @@
   },
   {
     "id": 2,
-    "key": "88zyw",
-    "name": "88 影视资源站",
-    "api": "http://www.88zyw.net/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 3,
-    "key": "apibdzy",
-    "name": "百度云资源",
-    "api": "https://api.apibdzy.com/api.php/provide/vod/at/xml",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 4,
-    "key": "mbo",
-    "name": "秒播资源",
-    "api": "http://caiji.mb77.vip/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 5,
-    "key": "zuidazy",
-    "name": "最大资源网",
-    "api": "http://www.zdziyuan.com/inc/api.php",
-    "download": "http://www.zdziyuan.com/inc/apidown.php",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 6,
-    "key": "123ku",
-    "name": "123 资源",
-    "api": "http://cj.123ku2.com:12315/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 7,
-    "key": "okzy",
-    "name": "OK 资源网",
-    "api": "http://cj.okzy.tv/inc/api.php",
-    "download": "http://cj.okzy.tv/inc/apidown.php",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 8,
-    "key": "kuyunzy",
-    "name": "酷云资源",
-    "api": "http://caiji.kuyun98.com/inc/ldg_api.php",
-    "download": "http://caiji.kuyun98.com/inc/apidown.php",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 9,
-    "key": "kubozy",
-    "name": "酷播资源",
-    "api": "http://api.kbzyapi.com/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 10,
-    "key": "yongjiuzy",
-    "name": "永久资源",
-    "api": "http://cj.yongjiuzyw.com/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 11,
-    "key": "rrzy",
-    "name": "人人资源",
-    "api": "https://www.rrzyw.cc/api.php/provide/vod/from/rrm3u8/at/xml/",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 12,
-    "key": "bbkdj",
-    "name": "步步高顶尖资源网",
-    "api": "http://api.bbkdj.com/api",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 13,
-    "key": "solezy",
-    "name": "搜乐资源网",
-    "api": "https://www.caijizy.vip/api.php/provide/vod/at/xml/",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 14,
-    "key": "zuixinzy",
-    "name": "最新资源",
-    "api": "http://api.zuixinapi.com/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 15,
-    "key": "605zy",
-    "name": "605资源",
-    "api": "http://www.605zy.net/inc/seacmsapi.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 16,
-    "key": "subo988",
-    "name": "速播资源站",
-    "api": "https://www.subo988.com/inc/api.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
-  {
-    "id": 17,
     "key": "1886zy",
     "name": "1886 资源",
     "api": "http://cj.1886zy.co/inc/api.php",
@@ -169,8 +19,165 @@
     "isActive": true,
     "status": "可用"
   },
+  {
+    "key": "wolongzy",
+    "id": 3,
+    "name": "卧龙资源网",
+    "api": "https://www.mhapi123.com/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true
+  },
+  {
+    "id": 4,
+    "key": "123ku",
+    "name": "123 资源",
+    "api": "http://cj.123ku2.com:12315/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 5,
+    "key": "subo988",
+    "name": "速播资源站",
+    "api": "https://www.subo988.com/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 6,
+    "key": "88zyw",
+    "name": "88 影视资源站",
+    "api": "http://www.88zyw.net/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "key": "zuidazy",
+    "id": 7,
+    "name": "最大资源网",
+    "api": "http://www.zdziyuan.com/inc/ldg_sea.php",
+    "download": "http://www.zdziyuan.com/inc/apidown.php",
+    "group": "默认",
+    "isActive": true
+  },
+  {
+    "key": "mbo",
+    "id": 8,
+    "name": "秒播资源",
+    "api": "http://caiji.mb77.vip/inc/seacmsapi.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true
+  },
+  {
+    "id": 9,
+    "key": "apibdzy",
+    "name": "百度云资源",
+    "api": "https://api.apibdzy.com/api.php/provide/vod/at/xml",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 10,
+    "key": "okzy",
+    "name": "OK 资源网",
+    "api": "http://cj.okzy.tv/inc/api.php",
+    "download": "http://cj.okzy.tv/inc/apidown.php",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 11,
+    "key": "kuyunzy",
+    "name": "酷云资源",
+    "api": "http://caiji.kuyun98.com/inc/ldg_api.php",
+    "download": "http://caiji.kuyun98.com/inc/apidown.php",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 12,
+    "key": "kubozy",
+    "name": "酷播资源",
+    "api": "http://api.kbzyapi.com/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 13,
+    "key": "yongjiuzy",
+    "name": "永久资源",
+    "api": "http://cj.yongjiuzyw.com/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 14,
+    "key": "rrzy",
+    "name": "人人资源",
+    "api": "https://www.rrzyw.cc/api.php/provide/vod/from/rrm3u8/at/xml/",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 15,
+    "key": "bbkdj",
+    "name": "步步高顶尖资源网",
+    "api": "http://api.bbkdj.com/api",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 16,
+    "key": "solezy",
+    "name": "搜乐资源网",
+    "api": "https://www.caijizy.vip/api.php/provide/vod/at/xml/",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 17,
+    "key": "zuixinzy",
+    "name": "最新资源",
+    "api": "http://api.zuixinapi.com/inc/api.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
   {
     "id": 18,
+    "key": "605zy",
+    "name": "605资源",
+    "api": "http://www.605zy.net/inc/seacmsapi.php",
+    "download": "",
+    "group": "默认",
+    "isActive": true,
+    "status": "可用"
+  },
+  {
+    "id": 19,
     "key": "doubanzy",
     "name": "豆瓣电影资源",
     "api": "http://v.1988cj.com/inc/api.php",
@@ -180,7 +187,7 @@
     "status": "可用"
   },
   {
-    "id": 19,
+    "id": 20,
     "key": "135zy",
     "name": "135 资源网",
     "api": "http://cj.zycjw1.com/inc/api.php",
@@ -190,7 +197,7 @@
     "status": "可用"
   },
   {
-    "id": 20,
+    "id": 21,
     "key": "mgtvzy",
     "name": "芒果 TV 资源网",
     "api": "https://api.shijiapi.com/api.php/provide/vod/at/xml/",
@@ -200,7 +207,7 @@
     "status": "可用"
   },
   {
-    "id": 21,
+    "id": 22,
     "key": "209zy",
     "name": "209 资源",
     "api": "http://cj.1156zy.com/inc/api.php",
@@ -210,7 +217,7 @@
     "status": "可用"
   },
   {
-    "id": 22,
+    "id": 23,
     "key": "kkzy",
     "name": "快快资源",
     "api": "https://api.kkzy.tv/inc/api.php",
@@ -219,16 +226,6 @@
     "isActive": true,
     "status": "可用"
   },
-  {
-    "id": 23,
-    "key": "wolongzy",
-    "name": "卧龙资源",
-    "api": "http://cj.wlzy.tv/inc/api_mac.php",
-    "download": "",
-    "group": "默认",
-    "isActive": true,
-    "status": "可用"
-  },
   {
     "id": 24,
     "key": "mokazy",

From 956ebbf8b8b337c7a3923e63d9a8cbbc2acef4e6 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:32:26 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E8=B0=83=E6=95=B4Play=E9=A1=B5=E9=9D=A2c?=
 =?UTF-8?q?hannelList=E5=8A=A0=E8=BD=BD=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index f8159e8..fe2af35 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -400,8 +400,8 @@ export default {
       this.right.show = false
       this.right.type = ''
       if (this.view === 'Play') {
+        this.getChannelList()
         if (this.video.key === '' && !this.video.iptv) {
-          this.getChannelList()
           this.channelListShow = true
         }
       }
@@ -530,7 +530,6 @@ export default {
       ele.isActive = ele.channels.some(e => e.isActive)
       channelList.remove(ele.id)
       channelList.add(ele)
-      this.getChannelList()
     },
     playChannel (channel) {
       if (channel.channels) {
@@ -541,7 +540,6 @@ export default {
         ele.prefer = channel.id
         channelList.remove(ele.id)
         channelList.add(ele)
-        this.getChannelList()
         this.right.sources = ele.channels.filter(e => e.isActive)
       }
       this.video.iptv = channel

From fede7e4ef2913a533623471588ae15a1f833cf51 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:41:19 +0800
Subject: [PATCH 17/19] =?UTF-8?q?Revert=20"mini=E6=A8=A1=E5=BC=8F,?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E7=9B=B4=E6=8E=A5=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F,?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E8=AE=B0=E5=BD=95=E5=88=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E4=B8=AD"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f92af48a4ea9ea2cf11b9e8e2c714ec860dd5558.
---
 src/components/Play.vue | 19 +++++++++++++++++--
 src/lib/dexie/dexie.js  |  2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index fe2af35..1c31db0 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -221,7 +221,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { star, history, setting, shortcut, channelList, iptvSearch, sites } from '../lib/dexie'
+import { star, history, setting, shortcut, mini, channelList, iptvSearch, sites } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Player from 'xgplayer'
 import HlsJsPlayer from 'xgplayer-hls.js'
@@ -775,12 +775,27 @@ export default {
       }
     },
     async miniEvent () {
-      const miniWindowBounds = { x: win.getPosition()[0], y: win.getPosition()[1], width: win.getSize()[0], height: win.getSize()[1] }
+      this.mainWindowBounds = JSON.parse(JSON.stringify(win.getBounds()))
+      let miniWindowBounds
+      await mini.find().then(res => { if (res) miniWindowBounds = res.bounds })
+      if (!miniWindowBounds) miniWindowBounds = { x: win.getPosition()[0], y: win.getPosition()[1], width: 550, height: 340 }
       win.setBounds(miniWindowBounds)
       this.xg.getCssFullscreen()
       this.miniMode = true
     },
     async exitMiniEvent () {
+      await mini.find().then(res => {
+        let doc = {}
+        doc = {
+          id: 0,
+          bounds: win.getBounds()
+        }
+        if (res) {
+          mini.update(doc)
+        } else {
+          mini.add(doc)
+        }
+      })
       win.setBounds(this.mainWindowBounds)
       this.xg.exitCssFullscreen()
       this.miniMode = false
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index fc477ca..7c6ddf7 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -12,6 +12,8 @@ db.version(4).stores({
   recommendation: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
   sites: '++id, key, name, api, download, isActive, group',
   history: '++id, [site+ids], name, type, year, index, time, duration, detail',
+  // mini: 'id, mode, site, ids, name, index, time, url',
+  mini: 'id, bounds',
   iptv: '++id, name, url, isActive',
   channelList: '++id, name, prefer, channels, group, isActive'
 })

From a9e4a34e4fe03cb9895c5b6ee5995fe251db82c8 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sun, 22 Nov 2020 10:56:30 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=AB=E6=8D=B7=E9=94=AECtrl+0=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E6=81=A2=E5=A4=8D=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue   | 5 +++++
 src/lib/dexie/initData.js | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index 1c31db0..5333c6a 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -1149,6 +1149,11 @@ export default {
         this.miniEvent()
         return false
       }
+      if (e === 'resetMini') {
+        const miniWindowBounds = { x: this.mainWindowBounds.x, y: this.mainWindowBounds.y, width: 550, height: 340 }
+        win.setBounds(miniWindowBounds)
+        return false
+      }
     },
     changeSetting () {
       this.mtEvent()
diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js
index ad7019e..06c84a7 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -113,6 +113,11 @@ const localKey = [
     name: 'mini',
     desc: '进入或退出mini模式',
     key: 'alt+m'
+  },
+  {
+    name: 'resetMini',
+    desc: '恢复mini窗口默认大小及位置',
+    key: 'ctrl+0'
   }
 ]
 

From 418f14bcc16ba59893191e403d041ededcc0f509 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sun, 22 Nov 2020 11:20:00 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E8=B0=83=E6=95=B4Ctrl+0=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0(=E5=BC=B9=E7=AA=97=E5=AE=B9=E4=B8=8D=E4=B8=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/dexie/initData.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js
index 06c84a7..bea5a09 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -116,7 +116,7 @@ const localKey = [
   },
   {
     name: 'resetMini',
-    desc: '恢复mini窗口默认大小及位置',
+    desc: '恢复mini窗口默认',
     key: 'ctrl+0'
   }
 ]