diff --git a/src/components/Play.vue b/src/components/Play.vue index 10e92eb..8c7c93f 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -342,7 +342,7 @@ export default { videoTitle: true, airplay: true, closeVideoTouch: true, - ignores: ['cssFullscreen', 'replay', 'error'], // 为了切换播放器类型时避免显示错误刷新,暂时忽略错误 + ignores: ['replay', 'error'], // 为了切换播放器类型时避免显示错误刷新,暂时忽略错误 preloadTime: 300 }, state: { diff --git a/src/components/Setting.vue b/src/components/Setting.vue index b332d37..8bdbdf3 100644 --- a/src/components/Setting.vue +++ b/src/components/Setting.vue @@ -173,7 +173,7 @@ 取消 - 重置 + 重置 确定 @@ -187,7 +187,7 @@ 取消 - 重置 + 重置 确定 @@ -334,7 +334,7 @@ export default { this.d = res this.setting = this.d if (!this.setting.defaultParseURL) this.configDefaultParseURL() - if (!this.setting.sitesDataURL) this.getDefaultdeSitesDataURL() + if (!this.setting.sitesDataURL) this.resetDefaultSitesDataURL() }) }, getDefaultSites () { @@ -380,24 +380,20 @@ export default { this.d.excludeRootClasses = !this.d.excludeRootClasses this.updateSettingEvent() }, - async get7kParseURL () { - const parseURL = await zy.get7kParseURL() - if (parseURL.startsWith('http')) { - this.$message.success('获取成功,更新应用默认解析接口地址...') - this.setting.defaultParseURL = parseURL - } + async resetDefaultParseURL () { + this.setting.defaultParseURL = 'https://jx.bpba.cc/?v=' }, async configDefaultParseURL () { - if (!this.setting.defaultParseURL) await this.get7kParseURL() + if (!this.setting.defaultParseURL) await this.resetDefaultParseURL() this.d.defaultParseURL = this.setting.defaultParseURL?.trim() this.show.configDefaultParseUrlDialog = false this.updateSettingEvent() }, - getDefaultdeSitesDataURL () { + resetDefaultSitesDataURL () { this.setting.sitesDataURL = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json' }, configSitesDataURL () { - if (!this.setting.sitesDataURL) this.getDefaultdeSitesDataURL() + if (!this.setting.sitesDataURL) this.resetDefaultSitesDataURL() this.d.sitesDataURL = this.setting.sitesDataURL this.show.configSitesDataUrlDialog = false this.updateSettingEvent() diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js index 1f120a2..4c17e27 100644 --- a/src/lib/dexie/dexie.js +++ b/src/lib/dexie/dexie.js @@ -90,6 +90,17 @@ db.version(11).stores({ }) }) +db.version(11).stores({ + setting: 'id, theme, shortcut, view, volume, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode,' + + 'searchViewMode, password, proxy, allowPassWhenIptvCheck, autocleanWhenIptvCheck, rootClassFilter, r18ClassFilter, classFilter, restoreWindowPositionAndSize,' + + 'windowPositionAndSize, pauseWhenMinimize, sitesDataURL, defaultParseURL' +}).upgrade(trans => { + trans.setting.toCollection().modify(setting => { + setting.sitesDataURL = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json' + setting.defaultParseURL = 'https://jx.bpba.cc/?v=' + }) +}) + db.on('populate', () => { db.setting.bulkAdd(iniSetting) db.sites.bulkAdd(sites) diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js index 6a84ad6..3d759dc 100644 --- a/src/lib/site/tools.js +++ b/src/lib/site/tools.js @@ -563,15 +563,6 @@ const zy = { }) }) }, - get7kParseURL () { - return new Promise((resolve, reject) => { - axios.get('https://zy.7kjx.com/').then(res => { - const $ = cheerio.load(res.data) - const parseURL = $('body > div.container > div > div.stui-pannel > div.col-pd > p:contains("解析接口:")').first().find('a').text() - resolve(parseURL) - }).catch(err => { reject(err) }) - }) - }, getDefaultSites () { const url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json' return new Promise((resolve, reject) => {