From 24b84e4b12a3d2a51a0cb1d0ebf24d4496fdc288 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Wed, 7 Oct 2020 22:10:11 +0200
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E7=94=B5=E8=A7=86=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E6=97=B6,=E5=88=97=E8=A1=A8=E4=B8=BA=E9=A2=91?=
 =?UTF-8?q?=E9=81=93=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IPTV.vue |  4 +--
 src/components/Play.vue | 57 ++++++++++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/components/IPTV.vue b/src/components/IPTV.vue
index 05d1d14..7b3e7cc 100644
--- a/src/components/IPTV.vue
+++ b/src/components/IPTV.vue
@@ -94,7 +94,7 @@ export default {
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
     playEvent (e) {
-      this.video = { info: { url: e.url } }
+      this.video = { iptv: { name: e.name, url: e.url } }
       this.view = 'Play'
     },
     containSearchKeyword (i) {
@@ -189,7 +189,7 @@ export default {
     },
     getAllSites () {
       iptv.all().then(res => {
-        this.iptvList = [...new Set(res)]
+        this.iptvList = res
       })
     }
   },
diff --git a/src/components/Play.vue b/src/components/Play.vue
index d597c27..6ac6133 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -113,7 +113,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { star, history, setting, shortcut, mini } from '../lib/dexie'
+import { star, history, setting, shortcut, mini, iptv } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Player from 'xgplayer'
 import Hls from 'xgplayer-hls.js'
@@ -204,7 +204,8 @@ export default {
       showNext: false,
       isStar: false,
       isTop: false,
-      mini: {}
+      mini: {},
+      iptvList: []
     }
   },
   filters: {
@@ -296,10 +297,10 @@ export default {
           this.xg.pause()
         }
       }
-
-      if (this.video.info.url) {
+      if (this.video.iptv && this.video.iptv.url) {
         // 如果info里含有有url，是直播源，直接播放
-        this.playUrl(this.video.info.url)
+        this.playUrl(this.video.iptv.url)
+        this.getIptvList()
       } else {
         const index = this.video.info.index | 0
         let time = 0
@@ -861,22 +862,31 @@ export default {
       }
       ul.style.display = 'none'
       let li = ''
-      if (this.right.list.length === 0) {
-        li = '<li>无数据</li>'
+      if (this.video.iptv && this.video.iptv.url) {
+        // 直播频道列表
+        let index = 0
+        this.iptvList.forEach(e => {
+          li += `<li data-index="${index}" title="${e.name}">${e.name}</li>`
+          index += 1
+        })
       } else {
-        for (let index = 0; index < this.right.list.length; index++) {
-          const item = this.right.list[index]
-          const num = item.split('$')
-          let title
-          if (num.length > 1) {
-            title = num[0]
-          } else {
-            title = `第${(index + 1)}集`
-          }
-          if (index === this.video.info.index) {
-            li += `<li class="selected" data-index="${index}" title="${title}">${title}</li>`
-          } else {
-            li += `<li data-index="${index}" title="${title}">${title}</li>`
+        if (this.right.list.length === 0) {
+          li = '<li>无数据</li>'
+        } else {
+          for (let index = 0; index < this.right.list.length; index++) {
+            const item = this.right.list[index]
+            const num = item.split('$')
+            let title
+            if (num.length > 1) {
+              title = num[0]
+            } else {
+              title = `第${(index + 1)}集`
+            }
+            if (index === this.video.info.index) {
+              li += `<li class="selected" data-index="${index}" title="${title}">${title}</li>`
+            } else {
+              li += `<li data-index="${index}" title="${title}">${title}</li>`
+            }
           }
         }
       }
@@ -910,7 +920,7 @@ export default {
       let li = ''
       if (this.right.history.length === 0) {
         li = '<li>无数据</li>'
-      } else {
+      } else if (!this.video.iptv) {
         window.historyItemEvent = this.historyItemEvent.bind(this)
         for (let index = 0; index < this.right.history.length; index++) {
           const item = this.right.history[index]
@@ -924,6 +934,11 @@ export default {
       }
       ul.innerHTML = li
     },
+    getIptvList () {
+      iptv.all().then(res => {
+        this.iptvList = res
+      })
+    },
     bindEvent () {
       this.xg.on('playNextOne', () => {
         this.nextEvent()