Skip to content

Commit 83dda92

Browse files
lyswhutlyswhut
committed
Merge branch 'dev'
2 parents 7ec7023 + 6bbcb51 commit 83dda92

9 files changed

Lines changed: 278 additions & 500 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
66
Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
77
Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
88

9+
## [1.10.1](https://github.com/lyswhut/lx-music-desktop/compare/v1.10.0...v1.10.1) - 2021-05-25
10+
11+
### 修复
12+
13+
- 修复企鹅音乐搜索歌曲没有结果的问题
14+
- 修复播放在空的歌单列表点击播放全部时报错的问题
15+
916
## [1.10.0](https://github.com/lyswhut/lx-music-desktop/compare/v1.9.0...v1.10.0) - 2021-05-19
1017

1118
lx music移动端已经发布了，使用习惯仍跟桌面版一样，不过功能、界面仍比较简单，有兴趣的可以去体检一下，项目地址：

‎package-lock.json‎

Lines changed: 251 additions & 466 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lx-music-desktop",
3-
"version": "1.10.0",
3+
"version": "1.10.1",
44
"description": "一个免费的音乐查找助手",
55
"main": "./dist/electron/main.js",
66
"productName": "lx-music-desktop",
@@ -65,13 +65,13 @@
6565
"lint": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly src",
6666
"lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly --fix src",
6767
"dp": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm run pack",
68-
"up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm update"
68+
"up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm i"
6969
},
7070
"browserslist": [
71-
"Electron 12.0.8"
71+
"Electron 12.0.9"
7272
],
7373
"engines": {
74-
"node": ">= 12"
74+
"node": ">= 14"
7575
},
7676
"build": {
7777
"appId": "cn.toside.music.desktop",
@@ -176,22 +176,22 @@
176176
"cfonts": "^2.9.2",
177177
"chalk": "^4.1.1",
178178
"changelog-parser": "^2.8.0",
179-
"copy-webpack-plugin": "^8.1.1",
179+
"copy-webpack-plugin": "^9.0.0",
180180
"core-js": "^3.12.1",
181181
"cross-env": "^7.0.3",
182-
"css-loader": "^5.2.4",
182+
"css-loader": "^5.2.6",
183183
"css-minimizer-webpack-plugin": "^3.0.0",
184184
"del": "^6.0.0",
185-
"electron": "^12.0.8",
185+
"electron": "^12.0.9",
186186
"electron-builder": "^22.11.4",
187187
"electron-debug": "^3.2.0",
188188
"electron-devtools-installer": "^3.2.0",
189-
"eslint": "^7.26.0",
189+
"eslint": "^7.27.0",
190190
"eslint-config-standard": "^14.1.1",
191191
"eslint-formatter-friendly": "^7.0.0",
192192
"eslint-loader": "^4.0.2",
193193
"eslint-plugin-html": "^6.1.2",
194-
"eslint-plugin-import": "^2.23.2",
194+
"eslint-plugin-import": "^2.23.3",
195195
"eslint-plugin-node": "^11.1.0",
196196
"eslint-plugin-promise": "^5.1.0",
197197
"eslint-plugin-standard": "^4.1.0",
@@ -203,7 +203,7 @@
203203
"less-plugin-clean-css": "^1.5.1",
204204
"markdown-it": "^12.0.6",
205205
"mini-css-extract-plugin": "^1.6.0",
206-
"postcss": "^8.2.15",
206+
"postcss": "^8.3.0",
207207
"postcss-loader": "^5.3.0",
208208
"postcss-pxtorem": "^6.0.0",
209209
"pug": "^3.0.2",
@@ -218,7 +218,7 @@
218218
"url-loader": "^4.1.1",
219219
"vue-loader": "^15.9.7",
220220
"vue-template-compiler": "^2.6.12",
221-
"webpack": "^5.37.0",
221+
"webpack": "^5.37.1",
222222
"webpack-cli": "^4.7.0",
223223
"webpack-dev-server": "^3.11.2",
224224
"webpack-hot-middleware": "^2.25.0",
@@ -230,7 +230,7 @@
230230
"electron-log": "^4.3.5",
231231
"electron-store": "^8.0.0",
232232
"electron-updater": "^4.3.9",
233-
"iconv-lite": "^0.6.2",
233+
"iconv-lite": "^0.6.3",
234234
"image-size": "^1.0.0",
235235
"js-htmlencode": "^0.3.0",
236236
"lrc-file-parser": "^1.0.7",

‎publish/changeLog.md‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
1-
lx music移动端已经发布了，使用习惯仍跟桌面版一样，不过功能、界面仍比较简单，有兴趣的可以去体检一下，项目地址：
2-
https://github.com/lyswhut/lx-music-mobile#readme
3-
4-
### 新增
5-
6-
- 排行榜界面添加播放、收藏整个排行榜功能，可以右击排行榜名字后，在弹出的右键菜单中使用。注：收藏、播放存在分页的排行榜时需等待操作完成后才能切换排行榜，不然会导致操作中断。
7-
- 新增Mac arm64位dmg包的构建
8-
91
### 修复
102

11-
- 修复全局快捷键对桌面歌词无效的问题
12-
- 修复快捷键设置框内的提示问题
13-
- 修复在当前正常播放的列表中使用稍后播放功能时，播放完后稍后播放的歌曲后不会恢复原来播放位置播放的问题
14-
- 修复kw部分歌单无法打开的问题
15-
- 修复wy源的歌曲音质匹配问题
16-
- 修复mg源歌单标签、排行榜歌曲列表无法加载的问题
17-
- 修复了一个歌曲下载失败时不会跳过任务的问题
18-
19-
### 其他
20-
21-
- 更新 Electron 到 12.0.8
3+
- 修复企鹅音乐搜索歌曲没有结果的问题
4+
- 修复播放在空的歌单列表点击播放全部时报错的问题

‎publish/version.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/renderer/App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export default {
372372
if (!list || !list.list[info.index]) return
373373
info.list = list.list
374374
}
375-
375+
if (!info.list || !info.list[info.index]) return
376376
window.restorePlayInfo = info
377377
this.setPlayList({
378378
list: {

‎src/renderer/store/modules/player.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ const mutations = {
381381
})
382382
},
383383
setList(state, { list, index }) {
384+
if (!(list && list.list && list.list[index])) return
384385
state.playMusicInfo = {
385386
musicInfo: list.list[index],
386387
listId: list.id,

‎src/renderer/utils/music/tx/musicSearch.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ export default {
1515
musicSearch(str, page, limit, retryNum = 0) {
1616
if (searchRequest && searchRequest.cancelHttp) searchRequest.cancelHttp()
1717
if (retryNum > 5) return Promise.reject(new Error('搜索失败'))
18-
searchRequest = httpFetch(`https://c.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&new_json=1&remoteplace=sizer.yqq.song_next&searchid=49252838123499591&t=0&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&loginUin=0&hostUin=0&format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq&needNewCode=0`)
18+
// searchRequest = httpFetch(`https://c.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&new_json=1&remoteplace=sizer.yqq.song_next&searchid=49252838123499591&t=0&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&loginUin=0&hostUin=0&format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq&needNewCode=0`)
19+
searchRequest = httpFetch(`https://c.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&new_json=1&remoteplace=txt.yqq.top&searchid=1&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&cv=4747474&ct=24&format=json&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&uin=0&hostUin=0&loginUin=0`)
1920
// searchRequest = httpFetch(`http://ioscdn.kugou.com/api/v3/search/song?keyword=${encodeURIComponent(str)}&page=${page}&pagesize=${this.limit}&showtype=10&plat=2&version=7910&tag=1&correct=1&privilege=1&sver=5`)
2021
return searchRequest.promise.then(({ body }) => {
2122
if (body.code !== this.successCode) return this.musicSearch(str, page, limit, ++retryNum)

‎src/renderer/views/SongList.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ export default {
433433
async playSongListDetail() {
434434
if (!this.listDetail.info.name) return
435435
const list = await this.fetchList()
436+
if (!list.length) return
436437
this.setPlayList({
437438
list: {
438439
list,

0 commit comments

Comments
 (0)