From a5deb07d0cb982c98920a4db0f3023921f2dd8cc Mon Sep 17 00:00:00 2001 From: Murphy <34875522+YueShangGuan@users.noreply.github.com> Date: Sat, 12 Sep 2020 12:51:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E6=98=93=E4=BA=91?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=AD=8C=E5=8D=95=E5=A4=A7=E4=BA=8E1000?= =?UTF-8?q?=E9=A6=96=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E9=9F=B3=E4=B9=90=E8=AF=A6=E6=83=85=E9=A1=B5=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E5=9B=BE=E7=89=87=20(#352)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 更新 netease.js * Revert "更新 netease.js" This reverts commit 647e223a34e356f50c7a1caeacb207b7819094dc. * 更新 netease.js 修复网易云音乐导入歌单超过1000首时失败问题 * Revert "更新 netease.js" This reverts commit 13066b18c81a965ab7eb9daaeca170105e3a7a49. * 修复网易云导入歌单大于1000首失败 网易云音乐歌单超过1000首会失败，传入id过多会被服务器拒绝 * 音乐详情页背景变为歌曲图片 歌曲详情页背景由纯白变为歌曲背景。 背景图片添加了滤镜，模糊处理，并加了一个跟随系统主题色变化的蒙版，保证歌词显示清晰 这个功能加上后音乐详情页视觉变动比较大，并不是所有人都喜欢，可以考虑变为一个开关 * 修改简约白当前歌词颜色 * 修改深空灰主题下歌词显示颜色 在深空灰主题下某些背景图歌词不是很清晰，修改一下颜色亮度，更清晰 * 优化大于1000首歌的bug处理 使用async库concat函数对异步代码控制更加简洁，对原有代码修改更少 Co-authored-by: YueShangGuan Co-authored-by: Listen 1 --- css/common.css | 20 ++++++++++++++++++++ css/iparanoid.css | 4 ++-- css/origin.css | 2 +- js/provider/netease.js | 23 +++++++++++++++++------ listen1.html | 16 +++++++++------- 5 files changed, 49 insertions(+), 16 deletions(-) diff --git a/css/common.css b/css/common.css index 4dd4037a..e3182c66 100644 --- a/css/common.css +++ b/css/common.css @@ -521,7 +521,27 @@ svg { stroke: var(--now-playing-close-icon-color); } +.page .bg { + opacity: 0.5; + height: 100%; + text-align: center; + line-height: 100%; + float: left; + width: 100%; + background-repeat: no-repeat; + background-position: center; + background-size: cover; + -webkit-filter: blur(15px); + -moz-filter: blur(15px); + -o-filter: blur(15px); + -ms-filter: blur(15px); + filter: blur(15px); +} + .page .playsong-detail { + position:absolute; + left: 10px; + right: 10px; max-width: 770px; margin: 0 auto; display: flex; diff --git a/css/iparanoid.css b/css/iparanoid.css index 270f1327..60b860aa 100644 --- a/css/iparanoid.css +++ b/css/iparanoid.css @@ -7,7 +7,7 @@ --text-subtitle-color: #666666; --text-disable-color: #999999; - --lyric-default-color: #666666; + --lyric-default-color: #333333; --link-default-color: #999999; --link-highlight-color: #111111; @@ -34,7 +34,7 @@ --window-control-border-color: #dddddd; - --important-color: #ff4444; + --important-color: #fff; --button-background-color: #eeeeee; --button-border-color: #bebebe; diff --git a/css/origin.css b/css/origin.css index 44ef834c..18f0d82c 100644 --- a/css/origin.css +++ b/css/origin.css @@ -7,7 +7,7 @@ --text-subtitle-color: #666666; --text-disable-color: #999999; - --lyric-default-color: #666666; + --lyric-default-color: #bbbbbb; --link-default-color: #999999; --link-highlight-color: #ffffff; diff --git a/js/provider/netease.js b/js/provider/netease.js index 6a203568..5bf88c51 100644 --- a/js/provider/netease.js +++ b/js/provider/netease.js @@ -236,6 +236,14 @@ function build_netease() { return callback(null, tracks); }); } + function split_array(myarray, size) { + var count = Math.ceil(myarray.length / size); + var result = []; + for (var i = 0; i < count; i++) { + result.push(myarray.slice(i * size, (i + 1) * size)); + } + return result; + } function ne_get_playlist(url, hm, se) { // special thanks for @Binaryify @@ -269,13 +277,16 @@ function build_netease() { title: res_data.playlist.name, source_url: `http://music.163.com/#/playlist?id=${list_id}`, }; + var max_allow_size = 1000; + var trackIdsArray = split_array(res_data.playlist.trackIds, max_allow_size); + + function ng_parse_playlist_tracks_wrapper(trackIds, callback){ + return ng_parse_playlist_tracks(trackIds, hm, se, callback); + } - // request all tracks to fetch song info - ng_parse_playlist_tracks(res_data.playlist.trackIds, hm, se, - (err, tracks) => fn({ - tracks, - info, - })); + async.concat(trackIdsArray, ng_parse_playlist_tracks_wrapper, function(err, tracks){ + fn({tracks, info}); + }); // request every tracks to fetch song info // async_process_list(res_data.playlist.trackIds, ng_render_playlist_result_item, [hm, se], diff --git a/listen1.html b/listen1.html index 02598457..1e418306 100644 --- a/listen1.html +++ b/listen1.html @@ -1,4 +1,4 @@ - + @@ -443,20 +443,22 @@

{{ playlist_title }}

-
+
+
- - - + + +
-
+
+ 原始链接--> +

{{ currentPlaying.title }}