💍 优化视频源分组功能

💄 新增或编辑源的时候, 校验key值的唯一性
💋 优化图标显示逻辑
2026-02-15 00:16:26 +08:00 · 2020-10-28 18:22:18 +08:00 · 2020-10-28 18:00:59 +08:00 · 2020-10-28 17:38:02 +08:00 · 2020-10-28 17:30:46 +08:00 · 2020-10-28 17:04:44 +08:00
15 changed files with 1921 additions and 1755 deletions
--- a/public/index.html
+++ b/public/index.html
@@ -5,16 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-    <script>
-      var _hmt = _hmt || [];
-      (function() {
-        var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?62aeb2505bfa26a2461d2a7a3b485096";
-        var s = document.getElementsByTagName("script")[0]; 
-        s.parentNode.insertBefore(hm, s);
-      })();
-    </script>    
+    <title><%= htmlWebpackPlugin.options.title %></title> 
  </head>
  <body>
    <noscript>
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -170,6 +170,9 @@
          &.note{
            width: 10%;
          }
+          &.info{
+            width: 10%;
+          }
          &.operate{
            .btn{
              width: 40px;
@@ -225,6 +228,9 @@
          cursor: pointer;
        }
      }
+      .is-loading:before {
+        background-color: none !important;
+      }
      .el-input{
        width: 200px;
      }
--- a/src/background.js
+++ b/src/background.js
@@ -7,8 +7,8 @@ import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
 import { initUpdater } from './lib/update/update'
 const isDevelopment = process.env.NODE_ENV !== 'production'

-// 允许跨域
-app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
+app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors') // 允许跨域
+app.commandLine.appendSwitch('--ignore-certificate-errors', 'true') // 忽略证书相关错误

 let win
 let mini
@@ -52,6 +52,7 @@ function createMini () {
    frame: false,
    resizable: true,
    webPreferences: {
+      sandbox: false,
      webSecurity: false,
      enableRemoteModule: true,
      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION
@@ -76,6 +77,7 @@ if (process.platform === 'darwin') {
 }
 if (process.platform === 'Linux') {
  app.disableHardwareAcceleration()
+  app.commandLine.appendSwitch('--no-sandbox') // linux 关闭沙盒模式
 }
 app.allowRendererProcessReuse = true

--- a/src/components/Aside.vue
+++ b/src/components/Aside.vue
@@ -78,8 +78,6 @@ export default {
      this.detail = {
        show: false
      }
-      const _hmt = window._hmt
-      _hmt.push(['_trackEvent', 'page', 'view', e])
    }
  }
 }
--- a/src/components/Detail.vue
+++ b/src/components/Detail.vue
@@ -326,9 +326,6 @@ export default {
          this.loading = false
        }
      })
-      const _hmt = window._hmt
-      const name = this.detail.info.name
-      _hmt.push(['_trackEvent', 'detail', 'view', name])
    }
  },
  created () {
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -3,11 +3,12 @@
    <div class="listpage-content">
      <div class="listpage-header" v-show="!enableBatchEdit">
        <el-switch v-model="enableBatchEdit" active-text="批处理分组">></el-switch>
-        <el-button @click.stop="addSite" icon="el-icon-document-add">新增</el-button>
-        <el-button @click.stop="exportSites" icon="el-icon-upload2" >导出</el-button>
-        <el-button @click.stop="importSites" icon="el-icon-download">导入</el-button>
-        <el-button @click.stop="removeAllSites" icon="el-icon-delete-solid">清空</el-button>
-        <el-button @click.stop="resetSitesEvent" icon="el-icon-refresh-left">重置</el-button>
+        <el-button @click="addSite" icon="el-icon-document-add">新增</el-button>
+        <el-button @click="exportSites" icon="el-icon-upload2" >导出</el-button>
+        <el-button @click="importSites" icon="el-icon-download">导入</el-button>
+        <el-button @click="checkAllSite" icon="el-icon-refresh" :loading="checkAllSiteLoading">检测</el-button>
+        <el-button @click="removeAllSites" icon="el-icon-delete-solid">清空</el-button>
+        <el-button @click="resetSitesEvent" icon="el-icon-refresh-left">重置</el-button>
      </div>
      <div class="listpage-header" v-show="enableBatchEdit">
        <el-switch v-model="enableBatchEdit" active-text="批处理分组"></el-switch>
@@ -20,6 +21,7 @@
          ref="editSitesTable"
          size="mini" fit height="100%" row-key="id"
          :data="sites"
+          :key="tableKey"
          @selection-change="handleSelectionChange"
          @sort-change="handleSortChange">
          <el-table-column
@@ -52,6 +54,15 @@
              <el-button type="text">{{scope.row.group}}</el-button>
            </template>
          </el-table-column>
+          <el-table-column label="状态" width="120">
+            <template slot-scope="scope">
+              <span v-show="scope.row.status === ''">
+                <i class="el-icon-loading"></i>
+                检测中...
+              </span>
+              <span v-show="scope.row.status !== ''">{{scope.row.status}}</span>
+            </template>
+          </el-table-column>
          <el-table-column
            label="操作"
            header-align="right"
@@ -78,7 +89,9 @@
            <el-input v-model="siteInfo.download" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入Download接口地址，可以空着"/>
          </el-form-item>
          <el-form-item label="分组" prop='group'>
-            <el-input v-model="siteInfo.group" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="请输入分组"/>
+            <el-select v-model="siteInfo.group" allow-create filterable default-first-option placeholder="请输入分组">
+              <el-option v-for="item in siteGroup" :key="item" :label="item" :value="item"></el-option>
+            </el-select>
          </el-form-item>
          <el-form-item label="源站标识" prop='key'>
            <el-input v-model="siteInfo.key" placeholder="请输入源站标识，如果为空，系统则自动生成" />
@@ -91,12 +104,12 @@
      </el-dialog>
    </div>
   </div>
-
  </div>
 </template>
 <script>
 import { mapMutations } from 'vuex'
 import { sites } from '../lib/dexie'
+import zy from '../lib/site/tools'
 import { remote } from 'electron'
 import { sites as defaultSites } from '../lib/dexie/initData'
 import fs from 'fs'
@@ -118,6 +131,7 @@ export default {
        group: '',
        isActive: 1
      },
+      siteGroup: [],
      rules: {
        name: [
          { required: true, message: '源站名不能为空', trigger: 'blur' }
@@ -132,7 +146,10 @@ export default {
      enableBatchEdit: false,
      batchGroupName: '',
      batchIsActive: 1,
-      multipleSelection: []
+      multipleSelection: [],
+      tableKey: 1,
+      checkAllSiteLoading: false,
+      editeOldkey: ''
    }
  },
  computed: {
@@ -192,8 +209,21 @@ export default {
          sites: res
        }
      })
+      for (const i of this.sites) {
+        delete i.status
+      }
+    },
+    getSitesGroup () {
+      const arr = []
+      for (const i of this.sites) {
+        if (arr.indexOf(i.group) < 0) {
+          arr.push(i.group)
+        }
+      }
+      this.siteGroup = arr
    },
    addSite () {
+      this.getSitesGroup()
      this.dialogType = 'new'
      this.dialogVisible = true
      this.siteInfo = {
@@ -206,15 +236,25 @@ export default {
      }
    },
    editSite (siteInfo) {
+      this.getSitesGroup()
+      if (this.checkAllSiteLoading) {
+        this.$message.info('正在检测, 请勿操作.')
+        return false
+      }
      this.dialogType = 'edit'
      this.dialogVisible = true
      this.siteInfo = siteInfo
+      this.editeOldkey = siteInfo.key
    },
    closeDialog () {
      this.dialogVisible = false
      this.getSites()
    },
    removeEvent (e) {
+      if (this.checkAllSiteLoading) {
+        this.$message.info('正在检测, 请勿操作.')
+        return false
+      }
      sites.remove(e.id).then(res => {
        this.getSites()
      }).catch(err => {
@@ -232,10 +272,26 @@ export default {
        })
      })
    },
+    checkSiteKey (e) {
+      if (this.dialogType === 'edit' && this.editeOldkey === this.siteInfo.key) {
+        return true
+      } else {
+        for (const i of this.sites) {
+          if (i.key === this.siteInfo.key) {
+            this.$message.warning(`源站标识: ${i.key} 已存在, 请勿重复填写.`)
+            return false
+          }
+        }
+        return true
+      }
+    },
    addOrEditSite () {
      if (!this.siteInfo.name || !this.siteInfo.api) {
        this.$message.error('名称和API接口不能为空。')
-        return
+        return false
+      }
+      if (!this.checkSiteKey()) {
+        return false
      }
      var randomstring = require('randomstring')
      var doc = {
@@ -247,8 +303,6 @@ export default {
        group: this.siteInfo.group,
        isActive: this.siteInfo.isActive
      }
-      const _hmt = window._hmt
-      _hmt.push(['_trackEvent', 'site', 'add', `${this.siteInfo.name}: ${this.siteInfo.api}`])
      if (this.dialogType === 'edit') sites.remove(this.siteInfo.id)
      sites.add(doc).then(res => {
        this.siteInfo = {
@@ -262,6 +316,7 @@ export default {
        this.dialogVisible = false
        this.getSites()
      })
+      this.editeOldkey = ''
    },
    exportSites () {
      this.getSites()
@@ -322,6 +377,10 @@ export default {
      this.$message.success('重置源成功')
    },
    moveToTopEvent (i) {
+      if (this.checkAllSiteLoading) {
+        this.$message.info('正在检测, 请勿操作.')
+        return false
+      }
      this.sites.sort(function (x, y) { return x.key === i.key ? -1 : y.key === i.key ? 1 : 0 })
      this.updateDatabase()
    },
@@ -365,10 +424,27 @@ export default {
          _this.updateDatabase()
        }
      })
+    },
+    async checkAllSite () {
+      this.checkAllSiteLoading = true
+      for (const i of this.sites) {
+        i.status = ''
+        this.tableKey = Math.random()
+        const flag = await zy.check(i.key)
+        if (flag) {
+          i.status = '可用'
+        } else {
+          i.status = '失效'
+          i.isActive = 0
+        }
+        this.tableKey = Math.random()
+      }
+      this.checkAllSiteLoading = false
    }
  },
  mounted () {
    this.rowDrop()
+    this.checkAllSiteLoading = false
  },
  created () {
    this.getSites()
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -13,7 +13,7 @@
        <div class="vs-placeholder" @click="show.classList = true">{{type.name}}</div>
        <div class="vs-options" v-show="show.classList">
          <ul class="zy-scroll" style="max-height: 600px;">
-            <li :class="type.tid === i.tid ? 'active' : ''" v-for="i in classList" :key="i.tid" @click="classClick(i)">{{ i.name }}</li>
+            <li :class="type.tid === i.tid ? 'active' : ''" v-for="i in classList" :key="i.tid" @click="classClick(i)">{{ i.name | classNameFilter }}</li>
          </ul>
        </div>
      </div>
@@ -87,11 +87,13 @@
              <ul>
                <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i.site, i)">
                  <span class="name">{{i.name}}</span>
-                  <span class="site">{{i.site.name}}</span>
-                  <span class="type">{{i.type}}</span>
-                  <span class="time">{{i.year}}</span>
-                  <span class="note">{{i.note}}</span>
-                  <span class="last">{{i.last}}</span>
+                  <span class="info">{{i.site.name}}</span>
+                  <span class="info">{{i.director}}</span>
+                  <span class="info">{{i.type}}</span>
+                  <span class="info">{{i.area}}</span>
+                  <span class="info">{{i.lang}}</span>
+                  <span class="info">{{i.year}}</span>
+                  <span class="info">{{i.note}}</span>
                  <span class="operate">
                    <span class="btn" @click.stop="playEvent(i.site, i)">播放</span>
                    <span class="btn" @click.stop="starEvent(i.site, i)">收藏</span>
@@ -184,6 +186,11 @@ export default {
      return this.$store.getters.getEditSites.sites // 需要监听的数据
    }
  },
+  filters: {
+    classNameFilter: (name) => {
+      return name.replace(/[^\u4e00-\u9fa5]/gi, '')
+    }
+  },
  watch: {
    view () {
      this.changeView()
@@ -214,8 +221,6 @@ export default {
          }
        })
      }
-      const _hmt = window._hmt
-      _hmt.push(['_trackEvent', 'site', 'change', e.name])
    },
    classClick (e) {
      this.show.classList = false
@@ -226,8 +231,6 @@ export default {
          this.infiniteId += 1
        }
      })
-      const _hmt = window._hmt
-      _hmt.push(['_trackEvent', 'class', 'change', e.name])
    },
    getClass () {
      return new Promise((resolve, reject) => {
@@ -410,8 +413,6 @@ export default {
      } else {
        this.searchSingleSiteEvent(this.site, wd)
      }
-      const _hmt = window._hmt
-      _hmt.push(['_trackEvent', 'film', 'search', wd])
    },
    searchAllSitesEvent (sites, wd) {
      this.searchTxt = wd
@@ -431,13 +432,17 @@ export default {
            const type = Object.prototype.toString.call(res)
            if (type === '[object Array]') {
              res.forEach(element => {
-                element.site = site
-                this.searchContents.push(element)
+                zy.detail(site.key, element.id).then(detailRes => {
+                  detailRes.site = site
+                  this.searchContents.push(detailRes)
+                })
              })
            }
            if (type === '[object Object]') {
-              res.site = site
-              this.searchContents.push(res)
+              zy.detail(site.key, res.id).then(detailRes => {
+                detailRes.site = site
+                this.searchContents.push(detailRes)
+              })
            }
          })
        })
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -3,23 +3,20 @@
    <div class="box">
      <div class="title">
        <span v-if="this.right.list.length > 1">『第 {{(video.info.index + 1)}} 集』</span>{{name}}
-        <span v-if="video.key" class="right" @click="playWithExternalPalyerEvent" title="使用第三方播放器">
-          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-            <polygon points="20 8 20 20 4 20 4 8"></polygon>
-            <polyline stroke-linejoin="round" points="8 4 12 7.917 16 4"></polyline>
-          </svg>
-        </span>
-        <span v-if="video.key" class="right" @click="issueEvent" title="复制调试信息">
-          <svg t="1596338860607" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3127" width="24" height="24">
-            <path d="M503.803829 63.578014c-247.050676 0-447.328072 200.277396-447.328072 447.327048 0 247.054769 200.277396 447.333188 447.328072 447.333188 247.054769 0 447.332165-200.278419 447.332165-447.333188C951.13497 263.85541 750.858598 63.578014 503.803829 63.578014L503.803829 63.578014zM503.803829 894.313336c-211.749682 0-383.408273-171.659615-383.408273-383.408273 0-211.749682 171.659615-383.40725 383.408273-383.40725 211.753775 0 383.412366 171.658591 383.412366 383.40725C887.216195 722.653721 715.557604 894.313336 503.803829 894.313336L503.803829 894.313336zM447.745069 255.897158l127.914298 0L575.659367 383.576095 447.745069 383.576095 447.745069 255.897158 447.745069 255.897158zM447.745069 425.470251l127.914298 0 0 342.058516L447.745069 767.528767 447.745069 425.470251 447.745069 425.470251zM447.745069 425.470251" p-id="3128"></path>
-          </svg>
-        </span>
      </div>
      <div class="player">
        <div id="xgplayer"></div>
      </div>
      <div class="more">
-        <span class="zy-svg" @click="nextEvent" v-show="showNext">
+        <span class="zy-svg" @click="otherEvent" v-show="name !== ''">
+          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="coloursIconTitle">
+            <title id="coloursIconTitle">换源</title>
+            <circle cx="12" cy="9" r="5"></circle>
+            <circle cx="9" cy="14" r="5"></circle>
+            <circle cx="15" cy="14" r="5"></circle>
+          </svg>
+        </span>
+        <span class="zy-svg" @click="nextEvent" v-show="right.list.length > 1">
          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="forwardIconTitle">
            <title id="forwardIconTitle">下一集</title>
            <path d="M10 14.74L3 19V5l7 4.26V5l12 7-12 7v-4.26z"></path>
@@ -58,8 +55,14 @@
          </svg>
        </span>
        <span class="zy-svg" @click="miniEvent" v-show="right.list.length > 0">
+          <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" aria-labelledby="diamondIconTitle">
+            <title id="diamondIconTitle">精简模式</title>
+            <path d="M12 20L3 11M12 20L21 11M12 20L8 11M12 20L16 11M3 11L7 5M3 11H8M7 5L8 11M7 5H12M17 5L21 11M17 5L16 11M17 5H12M21 11H16M8 11H16M8 11L12 5M16 11L12 5"></path>
+          </svg>
+        </span>
+        <span class="zy-svg" @click="playWithExternalPalyerEvent" v-show="right.list.length > 0">
          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="tvIconTitle">
-            <title id="tvIconTitle">精简模式</title>
+            <title id="tvIconTitle" >使用第三方播放器</title>
            <polygon points="20 8 20 20 4 20 4 8"></polygon>
            <polyline stroke-linejoin="round" points="8 4 12 7.917 16 4"></polyline>
          </svg>
@@ -81,13 +84,21 @@
            <rect x="17" y="6" width="1" height="1"></rect>
          </svg>
        </span>
+        <span class="zy-svg" @click="issueEvent" v-show="right.list.length > 0">
+          <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="infoIconTitle">
+            <title id="infoIconTitle">复制调试信息</title>
+            <path d="M12,12 L12,15"></path>
+            <line x1="12" y1="9" x2="12" y2="9"></line>
+            <circle cx="12" cy="12" r="10"></circle>
+          </svg>
+        </span>
        <span class="last-tip" v-if="!video.key && right.history.length > 0" @click="historyItemEvent(right.history[0])">上次播放到【{{right.history[0].site}}】{{right.history[0].name}} 第{{right.history[0].index+1}}集</span>
      </div>
    </div>
    <transition name="slideX">
      <div v-if="right.show" class="list">
        <div class="list-top">
-          <span class="list-top-title">{{ right.type === 'list' ? '播放列表' : '历史记录' }}</span>
+          <span class="list-top-title">{{ right.type === 'list' ? '播放列表' : right.type === 'history' ? '历史记录' : '其他相同资源' }}</span>
          <span class="list-top-close zy-svg" @click="closeListEvent">
            <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="closeIconTitle">
              <title id="closeIconTitle">关闭</title>
@@ -106,6 +117,10 @@
            <li v-show="right.history.length === 0">无数据</li>
            <li @click="historyItemEvent(m)" :class="video.info.id === m.ids ? 'active' : ''" v-for="(m, n) in right.history" :key="n"><span class="title" :title="'【' + m.site + '】' + m.name + ' 第' + (m.index+1) + '集'">【{{m.site}}】{{m.name}} 第{{m.index+1}}集</span><span @click.stop="removeHistoryItem(m)" class="detail-delete">删除</span></li>
          </ul>
+          <ul v-show="right.type === 'other'" class="list-other">
+            <li v-show="right.other.length === 0">无数据</li>
+            <li @click="otherItemEvent(m)" v-for="(m, n) in right.other" :key="n"><span class="title">{{m.name}} - [{{m.site}}]</span></li>
+          </ul>
        </div>
      </div>
    </transition>
@@ -113,7 +128,7 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import { star, history, setting, shortcut, mini, iptv } from '../lib/dexie'
+import { star, history, setting, shortcut, mini, iptv, sites } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Player from 'xgplayer'
 import Hls from 'xgplayer-hls.js'
@@ -170,6 +185,7 @@ export default {
      right: {
        show: false,
        type: '',
+        other: [],
        list: [],
        history: []
      },
@@ -202,7 +218,6 @@ export default {
      length: 0,
      timer: null,
      scroll: false,
-      showNext: false,
      isStar: false,
      isTop: false,
      mini: {},
@@ -288,6 +303,9 @@ export default {
  methods: {
    ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
    async getUrls () {
+      if (this.video.key === '') {
+        return false
+      }
      this.name = ''
      if (this.timer !== null) {
        clearInterval(this.timer)
@@ -302,8 +320,6 @@ export default {
        this.playUrl(this.video.iptv.url)
        this.name = this.video.iptv.name
        this.getIptvList()
-        const _hmt = window._hmt
-        _hmt.push(['_trackEvent', 'IPTV', 'play', this.name])
      } else {
        const index = this.video.info.index | 0
        let time = 0
@@ -323,7 +339,6 @@ export default {
    playVideo (index = 0, time = 0) {
      this.fetchM3u8List().then(m3u8Arr => {
        this.xg.src = m3u8Arr[index]
-        this.showNext = m3u8Arr.length > 1

        if (time !== 0) {
          this.xg.play()
@@ -350,12 +365,9 @@ export default {
        if (VIDEO_DETAIL_CACHE[cacheKey]) {
          this.name = VIDEO_DETAIL_CACHE[cacheKey].name
          resolve(VIDEO_DETAIL_CACHE[cacheKey].list)
-          return
        }
        zy.detail(this.video.key, this.video.info.id).then(res => {
          this.name = res.name
-          const _hmt = window._hmt
-          _hmt.push(['_trackEvent', 'film', 'play', res.name])
          const dd = res.dl.dd
          const type = Object.prototype.toString.call(dd)
          let m3u8Txt = []
@@ -720,6 +732,70 @@ export default {
        this.$message.warning('删除历史记录失败, 错误信息: ' + err)
      })
    },
+    getAllsitestest () {
+      this.name = '喜宝'
+      sites.all().then(res => {
+        const sites = res
+        const arr = []
+        for (const i of sites) {
+          zy.search(i.key, this.name).then(res => {
+            const type = Object.prototype.toString.call(res)
+            if (type === '[object Array]') {
+              res.forEach(element => {
+                zy.detail(i.key, element.id).then(detailRes => {
+                  arr.push(detailRes)
+                })
+              })
+            }
+            if (type === '[object Object]') {
+              zy.detail(i.key, res.id).then(detailRes => {
+                arr.push(detailRes)
+              })
+            }
+          })
+        }
+        console.log(arr, 'arr')
+      })
+    },
+    async getAllsites () {
+      const all = await sites.all()
+      this.right.other = []
+      for (const i of all) {
+        if (i.isActive) {
+          const searchRes = await zy.search(i.key, this.name)
+          const type = Object.prototype.toString.call(searchRes)
+          if (type === '[object Array]') {
+            searchRes.forEach(async element => {
+              const detailRes = await zy.detail(i.key, element.id)
+              detailRes.key = i.key
+              detailRes.site = i.name
+              this.right.other.push(detailRes)
+            })
+          }
+          if (type === '[object Object]') {
+            const detailRes = await zy.detail(i.key, searchRes.id)
+            detailRes.key = i.key
+            detailRes.site = i.name
+            this.right.other.push(detailRes)
+          }
+        }
+      }
+    },
+    otherEvent (m) {
+      this.right.type = 'other'
+      this.getAllsites()
+      this.right.show = true
+    },
+    async otherItemEvent (e) {
+      const db = await history.find({ site: e.key, ids: e.id })
+      if (db) {
+        this.video = { key: db.site, info: { id: db.ids, name: db.name, index: db.index, site: e.key } }
+      } else {
+        this.video = { key: e.key, info: { id: e.id, name: e.name, index: 0, site: e.key } }
+      }
+      this.right.show = false
+      this.right.type = ''
+    },
    mtEvent () {
      setting.find().then(res => {
        if (res.shortcut) {
@@ -1000,18 +1076,17 @@ export default {
      let timerID
      ev.forEach(item => {
        this.xg.root.addEventListener(item, () => {
-          if (!this.xg.fullscreen) {
-            return
+          if (this.xg && this.xg.fullscreen) {
+            const videoTitle = document.querySelector('.xg-view-videoTitle')
+            videoTitle.style.display = 'block'
+            clearTimeout(timerID)
+            timerID = setTimeout(() => {
+              // 播放中自动消失
+              if (this.xg && !this.xg.paused) {
+                videoTitle.style.display = 'none'
+              }
+            }, 3000)
          }
-          const videoTitle = document.querySelector('.xg-view-videoTitle')
-          videoTitle.style.display = 'block'
-          clearTimeout(timerID)
-          timerID = setTimeout(() => {
-            // 播放中自动消失
-            if (this.xg && !this.xg.paused) {
-              videoTitle.style.display = 'none'
-            }
-          }, 3000)
        })
      })

@@ -1023,13 +1098,15 @@ export default {
      if (this.xg.fullscreen) {
        this.xg.exitFullscreen()
      }
+      clearInterval(this.timer)
+      this.video.key = ''
      this.xg.src = ''
      this.config.src = ''
      this.xg.destroy(false)
      this.xg = null
      this.name = ''
      this.right.list = []
-      this.showNext = false
+      this.getAllhistory()
      setTimeout(() => {
        this.xg = new Hls(this.config)
        this.playerInstall()
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -145,7 +145,6 @@ import { setting, sites, shortcut } from '../lib/dexie'
 import { sites as defaultSites } from '../lib/dexie/initData'
 import { shell, clipboard, remote, ipcRenderer } from 'electron'
 import db from '../lib/dexie/dexie'
-const _hmt = window._hmt
 export default {
  name: 'setting',
  data () {
@@ -310,7 +309,6 @@ export default {
    changeTheme (e) {
      this.d.theme = e
      this.updateSettingEvent()
-      _hmt.push(['_trackEvent', 'setting', 'theme', e])
    },
    changeShortcut (e) {
      this.d.shortcut = e
--- a/src/components/Share.vue
+++ b/src/components/Share.vue
@@ -69,8 +69,6 @@ export default {
      const id = this.share.info.ids || this.share.info.id
      zy.detail(this.share.key, id).then(res => {
        if (res) {
-          const _hmt = window._hmt
-          _hmt.push(['_trackEvent', 'film', 'share', res.name])
          this.pic = res.pic
          var m3u8List = {}
          const dd = res.dl.dd
--- a/src/lib/dexie/iniData/Iptv.json
+++ b/src/lib/dexie/iniData/Iptv.json
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
--- a/src/lib/element/index.js
+++ b/src/lib/element/index.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { Message, Button, Table, TableColumn, Tag, Input, Dialog, Form, FormItem, Switch } from 'element-ui'
+import { Message, Button, Table, TableColumn, Tag, Input, Dialog, Form, FormItem, Switch, Select, Option } from 'element-ui'
 import Plugin from 'v-fit-columns'
 Vue.use(Button)
 Vue.use(Table)
@@ -11,4 +11,6 @@ Vue.use(Form)
 Vue.use(FormItem)
 Vue.use(Switch)
 Vue.use(Plugin)
+Vue.use(Select)
+Vue.use(Option)
 Vue.prototype.$message = Message
--- a/src/lib/site/tools.js
+++ b/src/lib/site/tools.js
@@ -193,6 +193,23 @@ const zy = {
        }
      })
    })
+  },
+  /**
+   * 检查资源
+   * @param {*} key 资源网 key
+   * @returns boolean
+   */
+  async check (key, id) {
+    try {
+      const cls = await this.class(key)
+      if (cls) {
+        return true
+      } else {
+        return false
+      }
+    } catch (e) {
+      return false
+    }
  }
 }

--- a/src/mini/Mini.vue
+++ b/src/mini/Mini.vue
@@ -395,8 +395,6 @@ export default {
    this.xg = new Hls(this.config)
    this.mtEvent()
    this.getUrls()
-    const _hmt = window._hmt
-    _hmt.push(['_trackEvent', 'page', 'view', 'mini'])
  },
  beforeDestroy () {
    clearInterval(this.timer)
Author	SHA1	Message	Date
Hunlongyu	61dcb1ec49	💍 优化视频源分组功能	2020-10-28 18:22:18 +08:00
Hunlongyu	40b853361e	💄 新增或编辑源的时候, 校验key值的唯一性	2020-10-28 18:00:59 +08:00
Hunlongyu	57ff3325f0	💋 优化图标显示逻辑	2020-10-28 17:38:02 +08:00
Hunlongyu	c4283e2da0	🎓 优化播放页图标, 优化视频停止播放后不显示历史记录提示. 修复报错	2020-10-28 17:30:46 +08:00
Hunlongyu	7052bd7e05	🎩 新增播放视频时换源功能.	2020-10-28 17:04:44 +08:00
Hunlongyu	64a12a06c4	👒 移除百度统计, 主要是记录缺失, 并且不准确	2020-10-28 15:38:02 +08:00
Hunlongyu	3df3b385ce	⛑ 新增分类过滤器, 主要针对豆瓣资源网分类出错问题	2020-10-28 15:34:33 +08:00
Hunlongyu	e77db4711e	🧢 优化视频源检测功能	2020-10-28 15:33:30 +08:00
Hunlongyu	fb3fd26870	Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player into master	2020-10-28 12:00:14 +08:00
Hunlongyu	72790f5f3e	👑 添加了视频源检测功能.	2020-10-28 11:59:55 +08:00
haiyangcui	ea2815969d	把IPTV的初始数据放入单独的Json文件中	2020-10-27 23:12:30 +01:00
Hunlongyu	e330cff7d4	🧦 electron 优化, 忽略证书错误, 关闭沙盒.	2020-10-27 11:43:11 +08:00
haiyangcui	da5b91535e	搜索后获取详细信息并展示	2020-10-26 23:53:12 +01:00