From 6bd18e807817d3bce91de6b9b28770579a9636a5 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 26 Sep 2019 00:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0=E5=BC=B9?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++++ publish/changeLog.md | 7 +++++ src/renderer/App.vue | 5 ++++ src/renderer/components/core/Player.vue | 2 +- src/renderer/components/material/Modal.vue | 4 +-- src/renderer/components/material/Select.vue | 3 +- .../components/material/VersionModal.vue | 29 +++++++++++-------- src/renderer/store/actions.js | 10 ++++--- src/renderer/utils/request.js | 2 +- src/renderer/views/Setting.vue | 2 +- 10 files changed, 50 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 70bbb81b..8e37e29b 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,14 @@ npm run pack 注意：**绿色版**的软件更新功能**不可用**，为了能及时地获取更新，建议使用安装版！！
注意：**Mac版**、**Linux deb**版不支持自动更新！ +#### 安装安装版失败 + +对于部分电脑出现安装失败的问题我也不懂什么原因，，可以尝试清理下安装文件，或者重启电脑试试。 + +#### 缺少`xxx.dll` + +这个是电脑缺少某些dll导致的，正常的系统是没有这个问题的，解决办法需自行百度弹出的错误信息看下别人是怎么解决的。 + ### 致谢 感谢 [@messoer](https://github.com/messoer) 曾经提供的部分音乐API！ diff --git a/publish/changeLog.md b/publish/changeLog.md index daa382c2..15937808 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -6,3 +6,10 @@ ### 优化 - 新增DNS解析缓存，加快请求速度 +- 优化代码逻辑，减少软件对系统资源的占用 +- 优化新版本信息检测，尽量减少弹出版本获取失败弹窗弹出的概率 +- 优化下拉列表动画效果 + +### 修复 + +- 修复一些小Bug diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 4f07a4ee..749b7d5b 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -106,6 +106,11 @@ export default { this.showUpdateModal() }) }) + this.setVersionModalVisible({ isError: true }) + this.clearUpdateTimeout() + this.$nextTick(() => { + this.showUpdateModal() + }) rendererOn('update-downloaded', () => { this.clearUpdateTimeout() this.setVersionModalVisible({ isError: false }) diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index cf12ab8a..807631b2 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -622,7 +622,7 @@ export default { height: 100%; transform-origin: 0; transition-property: transform; - transition-timing-function: ease; + transition-timing-function: ease-out; border-radius: @radius-progress-border; } .progress-bar1 { diff --git a/src/renderer/components/material/Modal.vue b/src/renderer/components/material/Modal.vue index e9c66891..546e5073 100644 --- a/src/renderer/components/material/Modal.vue +++ b/src/renderer/components/material/Modal.vue @@ -134,7 +134,7 @@ export default { flex-flow: column nowrap; > * { - background-color: @color-theme_2; + background-color: @color-theme_2-background_2; } } @@ -176,7 +176,7 @@ each(@themes, { .content { box-shadow: 0 0 3px rgba(0, 0, 0, .3); > * { - background-color: ~'@{color-@{value}-theme_2}'; + background-color: ~'@{color-@{value}-theme_2-background_2}'; } } diff --git a/src/renderer/components/material/Select.vue b/src/renderer/components/material/Select.vue index e750be23..36cc6fff 100644 --- a/src/renderer/components/material/Select.vue +++ b/src/renderer/components/material/Select.vue @@ -99,7 +99,7 @@ export default { border-bottom: 2px solid @color-tab-border-bottom; border-left: 2px solid @color-tab-border-bottom; border-bottom-left-radius: 4px; - background-color: @color-theme_2; + background-color: @color-theme_2-background_2; opacity: 0; transform: scaleY(0); transform-origin: 0 0 0; @@ -144,6 +144,7 @@ each(@themes, { .list { border-bottom-color: ~'@{color-@{value}-tab-border-bottom}'; border-left-color: ~'@{color-@{value}-tab-border-bottom}'; + background-color: ~'@{color-@{value}-theme_2-background_2}'; li { // color: ~'@{color-@{value}-btn}'; background-color: ~'@{color-@{value}-btn-background}'; diff --git a/src/renderer/components/material/VersionModal.vue b/src/renderer/components/material/VersionModal.vue index 799621a2..279749d2 100644 --- a/src/renderer/components/material/VersionModal.vue +++ b/src/renderer/components/material/VersionModal.vue @@ -17,16 +17,19 @@ material-modal(:show="version.showModal" @close="handleClose") div(:class="$style.footer" v-if="version.isError") div(:class="$style.desc" v-if="!isUnknow") - p 发现有新版本啦，但是自动更新功能出问题了 + p 发现有新版本啦，但是自动更新功能出问题了， p | 你现在可以选择继续使用当前版本或 strong 去发布页下载新版本 - | ，推荐到 - strong 网盘 - | 下载 + | ， + p + | 国内Windows/MAC用户推荐到 + strong.hover.underline(@click="handleOpenUrl('https://www.lanzous.com/b906260/')") 网盘(点击打开) + | 下载，密码： + strong.hover(@click="handleCopy('glqw')" title="点击复制") glqw div(:class="$style.btns") material-btn(:class="$style.btn" @click.onec="handleIgnoreClick") 忽略该版本 - material-btn(:class="$style.btn" @click.onec="handleOpenPageClick") 去下载新版本 + material-btn(:class="$style.btn" @click.onec="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop#readme')") 去软件发布页 div(:class="$style.footer" v-else) div(:class="$style.desc") p 新版本已下载完毕， @@ -43,7 +46,7 @@ material-modal(:show="version.showModal" @close="handleClose") @@ -123,6 +129,7 @@ export default { line-height: 1.5; overflow-y: auto; height: 100%; + padding-right: 5px; } .current { > p { @@ -169,12 +176,9 @@ export default { flex: 0 0 none; .desc { font-size: 12px; - padding: 10px 0; + padding-top: 10px; color: @color-theme; line-height: 1.2; - strong { - text-decoration: underline; - } } } .btn { @@ -183,6 +187,7 @@ export default { } .btns { display: grid; + padding-top: 10px; grid-template-columns: 1fr 1fr; grid-gap: 0 10px; } diff --git a/src/renderer/store/actions.js b/src/renderer/store/actions.js index c6ac3331..82d87fdd 100644 --- a/src/renderer/store/actions.js +++ b/src/renderer/store/actions.js @@ -3,15 +3,17 @@ import { httpGet } from '../utils/request' import { author, name } from '../../../package.json' export default { - getVersionInfo() { + getVersionInfo(state, retryNum = 0) { return new Promise((resolve, reject) => { - httpGet(`https://raw.githubusercontent.com/${author.name}/${name}/master/publish/version.json`, (err, resp, body) => { + httpGet(`https://raw.githubusercontent.com/${author.name}/${name}/master/publish/version.json`, { + timeout: 20000, + }, (err, resp, body) => { if (err) { - return resolve({ + return ++retryNum > 3 ? resolve({ version: '0.0.0', desc: '

版本信息获取失败

', history: [], - }) + }) : this.dispatch('getVersionInfo', retryNum).then(ver => resolve(ver)) } resolve(body) }) diff --git a/src/renderer/utils/request.js b/src/renderer/utils/request.js index 439750e8..69e633ce 100644 --- a/src/renderer/utils/request.js +++ b/src/renderer/utils/request.js @@ -231,7 +231,7 @@ const getProxyInfo = () => window.globalObj.proxy.enable const fetchData = (url, method, { headers = {}, format = 'json', - timeout = 1000, + timeout = 15000, ...options }, callback) => { // console.log(url, options) diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue index a6de46b0..90d60474 100644 --- a/src/renderer/views/Setting.vue +++ b/src/renderer/views/Setting.vue @@ -134,7 +134,7 @@ div.scroll(:class="$style.setting") | 支持作者哦~~🍻 p span 如果你资金充裕，还可以 - material-btn(@click="handleOpenUrl('https://cdn.stsky.cn/qrc.png')" min title="土豪，你好 🙂") 打赏下作者 + material-btn(@click="handleOpenUrl('https://cdn.stsky.cn/qrc.png')" min title="土豪，你好 🙂") 捐赠下作者 span ，以帮我分担点服务器费用~❤️ p.small | 本软件仅用于学习交流使用，禁止将本软件用于