发布v0.3.0版本

.gitignore

@@ -34,6 +34,7 @@ build/Release
 
 # Dependency directories
 node_modules/
+node_modules.bak*/
 jspm_packages/
 
 # TypeScript v1 declaration files

.travis.yml

@@ -0,0 +1,43 @@
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode10.2
+      language: node_js
+      node_js: "12"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+    - os: linux
+      language: node_js
+      node_js: "12"
+      dist: trusty
+      services: docker
+      language: generic
+
+cache:
+  directories:
+    - node_modules
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
+    - $HOME/.npm/_prebuilds
+
+notifications:
+  email: false
+
+script:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      npm install && npm run publish:gh:linux
+    else
+      npm run publish:gh:mac
+    fi
+
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+
+# only run this script on pull requests and merges into
+# the 'master' and 'prod' branches
+branches:
+  only:
+    - master

CHANGELOG.md

@@ -6,23 +6,21 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## [0.2.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.2...v0.2.3) - 2019-08-22
+## [0.3.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.3...v0.3.0) - 2019-08-24
 
 ### 新增
 
-- 新增任务栏程序标题改变功能（播放歌曲时任务栏标题将显示当前播放的歌曲）
+- 新增**MAC**及**Linux**版本（需要的可自行下载）
+- 新增音量调整
+- 新增任务栏播放进度条控制选项（现在可在设置界面关闭在任务栏显示的播放进度）
+- 新增更新出错时的弹窗提示
+- 从该版本起，非安装版也会有更新弹窗提醒了，但仍然需要手动下载新版本更新，版本信息可到设置页面查看
 
 ### 修复
 
-- 使用临时接口时，试听列表中的下载按钮仍然能点击的Bug
-- 修复某些情况下歌曲链接未能缓存的问题
+- 强制把临时接口设置回 `messoer` 接口
 
-### 移除
-
-- 移除临时接口（因服务器被攻击，本接口已关闭）
-- 移除列表栏设置的隐藏专辑栏选项（感觉这个设置并没有什么luan用，并且还会打破布局）
-
-## [0.2.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.2...v0.2.2) - 2019-08-22
+## [0.2.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.2...v0.2.3) - 2019-08-22
 
 ### 新增
 

README.md

@@ -3,6 +3,7 @@
 <p align="center">
   <a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/release/lyswhut/lx-music-desktop" alt="Release version"></a>
   <a href="https://ci.appveyor.com/project/lyswhut/lx-music-desktop"><img src="https://ci.appveyor.com/api/projects/status/flrsqd5ymp8fnte5?svg=true" alt="Build status"></a>
+  <a href="https://travis-ci.org/lyswhut/lx-music-desktop"><img src="https://travis-ci.org/lyswhut/lx-music-desktop.svg?branch=master" alt="Build status"></a>
   <a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/downloads/lyswhut/lx-music-desktop/latest/total" alt="Downloads"></a>
   <a href="https://github.com/lyswhut/lx-music-desktop/tree/dev"><img src="https://img.shields.io/github/package-json/v/lyswhut/lx-music-desktop/dev" alt="Dev branch version"></a>
   <!-- <a href="https://github.com/lyswhut/lx-music-desktop/blob/master/LICENSE"><img src="https://img.shields.io/github/license/lyswhut/lx-music-desktop" alt="License"></a> -->
@@ -30,25 +31,29 @@
 
 ### 说明
 
-一个基于 Electron + Vue 开发的 Windows 版音乐软件。
+一个基于 Electron + Vue 开发的音乐软件。
 
 所用技术栈：
 
 - Electron 6.x
 - Vue 2.x
 
+已支持的平台：
+
+- Windows 7 及以上
+- Mac OS
+- Linux
+
 软件变化请查看：[更新日志](https://github.com/lyswhut/lx-music-desktop/blob/master/CHANGELOG.md)<br>
 软件下载请转到：[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)<br>
-或者到网盘下载：<br>
-`https://www.lanzous.com/b906260/`<br>
-`密码:glqw`
+或者到网盘下载：`https://www.lanzous.com/b906260/` 密码：`glqw`
 
 #### 关于软件更新
 
 软件启动时若发现新版本时会自动从本仓库下载安装包，下载完毕会弹窗提示更新。<br>
 若下载未完成时软件被关闭，下次启动软件会再次自动下载。<br>
 目前暂未添加跳过更新某个版本的功能。<br>
-**注意：**绿色版的软件更新功能不可用！
+注意：**绿色版**的软件更新功能**不可用**，为了能及时地获取更新，建议使用安装版！！
 
 ### 源码使用方法
 
@@ -61,7 +66,7 @@ npm run dev
 # 构建免安装版
 npm run pack:dir
 
-# 构建安装包
+# 构建安装包（windows版）
 npm run pack
 
 ```

licenses/license_en.txt

@@ -0,0 +1,5 @@
+This program is only for learning to communicate!
+Do not use for commercial purposes! !
+All consequences of using this software are borne by the user!
+
+By: lyswhut

licenses/license_zh.txt

@@ -0,0 +1,5 @@
+本程序仅用于学习交流使用！
+请勿用于商业用途！！
+使用本软件造成的一切后果由使用者承担！
+
+By: 落雪无痕

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,13 +1,13 @@
 {
   "name": "lx-music-desktop",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
   "scripts": {
-    "pack": "node build-config/pack.js && npm run pack:win:setup",
+    "pack": "node build-config/pack.js && npm run pack:win",
     "pack:win": "npm run pack:win:setup && npm run pack:win:7z",
-    "pack:win:setup": "cross-env TARGET=Setup ARCH=x64_x86 electron-builder -w=nsis",
+    "pack:win:setup": "cross-env TARGET=Setup ARCH=x64_x86 electron-builder -w=nsis --x64 --ia32",
     "pack:win:portable": "npm run pack:win:portable:x64_x86 && npm run pack:win:portable:x64 && npm run pack:win:portable:x86",
     "pack:win:portable:x64_x86": "cross-env TARGET=便携版 ARCH=x64_x86 electron-builder -w=portable --x64 --ia32",
     "pack:win:portable:x64": "cross-env TARGET=便携版 ARCH=x64 electron-builder -w=portable --x64",
@@ -26,6 +26,15 @@
     "publish:win:7z": "npm run publish:win:7z:x64 && npm run publish:win:7z:x86",
     "publish:win:7z:x64": "cross-env TARGET=green ARCH=x64 electron-builder -w=7z --x64 -p onTagOrDraft",
     "publish:win:7z:x86": "cross-env TARGET=green ARCH=x86 electron-builder -w=7z --ia32 -p onTagOrDraft",
+    "publish:gh:mac": "node build-config/pack.js && npm run publish:mac",
+    "publish:mac": "npm run publish:mac:dmg",
+    "publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft",
+    "publish:gh:linux": "node build-config/pack.js && npm run publish:linux",
+    "publish:linux": "npm run publish:linux:appImage && npm run publish:linux:deb",
+    "publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft",
+    "publish:linux:deb": "npm run publish:linux:deb:x64 && npm run publish:linux:deb:x86",
+    "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft",
+    "publish:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32 -p onTagOrDraft",
     "pack:linux": "node build-config/pack.js && electron-builder -l",
     "pack:dir": "node build-config/pack.js && electron-builder --dir",
     "dev": "node build-config/runner-dev.js",
@@ -53,43 +62,51 @@
     "files": [
       "dist/electron/**/*"
     ],
+    "extraResources": [
+      "./licenses"
+    ],
     "win": {
-      "icon": "src/static/icons/lunch.ico",
+      "icon": "./resources/icons/256x256.ico",
       "legalTrademarks": "lyswhut",
       "artifactName": "${productName} v${version} ${env.ARCH} ${env.TARGET}.${ext}"
     },
+    "mac": {
+      "icon": "./resources/icons/512x512.png",
+      "category": "public.app-category.music"
+    },
     "linux": {
-      "target": [
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "arch": [
-            "ia32",
-            "x64"
-          ],
-          "target": "deb"
-        },
-        {
-          "arch": [
-            "x64"
-          ],
-          "target": "snap"
-        }
-      ],
-      "maintainer": "lyswhut <lyswuhut@qq.com>"
+      "maintainer": "lyswhut <lyswuhut@qq.com>",
+      "artifactName": "${productName} v${version} ${env.ARCH}.${ext}"
     },
     "nsis": {
       "oneClick": false,
       "language": "2052",
       "allowToChangeInstallationDirectory": true,
       "differentialPackage": true,
-      "license": "./license.rtf",
+      "license": "./licenses/license.rtf",
       "shortcutName": "lx-music"
     },
+    "dmg": {
+      "contents": [
+        {
+          "x": 110,
+          "y": 150,
+          "name": "lx-music"
+        },
+        {
+          "x": 240,
+          "y": 150,
+          "type": "link",
+          "path": "/Applications",
+          "name": "lx-music"
+        }
+      ],
+      "title": "洛雪音乐助手 v${version}"
+    },
+    "appImage": {
+      "license": "./licenses/license_zh.txt",
+      "category": "Audio"
+    },
     "publish": [
       {
         "provider": "github",

publish/changeLog.md

@@ -1,13 +1,11 @@
 ### 新增
 
-- 新增任务栏程序标题改变功能（播放歌曲时任务栏标题将显示当前播放的歌曲）
+- 新增**MAC**及**Linux**版本（需要的可自行下载）
+- 新增音量调整
+- 新增任务栏播放进度条控制选项（现在可在设置界面关闭在任务栏显示的播放进度）
+- 新增更新出错时的弹窗提示
+- 从该版本起，非安装版也会有更新弹窗提醒了，但仍然需要手动下载新版本更新，版本信息可到设置页面查看
 
 ### 修复
 
-- 使用临时接口时，试听列表中的下载按钮仍然能点击的Bug
-- 修复某些情况下歌曲链接未能缓存的问题
-
-### 移除
-
-- 移除临时接口（因服务器被攻击，本接口已关闭）
-- 移除列表栏设置的隐藏专辑栏选项（感觉这个设置并没有什么luan用，并且还会打破布局）
+- 强制把临时接口设置回 `messoer` 接口

publish/version.json

@@ -1,7 +1,11 @@
 {
-  "version": "0.2.3",
-  "desc": "<h3>新增</h3>\n<ul>\n<li>新增任务栏程序标题改变功能（播放歌曲时任务栏标题将显示当前播放的歌曲）</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>使用临时接口时，试听列表中的下载按钮仍然能点击的Bug</li>\n<li>修复某些情况下歌曲链接未能缓存的问题</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li>移除临时接口（因服务器被攻击，本接口已关闭）</li>\n<li>移除列表栏设置的隐藏专辑栏选项（感觉这个设置并没有什么luan用，并且还会打破布局）</li>\n</ul>\n",
+  "version": "0.3.0",
+  "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>MAC</strong>及<strong>Linux</strong>版本（需要的可自行下载）</li>\n<li>新增音量调整</li>\n<li>新增任务栏播放进度条控制选项（现在可在设置界面关闭在任务栏显示的播放进度）</li>\n<li>新增更新出错时的弹窗提示</li>\n<li>从该版本起，非安装版也会有更新弹窗提醒了，但仍然需要手动下载新版本更新，版本信息可到设置页面查看</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>强制把临时接口设置回 <code>messoer</code> 接口</li>\n</ul>\n",
   "history": [
+    {
+      "version": "0.2.3",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增任务栏程序标题改变功能（播放歌曲时任务栏标题将显示当前播放的歌曲）</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>使用临时接口时，试听列表中的下载按钮仍然能点击的Bug</li>\n<li>修复某些情况下歌曲链接未能缓存的问题</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li>移除临时接口（因服务器被攻击，本接口已关闭）</li>\n<li>移除列表栏设置的隐藏专辑栏选项（感觉这个设置并没有什么luan用，并且还会打破布局）</li>\n</ul>\n"
+    },
     {
       "version": "0.2.2",
       "desc": "<h3>修复</h3>\n<ul>\n<li>修复下载过程中出错重试5次都失败后不会自动开始下一个任务的Bug</li>\n<li>修复播放到一半URL过期时不会刷新URL直接播放下一首的问题</li>\n</ul>\n"

src/common/utils.js

@@ -0,0 +1,4 @@
+export const isLinux = process.platform == 'linux'
+export const isWin = process.platform == 'win32'
+export const isMac = process.platform == 'darwin'
+

src/main/index.js

@@ -1,10 +1,11 @@
-const { app, BrowserWindow } = require('electron')
+const { app, BrowserWindow, Menu } = require('electron')
 const path = require('path')
 
 require('./events')
 const progressBar = require('./events/progressBar')
 const trafficLight = require('./events/trafficLight')
 const autoUpdate = require('./utils/autoUpdate')
+const { isLinux, isMac } = require('../common/utils')
 
 const isDev = process.env.NODE_ENV !== 'production'
 
@@ -33,8 +34,8 @@ function createWindow() {
     useContentSize: true,
     width: 920,
     frame: false,
-    transparent: true,
-    icon: path.join(global.__static, 'icons/lunch.ico'),
+    transparent: !isLinux,
+    // icon: path.join(global.__static, isWin ? 'icons/256x256.ico' : 'icons/512x512.png'),
     resizable: false,
     maximizable: false,
     fullscreenable: false,
@@ -58,6 +59,24 @@ function createWindow() {
   if (!isDev) autoUpdate(mainWindow)
 }
 
+if (isMac) {
+  const template = [
+    {
+      label: app.getName(),
+      submenu: [{ label: '关于洛雪音乐', role: 'about' }, { type: 'separator' }, { label: '隐藏', role: 'hide' }, { label: '显示其他', role: 'hideothers' }, { label: '显示全部', role: 'unhide' }, { type: 'separator' }, { label: '退出', click: () => app.quit() }],
+    },
+    {
+      label: '窗口',
+      role: 'window',
+      submenu: [{ label: '最小化', role: 'minimize' }, { label: '关闭', role: 'close' }],
+    },
+  ]
+
+  Menu.setApplicationMenu(Menu.buildFromTemplate(template))
+} else {
+  Menu.setApplicationMenu(null)
+}
+
 app.once('ready', createWindow)
 
 app.on('window-all-closed', () => {

src/main/utils/autoUpdate.js

@@ -61,23 +61,30 @@ module.exports = win => {
   autoUpdater.on('checking-for-update', () => {
     sendStatusToWindow('Checking for update...')
   })
-  autoUpdater.on('update-available', (ev, info) => {
+  autoUpdater.on('update-available', info => {
     sendStatusToWindow('Update available.')
-    // win.webContents.send('update-available')
+    win.webContents.send('update-available', info)
   })
-  autoUpdater.on('update-not-available', (ev, info) => {
+  autoUpdater.on('update-not-available', info => {
     sendStatusToWindow('Update not available.')
+    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
+      win.webContents.send('update-not-available')
+    }, 5000)
   })
-  autoUpdater.on('error', (ev, err) => {
+  autoUpdater.on('error', () => {
     sendStatusToWindow('Error in auto-updater.')
-    // win.webContents.send('update-error')
+    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
+      win.webContents.send('update-error')
+    }, 6000)
   })
-  autoUpdater.on('download-progress', (ev, progressObj) => {
+  autoUpdater.on('download-progress', progressObj => {
     sendStatusToWindow('Download progress...')
   })
-  autoUpdater.on('update-downloaded', (ev, info) => {
+  autoUpdater.on('update-downloaded', info => {
     sendStatusToWindow('Update downloaded.')
-    win.webContents.send('update-downloaded')
+    setTimeout(() => { // 延迟发送事件，过早发送可能渲染进程还启动完成
+      win.webContents.send('update-downloaded')
+    }, 2000)
   })
   mainOn('quit-update', () => {
     setTimeout(() => {

src/renderer/App.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-#container(v-if="isProd" :class="theme" @mouseenter="enableIgnoreMouseEvents" @mouseleave="dieableIgnoreMouseEvents")
+#container(v-if="isProd && !isLinux" :class="theme" @mouseenter="enableIgnoreMouseEvents" @mouseleave="dieableIgnoreMouseEvents")
   core-aside#left
   #right
     core-toolbar#toolbar
@@ -20,14 +20,20 @@
 <script>
 import { mapMutations, mapGetters, mapActions } from 'vuex'
 import { rendererOn } from '../common/icp'
+import { isLinux } from '../common/utils'
 window.ELECTRON_DISABLE_SECURITY_WARNINGS = process.env.ELECTRON_DISABLE_SECURITY_WARNINGS
-const win = require('electron').remote.getCurrentWindow()
-const body = document.body
+let win
+let body
+if (!isLinux) {
+  win = require('electron').remote.getCurrentWindow()
+  body = document.body
+}
 
 export default {
   data() {
     return {
       isProd: process.env.NODE_ENV === 'production',
+      isLinux,
       globalObj: {
         apiSource: 'messoer',
       },
@@ -42,6 +48,7 @@ export default {
     }),
   },
   mounted() {
+    document.body.classList.add(this.isLinux ? 'noTransparent' : 'transparent')
     this.init()
   },
   watch: {
@@ -74,21 +81,34 @@ export default {
   },
   methods: {
     ...mapActions(['getVersionInfo']),
-    ...mapMutations(['setNewVersion', 'setVersionVisible']),
+    ...mapMutations(['setNewVersion', 'setVersionModalVisible']),
     ...mapMutations('list', ['initDefaultList']),
     ...mapMutations('download', ['updateDownloadList']),
     ...mapMutations(['setSetting']),
     init() {
-      if (this.isProd) {
+      if (this.isProd && !isLinux) {
         body.addEventListener('mouseenter', this.dieableIgnoreMouseEvents)
         body.addEventListener('mouseleave', this.enableIgnoreMouseEvents)
       }
+      rendererOn('update-available', (e, info) => {
+        // this.showUpdateModal(true)
+        this.setNewVersion({
+          version: info.version,
+        })
+      })
+      rendererOn('update-error', () => {
+        this.setVersionModalVisible({ isError: true })
+        this.$nextTick(() => {
+          this.showUpdateModal()
+        })
+      })
       rendererOn('update-downloaded', () => {
-        this.getVersionInfo().then(body => {
-          this.setNewVersion(body)
-          this.$nextTick(() => {
-            this.setVersionVisible({ isShow: true })
-          })
+        this.showUpdateModal()
+      })
+      rendererOn('update-not-available', () => {
+        if (this.setting.ignoreVersion) this.setSetting(Object.assign({}, this.setting, { ignoreVersion: null }))
+        this.setNewVersion({
+          version: this.version.version,
         })
       })
 
@@ -97,10 +117,12 @@ export default {
       window.globalObj = this.globalObj
     },
     enableIgnoreMouseEvents() {
+      if (isLinux) return
       win.setIgnoreMouseEvents(false)
       // console.log('content enable')
     },
     dieableIgnoreMouseEvents() {
+      if (isLinux) return
       // console.log('content disable')
       win.setIgnoreMouseEvents(true, { forward: true })
     },
@@ -131,6 +153,20 @@ export default {
         this.updateDownloadList(downloadList)
       }
     },
+    showUpdateModal() {
+      (this.version.newVersion && this.version.newVersion.history ? Promise.resolve(this.version.newVersion) : this.getVersionInfo().then(body => {
+        this.setNewVersion(body)
+        if (body.version !== this.setting.ignoreVersion) this.setSetting(Object.assign({}, this.setting, { ignoreVersion: null }))
+        return body
+      })).then(body => {
+        if (body.version === this.version.version) return
+        if (this.version.isError && body.version === this.setting.ignoreVersion) return
+
+        this.$nextTick(() => {
+          this.setVersionModalVisible({ isShow: true })
+        })
+      })
+    },
   },
   beforeDestroy() {
     if (this.isProd) {
@@ -146,22 +182,30 @@ export default {
 @import './assets/styles/layout.less';
 
 body {
-  // background-color: #fff;
-  padding: @shadow-app;
   user-select: none;
   height: 100vh;
   box-sizing: border-box;
 }
 
+.transparent {
+  padding: @shadow-app;
+  #container {
+    box-shadow: 0 0 @shadow-app rgba(0, 0, 0, 0.5);
+    border-radius: 4px;
+    background-color: transparent;
+  }
+}
+.noTransparent {
+  background-color: #fff;
+}
+
 #container {
   position: relative;
   display: flex;
   height: 100%;
-  box-shadow: 0 0 @shadow-app rgba(0, 0, 0, 0.5);
-  // background-color: #fff;
-  border-radius: 4px;
   overflow: hidden;
 }
+
 #left {
   flex: none;
   width: @width-app-left;

src/renderer/components/core/Icons.vue

@@ -48,5 +48,12 @@ svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/19
       path(fill='currentColor' d='M112.525,95.091L26.75,45.901C11.982,37.427,0,44.369,0,61.404v98.062c0,17.025,11.982,23.969,26.75,15.492l85.781-49.177C127.294,117.305,127.294,103.565,112.525,95.091z')
       // 205.857 205.857
       //- path(fill='currentColor' d='M174.522,0h-26.848c-9.885,0-17.897,8.013-17.897,17.899v62.533L37.513,2.522c-3.483-2.406-7.807-2.005-11.072-2.005c-13.061,0-13.004,11.7-13.004,14.666v175.983c0,2.507-0.057,14.666,13.004,14.666c3.265,0,7.589,0.401,11.072-2.005l92.265-77.91v62.016c0,9.885,8.012,17.898,17.897,17.898h26.848c9.885,0,17.898-8.013,17.898-17.898V17.899C192.421,8.013,184.408,0,174.522,0z')
+    g#icon-sound
+      // 0 0 291.063 291.064
+      path(fill='currentColor' d='M26.512,204.255h18.292l106.48,67.761c12.354,7.855,22.369,2.361,22.369-12.282v-69.397c16.933-8.854,28.501-26.559,28.501-46.983c0-20.425-11.568-38.129-28.501-46.986V31.645c0-14.639-10.18-20.401-22.731-12.873L44.804,82.443H26.512C11.866,82.443,0,94.311,0,108.955v68.789C0,192.387,11.866,204.255,26.512,204.255z')
+      path(fill='currentColor' d='M219.791,152.899c-0.818,11.185-4.039,21.758-9.569,31.426c-3.635,6.354-1.43,14.452,4.919,18.087c2.082,1.187,4.34,1.751,6.576,1.751c4.599,0,9.062-2.393,11.517-6.675c7.508-13.138,11.889-27.491,12.986-42.663c1.714-23.397-4.836-46.781-18.455-65.845c-4.256-5.96-12.536-7.332-18.491-3.081c-5.959,4.259-7.337,12.531-3.08,18.491C216.218,118.425,221.055,135.653,219.791,152.899z')
+      path(fill='currentColor' d='M290.7,158c3.34-45.736-16.508-89.592-53.097-117.318c-5.841-4.433-14.146-3.27-18.568,2.556c-4.428,5.838-3.283,14.151,2.558,18.568c29.401,22.281,45.355,57.521,42.668,94.252c-2.02,27.636-14.375,53.159-34.787,71.867c-5.396,4.95-5.758,13.339-0.808,18.729c2.609,2.854,6.188,4.298,9.771,4.298c3.194,0,6.41-1.154,8.953-3.484C272.805,224.175,288.184,192.408,290.7,158z')
+
+
 </template>
 

src/renderer/components/core/Player.vue

@@ -8,6 +8,13 @@ div(:class="$style.player")
     div(:class="$style.column1")
       div(:class="$style.container")
         div(:class="$style.title") {{title}}
+        div(:class="$style.volumeContent")
+          div(:class="$style.volume" @click.stop='handleChangeVolume' :title="`当前音量：${volumeStr}%`")
+            div(:class="$style.volumeBar" :style="{ width: volumeStr + '%' }")
+
+        //- div(:class="$style.playBtn" @click='handleNext' title="音量")
+          svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 291.063 291.064' space='preserve')
+            use(xlink:href='#icon-sound')
         div(:class="$style.playBtn" @click='handleNext' title="下一首")
           svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 220.847 220.847' space='preserve')
             use(xlink:href='#icon-nextMusic')
@@ -50,6 +57,7 @@ export default {
     return {
       show: true,
       audio: null,
+      volume: 0,
       nowPlayTime: 0,
       maxPlayTime: 0,
       isPlay: false,
@@ -71,7 +79,7 @@ export default {
       },
       delayNextTimeout: null,
       audioErrorTime: 0,
-      // retryNum: 0,
+      retryNum: 0,
     }
   },
   computed: {
@@ -98,6 +106,9 @@ export default {
     isAPITemp() {
       return this.setting.apiSource == 'temp'
     },
+    volumeStr() {
+      return parseInt(this.volume * 100)
+    },
   },
   mounted() {
     this.setProgessWidth()
@@ -139,6 +150,9 @@ export default {
       if (n.toFixed(2) === o.toFixed(2)) return
       this.sendProgressEvent(n, 'normal')
     },
+    volume(n) {
+      this.handleSaveVolume(n)
+    },
   },
   methods: {
     ...mapActions('player', ['getUrl', 'getPic', 'getLrc']),
@@ -147,9 +161,11 @@ export default {
       'fixPlayIndex',
       'resetChangePlay',
     ]),
+    ...mapMutations(['setVolume']),
     ...mapMutations('list', ['updateMusicInfo']),
     init() {
-      this.audio = document.createElement('audio')
+      window.a = this.audio = document.createElement('audio')
+      this.volume = this.audio.volume = this.setting.player.volume
       this.audio.controls = false
       this.audio.autoplay = true
       this.audio.loop = this.setting.player.togglePlayMethod === 'singleLoop'
@@ -212,9 +228,9 @@ export default {
         if (!this.targetSong.interval && this.listId != 'download') this.updateMusicInfo({ index: this.playIndex, data: { interval: formatPlayTime2(this.maxPlayTime) } })
         this.status = '音乐加载中...'
       })
-      // this.audio.addEventListener('loadstart', () => {
-      //   this.status = '开始加载音乐信息...'
-      // })
+      this.audio.addEventListener('loadstart', () => {
+        this.status = '音乐加载中...'
+      })
       this.audio.addEventListener('canplay', () => {
         console.log('加载完成开始播放')
         // if (this.musicInfo.lrc) this.lyric.lrc.play(this.audio.currentTime * 1000)
@@ -427,7 +443,7 @@ export default {
     },
     sendProgressEvent(status, mode) {
       // console.log(status)
-      rendererSend('progress', {
+      this.setting.player.isShowTaskProgess && rendererSend('progress', {
         status: status < 0.01 ? 0.01 : status,
         mode: mode || 'normal',
       })
@@ -438,6 +454,17 @@ export default {
     clearAppTitle() {
       setTitle()
     },
+    handleChangeVolume(e) {
+      let val = e.offsetX / 70
+      if (val < 0) val = 0
+      if (val > 1) val = 1
+      if (val > 0.97) val = 1
+      this.volume = val
+      if (this.audio) this.audio.volume = this.volume
+    },
+    handleSaveVolume(volume) {
+      this.setVolume(volume)
+    },
   },
 }
 </script>
@@ -509,6 +536,39 @@ export default {
   .mixin-ellipsis-1;
 }
 
+.volume-content {
+  width: 100px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+.volume {
+  cursor: pointer;
+  width: 100%;
+  height: 0.25em;
+  border-radius: 10px;
+  // overflow: hidden;
+  transition: @transition-theme;
+  transition-property: background-color;
+  background-color: @color-player-progress;
+  // background-color: #f5f5f5;
+  position: relative;
+  border-radius: @radius-progress-border;
+}
+
+.volume-bar {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 0;
+  height: 100%;
+  border-radius: @radius-progress-border;
+  transition-duration: 0.2s;
+  background-color: @color-player-progress-bar2;
+  box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
+}
+
 .play-btn {
   + .play-btn {
     margin-left: 10px;

src/renderer/components/material/InputRange.vue

@@ -0,0 +1,80 @@
+<template lang="pug">
+  input(type="range" :class="[$style.range, min ? $style.min : '']" :disabled="disabled" v-model="val" input="handleInput" @change="handleChange")
+</template>
+
+<script>
+export default {
+  props: {
+    min: {
+      type: Boolean,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    value: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      val: 0,
+    }
+  },
+  mounted() {
+    this.val = this.value
+  },
+  methods: {
+    handleChange(e) {
+      this.$emit('input', this.val)
+      this.$emit('change', e)
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.range {
+  display: inline-block;
+  border-radius: .25em;
+  cursor: pointer;
+  color: @color-btn;
+  outline: none;
+  background: transparent;
+  // background-color: @color-btn-background;
+  &[disabled] {
+    opacity: .4;
+  }
+
+  &:hover {
+    background-color: @color-theme_2-hover;
+  }
+  &:active {
+    background-color: @color-theme_2-active;
+  }
+}
+
+.min {
+
+}
+
+// each(@themes, {
+//   :global(#container.@{value}) {
+//     .btn {
+//       color: ~'@{color-@{value}-btn}';
+//       background-color: ~'@{color-@{value}-btn-background}';
+//       &:hover {
+//         background-color: ~'@{color-@{value}-theme_2-hover}';
+//       }
+//       &:active {
+//         background-color: ~'@{color-@{value}-theme_2-active}';
+//       }
+//     }
+//   }
+// })
+
+</style>

src/renderer/components/material/VersionModal.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
 material-modal(:show="version.showModal" @close="handleClose")
   main(:class="$style.main" v-if="version.newVersion")
-    h2 🚀程序更新🚀
+    h2 {{ version.isError ? '🌟发现新版本🌟' : '🚀程序更新🚀'}}
 
     div.scroll(:class="$style.info")
       div(:class="$style.current")
@@ -15,7 +15,20 @@ material-modal(:show="version.showModal" @close="handleClose")
           h4 v{{ver.version}}
           p(v-html="ver.desc")
 
-    div(:class="$style.footer")
+    div(:class="$style.footer" v-if="version.isError")
+      div(:class="$style.desc")
+        p 发现有新版本啦，但是自动更新功能出问题了
+        p
+          | 如果你所用的软件是
+          strong 安装版
+          | ，可以到QQ群：830125506 反馈哦
+        p
+          | 你现在可以选择继续使用当前版本或
+          strong 去发布页下载新版本
+      div(:class="$style.btns")
+        material-btn(:class="$style.btn" @click.onec="handleIgnoreClick") 忽略该版本
+        material-btn(:class="$style.btn" @click.onec="handleOpenPageClick") 去下载新版本
+    div(:class="$style.footer" v-else)
       div(:class="$style.desc")
         p 新版本已下载完毕，
         p
@@ -24,18 +37,18 @@ material-modal(:show="version.showModal" @close="handleClose")
           | 或稍后
           strong 关闭程序时
           | 自动更新~
-      material-btn(:class="$style.btn" @click.onec="handleClick") 立即重启更新
+      material-btn(:class="$style.btn" @click.onec="handleRestartClick") 立即重启更新
 
 </template>
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
 import { rendererSend } from '../../../common/icp'
-import { checkVersion } from '../../utils'
+import { checkVersion, openUrl } from '../../utils'
 
 export default {
   computed: {
-    ...mapGetters(['version']),
+    ...mapGetters(['version', 'setting']),
     history() {
       if (!this.version.newVersion) return []
       let arr = []
@@ -48,11 +61,21 @@ export default {
     },
   },
   methods: {
-    ...mapMutations(['setVersionVisible']),
+    ...mapMutations(['setVersionModalVisible', 'setSetting']),
     handleClose() {
-      this.setVersionVisible(false)
+      this.setVersionModalVisible({
+        isShow: false,
+      })
     },
-    handleClick(event) {
+    handleIgnoreClick(event) {
+      this.handleClose()
+      // event.target.disabled = true
+      this.setSetting(Object.assign({}, this.setting, { ignoreVersion: this.version.newVersion.version }))
+    },
+    handleOpenPageClick() {
+      openUrl('https://github.com/lyswhut/lx-music-desktop')
+    },
+    handleRestartClick(event) {
       this.handleClose()
       event.target.disabled = true
       rendererSend('quit-update')
@@ -68,7 +91,7 @@ export default {
 .main {
   position: relative;
   padding: 15px;
-  max-width: 500px;
+  max-width: 450px;
   min-width: 300px;
   display: flex;
   flex-flow: column nowrap;
@@ -156,6 +179,11 @@ export default {
   display: block;
   width: 100%;
 }
+.btns {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-gap: 0 10px;
+}
 
 each(@themes, {
   :global(#container.@{value}) {

src/renderer/store/mutations.js

@@ -19,7 +19,11 @@ export default {
     // val.desc = val.desc.replace(/\n/g, '<br>')
     state.version.newVersion = val
   },
-  setVersionVisible(state, { isShow }) {
-    state.version.showModal = isShow
+  setVersionModalVisible(state, { isShow, isError }) {
+    if (isShow !== undefined) state.version.showModal = isShow
+    if (isError !== undefined) state.version.isError = isError
+  },
+  setVolume(state, val) {
+    state.setting.player.volume = val
   },
 }

src/renderer/utils/index.js

@@ -161,12 +161,14 @@ export const isChildren = (parent, children) => {
  * @param {*} setting
  */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.3'
+  const defaultVersion = '1.0.4'
   const defaultSetting = {
     version: defaultVersion,
     player: {
       togglePlayMethod: 'listLoop',
       highQuality: false,
+      isShowTaskProgess: true,
+      volume: 1,
     },
     list: {
       isShowAlbumName: true,
@@ -184,6 +186,7 @@ export const updateSetting = setting => {
     sourceId: 'kw',
     apiSource: 'messoer',
     randomAnimate: true,
+    ignoreVersion: null,
   }
   const overwriteSetting = {
     version: defaultVersion,
@@ -198,6 +201,7 @@ export const updateSetting = setting => {
     objectDeepMerge(defaultSetting, overwriteSetting)
     setting = defaultSetting
   }
+  setting.apiSource = 'messoer' // 强制设置回 messoer 接口源
   return setting
 }
 

src/renderer/utils/message.js

@@ -1,6 +1,7 @@
 export const requestMsg = {
   fail: '请求异常😮，可以多试几次，若还是不行就换一首吧。。。',
-  unachievable: '哦No😱...接口无法访问了！已帮你切换到临时接口，重试下看能不能播放吧~',
+  unachievable: '哦No😱...接口无法访问了！',
+  // unachievable: '哦No😱...接口无法访问了！已帮你切换到临时接口，重试下看能不能播放吧~',
   notConnectNetwork: '无法连接网络',
   cancelRequest: '取消http请求',
 }

src/renderer/utils/request.js

@@ -84,7 +84,7 @@ export const httpFatch = (url, options = { method: 'get' }) => {
       return promise
     }
     if (err.message === 'socket hang up') {
-      window.globalObj.apiSource = 'temp'
+      // window.globalObj.apiSource = 'temp'
       return Promise.reject(new Error(requestMsg.unachievable))
     }
     if (err.code === 'ENOTFOUND') return Promise.reject(new Error(requestMsg.notConnectNetwork))

src/renderer/views/Setting.vue

@@ -31,6 +31,10 @@ div.scroll(:class="$style.setting")
       h3 优先播放高品质音乐
       div
         material-checkbox(id="setting_player_highQuality" v-model="current_setting.player.highQuality" label="是否启用")
+    dd(title='在任务栏上显示当前歌曲播放进度')
+      h3 是否启用任务栏播放进度条
+      div
+        material-checkbox(id="setting_player_showTaskProgess" v-model="current_setting.player.isShowTaskProgess" label="是否启用")
     dt 下载设置
     dd(title='下载歌曲保存的路径')
       h3 下载路径
@@ -63,14 +67,21 @@ div.scroll(:class="$style.setting")
       div
         material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleImportAllData") 导入
         material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleExportAllData") 导出
+    dt 软件更新
+    dd
+      p.small
+        | 最新版本：{{version.newVersion ? version.newVersion.version : '未知'}}
+      p.small 当前版本：{{version.version}}
+      p.small(v-if="version.newVersion")
+        span(v-if="isLatestVer") 软件已是最新，尽情地体验吧~🥂
+        material-btn(v-else-if="setting.ignoreVersion" :class="[$style.btn, $style.gapLeft]" min @click="showUpdateModal") 打开更新窗口
+        span(v-else) 发现新版本并在努力下载中，请稍等...⏳
+      p.small(v-else) 检查更新中...
     dt 关于洛雪音乐
     dd
       p.small
         | 本软件完全免费，代码已开源，开源地址：
         span.hover(@click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop')") https://github.com/lyswhut/lx-music-desktop
-      p
-        small 当前版本：
-        | {{version.version}}
       p.small
         |  本软件仅用于学习交流使用，禁止将本软件用于
         strong 非法用途
@@ -85,9 +96,9 @@ div.scroll(:class="$style.setting")
           | 本软件的部分接口使用自 https://github.com/messoer ，非常感谢
           strong @messoer
           | ！
-      p.small 若有问题可 mail to：lyswhut@qq.com 或到 github 提交 issue
+      p.small 若有问题可 mail to：lyswhut@qq.com 或到 GitHub 提交 issue
       p.small
-        | 若觉得好用的话可以去GitHub点个
+        | 若觉得好用的话可以去 GitHub 点个
         strong star
         | 支持作者哦~~🍻
       p
@@ -98,12 +109,18 @@ div.scroll(:class="$style.setting")
 <script>
 import { mapGetters, mapMutations } from 'vuex'
 import { openDirInExplorer, openSelectDir, openSaveDir, updateSetting, openUrl } from '../utils'
+import { rendererSend } from '../../common/icp'
 import fs from 'fs'
+
+
 export default {
   name: 'Setting',
   computed: {
     ...mapGetters(['setting', 'themes', 'version']),
     ...mapGetters('list', ['defaultList']),
+    isLatestVer() {
+      return this.version.newVersion && this.version.version === this.version.newVersion.version
+    },
   },
   data() {
     return {
@@ -112,12 +129,13 @@ export default {
         player: {
           togglePlayMethod: 'random',
           highQuality: false,
+          isShowTaskProgess: true,
         },
         list: {
           isShowAlbumName: true,
         },
         download: {
-          savePath: 'C:\\',
+          savePath: '',
           fileName: '歌名 - 歌手',
         },
         themeId: 0,
@@ -180,12 +198,21 @@ export default {
       },
       deep: true,
     },
+    'current_setting.player.isShowTaskProgess'(n) {
+      if (n) return
+      this.$nextTick(() => {
+        rendererSend('progress', {
+          status: -1,
+          mode: 'normal',
+        })
+      })
+    },
   },
   mounted() {
     this.init()
   },
   methods: {
-    ...mapMutations(['setSetting']),
+    ...mapMutations(['setSetting', 'setVersionModalVisible']),
     ...mapMutations('list', ['setDefaultList']),
     init() {
       this.current_setting = JSON.parse(JSON.stringify(this.setting))
@@ -339,6 +366,9 @@ export default {
         window.globalObj.apiSource = id
       })
     },
+    showUpdateModal() {
+      this.setVersionModalVisible({ isShow: true })
+    },
   },
 }
 </script>