From e61c84ee08590e489e5c120ad52972053bfc4a33 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 27 Feb 2022 11:36:18 +0800 Subject: [PATCH 01/79] =?UTF-8?q?=E4=BC=98=E5=8C=96Windows=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A0=8F=E7=BC=A9=E7=95=A5=E5=9B=BE=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E6=8E=A7=E5=88=B6=E6=8C=89=E9=92=AE=E5=9C=A8=E6=B5=85?= =?UTF-8?q?=E8=89=B2=E4=BB=BB=E5=8A=A1=E6=A0=8F=E4=B8=8B=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 28 +----------------------- src/static/images/taskbar/collect.png | Bin 1032 -> 2379 bytes src/static/images/taskbar/collected.png | Bin 781 -> 1790 bytes src/static/images/taskbar/lrc-off.png | Bin 943 -> 0 bytes src/static/images/taskbar/lrc.png | Bin 731 -> 0 bytes src/static/images/taskbar/next.png | Bin 729 -> 1582 bytes src/static/images/taskbar/pause.png | Bin 491 -> 1116 bytes src/static/images/taskbar/play.png | Bin 675 -> 1399 bytes src/static/images/taskbar/prev.png | Bin 762 -> 1561 bytes 9 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 src/static/images/taskbar/lrc-off.png delete mode 100644 src/static/images/taskbar/lrc.png diff --git a/publish/changeLog.md b/publish/changeLog.md index 96ea2948..9b1e4a00 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,29 +1,3 @@ -### 新增 - -- 新增“双击列表里的歌曲时自动切换到当前列表播放”设置，此功能仅对歌单、排行榜有效，默认关闭 -- 新增打开收藏的在线列表的对应平台详情页功能，可以在我的列表-列表右键菜单中使用 -- 新增定时暂停播放功能，由于此功能大多数人可能不常用，所以将其放在设置-基本设置中 -- 新增任务栏缩略图工具栏控制按钮（此功能仅在Windows平台可用），按钮分别为收藏/取消收藏（将歌曲添加到“我的收藏”列表）、上一曲、播放/暂停、下一曲 -- 新增设置-基本设置-软件字体设置，此设置可用于设置主界面的字体（已知的问题：Windows 7 下可能会出现字体列表为空的情况，这是当前系统的 Powershell 版本小于5.1导致的，请自行尝试看常见解决） -- 新增Scheme URL对音乐搜索的调用支持，详情看常见问题-Scheme URL支持 -- 新增Scheme URL以url传参的方式调用，详情看常见问题-Scheme URL支持 -- 自定义源新增更新弹窗方法，同时自定义源管理新增是否允许源显示更新弹窗设置（出于防止滥用考虑），当源作者想要通知用户源已更新时，可以调用此方法弹窗告诉用户，调用说明看常见问题-自定义源部分 - ### 优化 -- 过滤tx源某些不支持播放的歌曲，解决播放此类内容会导致意外的问题 -- 把歌曲的热门评论与最新评论拆分成两个列表显示 - -### 修复 - -- 修复排行榜名字右击菜单的播放功能在播放非激活的列表时的列表获取问题 -- 修复修改列表名时无法使用`Ctrl`键的问题 -- 修复wy源某些歌曲获取歌词翻译的问题处理 -- 修复下载功能的歌词换源时会进入死循环的问题 -- 修复某些歌曲无法下载的问题 -- 修复windows平台下软件目录存在`portable`文件夹时，仍会创建`C:\Users\\AppData\Roaming\lx-music-desktop\Dictionaries\en-US-9-0.bdic`文件的问题，现在不会再创建文件，但仍会创建空目录（Electron的问题，目前暂无解决方法） -- 修复播放器的停止逻辑问题 - -### 其他 - -- 更新electron到v13.6.9 +- 优化Windows任务栏缩略图工具栏控制按钮在浅色任务栏下的显示效果 diff --git a/src/static/images/taskbar/collect.png b/src/static/images/taskbar/collect.png index 389b46832fa62c1859f0bdfb64e777a02f8ae28b..32ea8c2ca81d2cc5971a57e55740a4a08ea13570 100644 GIT binary patch delta 2369 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 delta 1011 zcmVCsBjl%l+Wn1M&lqP*+YgG zI-n2XODKXQ1fdc^f=LfSAqD0`FV>R}5{ZW4TV^7ncnNQ0YV_doo*wa1c=VScbHQdZ z=h|zpHP3NF=ZEpI=N|JP|G)O!Yt1~_x1Y!fi=Kq zk=17FdmnHF=zju+1Ji*SIV*Gl&CTU>7LRnb;?>PoeOB&uFr^TKC*T&3%{eN7S0|{*<3Rw)6bTYvAr=+1J zIc=%k^!RLfjltcXe0))|P!@KT|4MM>YvZGU&JXO1O@S}QS1e{R(%rvrRJii~Md|W% zZfgPByxY`X;B3xquPCknF9WXuHxlq&1Ag_!#+!j>y}^?Sie<2U($R!`C%n%i%)nr8 zFvZpCDS!CdTFpSWHyC>YHUoTZ-DcprH#oY94fxt_nSnFjpzUv3dQns(c*V=@Y;hZ@ zT8wpvjb=kT@S>;bP>VZB`B>eA211&4WDkkmfrr`B1P`B7(Gk#hOf{Ri`GEw(>?ROD zEpn`VPu_`aXT-!?k5K#!N%sSq_GLM>$zvs5kAIk0_z1+m>Go1S%+S=30gLvC0mHIh z6u&S>$DG>S(BwBHbw?(z>ILyja>RG|`7x3g0$bM%pZB2n(4JrJg0_d|Hm`v~`0*XhWe-$sLFt-EP zmZE4%1GqOU*8Y1eCujb{vuq-yHei?l90Z1X)ikV diff --git a/src/static/images/taskbar/collected.png b/src/static/images/taskbar/collected.png index bb5d1073a7dc69a9561c191795ff2f55f4b2d126..cc8caee3e33ed1a3c5a4175234858a7047ac1748 100644 GIT binary patch delta 1775 zcmV9U@LT2WC-|v6!xo7zfo@s;?=3{#Loqq^GIQx^Z&v^hG`*Q*C z_z{m{c;kuK=Pp4!-j{g37!U&(4PXp_XaJ)C$XHuSWCdUVpaWnU!iX1K2_P0g6aWPP zDFb$}c)cv11%P`<13fuQANnG0XOV=#5_DpcQjwOOnlR(}*vN_FBV=R6VIr~C=ICwi zwRDuVYgA=zntvJqY5-bhgzL#!>S3|MSWgr9SO5u&QpU~5Oo+{x5)&~YMlOwZdw6%3 z*>UHF*4SRu)LGMJwAKUYU}mg6IZIswFg|P`ZfB8qs8A0j1DLpZLB`_OCdI#$q*NqF zNF}3%K{%f0x-E{*3bn3!XI10LI<2Vzz-<6`SPzD=Cw~}6@m`3FO8;celqGY<$IOZ! zEgK&$5=n&d%ubi3-DGP$+0tG1ZMo_n0BrzTS;tVP@Q*aW;HlT+0Zh)#OwaycTFSez z3hCIv9-~(--ou@2={~vo*u`I&iFRfn3BYr|WzSpvN=n>faafqxmv~y6Q&UjWvOmAF zp$NcD0Ds-=Y48sj5WrKiw8P66tj|o0&GIGDgX*@}J69gA+)=ABHquvF$>XN)S~C07 zScNn$ka!n5w57}bEdK#O1M8GN6J$Un_??vXeA<~+S$ToNlj29qC!AQZ@Ef^AoRO$h z%=|rjeqNyPBw{(UDr+mTF-EEPJMSzcVPkaq;eX`|HfAQqz8q*Wq4ai6FA9S=N){d& zjCd7l-P!De=eGg4P6LNVt#>Ta?2z{H?8({hO-orBjASH*M68fY#Ij(;OHwLQtejhO zu~V;Rvy(%_=6RYblRlr9x;9wJhD)E#OtF&(xl8Hq@ zo9dpF#G)`-yF_Gw=iDCdX*0lk`nK5~GJoLcw%WBJz~q;V4$e%wQ!-#tX-usy-ZSXI zA(Z6eJ+3yRwUah=WWaEwNnO)rv3EQz20G2Qj^dW?%e37h1G<)8OJjMvwkibJd{U)a zcd4}X&J_R}GC*TVom+aX$nEhwbZiSX5#y$_*NfP3(=1r?<>89$9M3yL z4W5{YO;9lCTf6!Uu<{305N=)VF;uTRUj4n(9Xck6WzDgw?}&{UiPc-O=|2;*x(h96 z^~KFyrSBZ7_}cDrTSt_fNI92z#eboSJSwvg8!-xNM8ZQoneYxJ)rAgi`CA9i=NX-x zVMNGjwRLia*Z(-TwY)=HPE5qc82cr9u#wP2O^=~+;odV}>14;^wZS0g(fswiJWCtR2GAxv%oefWU-}-NvZi zKYH=UBaQ06{f$Fys4eSxie>W`9)TFZy}c9NXLS+4hbO9k+OKNc?|*Ci!rIn-)P})R z42O4brY+X!=_4V>kJegg6qiv;~T|OjG^_aEOvzexsoxy{q;V=Mp>my}1`d~AbbEsSQXL{-c;C~F!ACU1H R$1?x`002ovPDHLkV1kK+)@?REbAT>zV~o4fFsO0&{_Jz+f%=3bX(ZfqzTD72v0#ni^oXwmShB z3iJZL1FgVQ;3{wd_*}H1A_lqvn}H1~IEpr4D{wgCzE!|3pr1jToxl-ow>{qtsR9+} z0iS?vhT?_3z#-rRFg?%psla>Sn4x$f4P^A;EHgDAPyI5`(=bSw{=f}jWls4D;5IPG zvQ5!>7T6!Ykbe&S-vaEk3=-zJj^_^Ggrhby`u=2sf?NZO9f}V)=eRwg0eA+SBxeZq z29A~?SUOKHyWpVCTz?F#*Xhw0jU6ClKv7BO(wPwiPAr1T`^ zD@|hHp6=g$Lyn!z!DeochX(eNvm2EYSaW6dl*Aq2451@sy`F=U&M(zU*uZOGmInsr z08fHH;X}Q2%}k){-|I4BQFy55%Sv3+9co*0bY~x^q-7ez7YgNt6}M3QVg}G*Bt7xC0tQ|I6M;9yZi+I1nivmUcc(3qN5Cje z9v8*LK)?)L@XF0iU<&ZVBu*&?&ohNGO&3c3?V@}WW$hQ2{M=|;)A9LR+^Z9@{0}Y;Bt4)y?2gx#(V92usLh5z0ThI+k5SG z);<&{P@q78|20Z!?lRpLCGr7t1PXM=^ z?hbGgxKRD_@jUQ4FwWk;2pk5^4JHa*wUzElS&8r5PJCjzW=X#*8>b{Ks<6T{B^@i% z$KI-!paOwVzI7dcWV#Dhzb)yyq#Kg%Mw9qBqrbMu?xvAGE9s8u{>Ve1v&@Peb^~sc zG+^>NYky4A1WC&!U30dxqJCyalkbo;&b3dHv|7@US`&y#lw0Kmu6<3^cGR`KT4t%P>HLG;A+5xMCZ-6Ui^R%;l6L`tw4=hMz;Z~adK?wxR1rE9T3n?}sn%p+|AE#ez z&l|v(c?Pcqfq=JwzfE2UY>nDq1SXk$(&=Bb=Rx37o`Gvc;2Ln<)!zZOnB3$D{RQkY zc?R%|$pd)@9+~&W2&I&d;=90eR;HP*-L3RQXL~X4z_lWfg*QweTx11s+S!eE^3A*h z)XIfCLi({5_`&H0qRC?iJ3(rQtOi3t-~iAGyaIe}x|P7T$S$0R1QW@Lp&;N9;(V{w z+anU;EF_WZ*?J`q@S&3fi5(_i29BHDn%9kngFqk9@9J;6o#?UWRA5P-&MOfZ#5Jfa zzK9ybPILj?K$2x{G9p<>y$n<$FxH+eQ3+qw$v|_J1a<$f+p)2uIX2!D^e3^GQ^+~+6Lhir15-J^fbc;^@3 zW%Kj%z>nr0ArTC&)B#KZW?4cw+WI|VlaF068^ip!VYhRg&4c|bk&1`#%Ve)3v8xdY zgtEtx_^J^J#3Xtojc7Ci*y<;kUx~m_-v{zwDKNpJ)c!i0Ux5Mz3Oq6Z{sp}MlV;VM REf4?z002ovPDHLkV1lg6yYc`4 diff --git a/src/static/images/taskbar/lrc.png b/src/static/images/taskbar/lrc.png deleted file mode 100644 index 4bcedb5999c18c18776527273ddbcba7846bb279..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 731 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 O0000v delta 466 zcmV;@0WJRA2o#V(7umem+rGZ`|KdRRS_J4tkIIdF3TsbRX)}^@9 z5s~4aaeVG zeXXoJoLTnBUrTS;1m-*n%mU3m&qsh6kNm0hhE1U1QD7+N`!#c>ESYSZfWtp!aIgvd zD}sPFK|q@zpnpve&?X3I69lvg0@?%tZGwO{K|q@zpiL0aCJ1N~1hfeP+5`b@Yyvr* zbTV$JYAalQd;PZU-EvSXf(*Pa@@C1Np0Dlnx?g3Z>U;=O#z|H}` z4Jd2^H~=085SN;onp9m~ogEh!_sq)5%AJmmjvIr6gTDY+pkn^9+wHpn4VXD7=l^jE zz*7J+3knK8HyVvbyAx)!`EFfZ-8BI30!RgL4!{}mUc23nKs;{60eB1mzqq)#!R`jF zR;%Ol`BDJ60DpJ@qKNH+Er3`jJ}WEh^1{Nxk~;wo`uh5Y02BjA2k;z#he#_1O91J# zZz>cDr6<8VFq_S0sZ=Tl@D6}isRjLJD|ZkZygfEHHtvl82Wqui&ExSd1IQsQN$u!! zTe%YE(g(s^KJ%D_goFf*Mk7}$m7f534ZsBePcsbjAb-O!M|!6xu)WxQI~{^hD7>_> zvC&diR(1(M3hm_448w5zCBng30NG<>V?P|lLTt>>&;QQlawX)wWL^Ofd0bn$;#_fgs*JnR{;)0BGG&6>+3BdktmO7h4eQhhBTZoO> z+1cM>Vt-;j1ds*b1ptqDV=Gqz(gMz;q@*M-E-p5=wY9xZmm@C$c#>h5@T1r&-~#sl zX;|2)%F4C_c zbF%=*B=|gCs^2GMTfmv5q@3H0q}t1^AjT= zJbyeqg2&_W=tk+}2{?!oBfw^}*)$rB2EYa_vh8zX1dNZ5k4q#HC4iL^Ct!Md`ldi2 zXa;Z#z&e2Y)xeMzV6j*%5{cxiw6wGa0Dk~j1+eY>ozuY!&pk?|^1Gs;(;bULj-Ah@d4YSlDwl69-yZhzmehPxJbL&ic@tJPXlQ*$LgKK?VUR;vOq zPqS}!1kXlDv_OA<|7d=Gz5>8)8nnly`=AQY>2$ZmV)551mCBKAa(H5KmvL8uBEV*| zZOUY_Z|m#phiTUJba>pdA6CJ2A>aZ=M@MhuZh&bC}G@0LoX{VaCb^L6lW z5kUO7M<1`5nwt7KH#fK4VzK;5&wr7LU2Mngq}~W1&AYk0ylnL51tycpSXEWk-re0j zMKk`FzwB}tq+D@6FE8)YrKP3Yhm|_^_V#u=J3Gk+Lr6|H>1LbMZNh?e%<4GkzF1OH z(&#SunVFf{*x1;QoND}!hQdKNoUa-Pg~A4t$z*a4ocvu;QSl`$G9}Z?AYPn61b&bJ z*HLJfjvDIT-d^Hit5__~j*gCwT3cJ&=<4eFzNe?>N7_lr_wM;?bnz5-*KLR`NNbSm nHsN$5O*R+%OMsBLZUf+7d1V0zgiDYR00000NkvXXu0mjf>-Lnw delta 652 zcmV;70(1TM3Zn&(BYy&FNkl1YQHH zLkiSIKfjNGJHX5o1uR>DQDC>H_0mLlxjn1aAJ^Aj}C z?PBZ#I+U0PT+h0pr`>!Cql39Uz>EJ?h^+;F00)7kMUp477SJD>BfwahN-+q00QLh9 zt5gp83h7kypqZVhlso}j;F0+(j@Av-b_;wq-}E(2Bu~pNa1J;M{A@C48v-L{rs0{7 z;64Su1AhmA%O0QMtqM9DHXOSvu0WlMR$b)l2ZkHYF&DQF{HhS+ zK5*R3Hn)!30@}TI m`^iV(hFNtC%0Js}fIl88X>yQ^OAY`4002ovP6b4+LSTZzog*gz diff --git a/src/static/images/taskbar/prev.png b/src/static/images/taskbar/prev.png index 6739fdb8728288e72605111b5afc1b506298e283..6268f9a9b7c86dc748de6918fff388307fea8581 100644 GIT binary patch delta 1545 zcmV+k2KM>-1(^(xBYy?pNklF7=CUkQgn{84Js(m4ssEYEGiZEgBa1q z`D>f5VcigQZvL1lVP+;w`LRFjBheUK!;Hjb%2%vWek|h$bm1de!}`V7K&vw>Y~2Q% z8zplKwzqdV*|}TMOX;=uI`8h0Dl6Q1@H@i zI{+dg;}QkoT?rtQ@}>g#gYy1N|6Z0?1t1+jnO?6y*w)r|+39pT&z?Qorqk(O0ZPHT)1$-J~T8mbne`_w)FJ$mjP@5u$t;y5)6H4b8>R>YZDU_ z*ZC-njEsx{*nbOPJ$X|yicbcR1z?*-qd7c2K7K8l*W>Z{0K61sLM&<^yoIOrdi{an z;o)&!1f!#)!vLNGuqM%2ph8vvSPNjs&Ye3Og2CXt7_Zyy_HNy}^$h?8)UYT>+;3@V zX=xYx5&;&AjKEzSY*Tw;wW_%`YrBE-NeRDQbGr3`83sQ<}suOwuynrJ^gw zlCc;=JRyIAgem}o*XupHY15|7@r+feR4U57h*vH0EH719JfPyqN>iAfoxQ>5^Bvde zbZg=rPk%%2KEzy>WD-u00zgM1&}=sEn3|e8DMfrNh|Pd(py9ZZiqE&%Y_A?Ua%7*J z9EusB$*KjAL*l)sr{_(R$+Sam9z_h$cqgkyK1o==-+zK-Syl-y*>ix3C-qEmMMXu$ z+}vD~QsN<}0fu2z48x?-vY`0bv188<4i3JTmVcI}m5W0RvV;&#*44Dc$nWUrIB2n0 z_R6kS1PL36+MGyPU~suyM~z0~7A3@rAt3|Nn^R_H=6aXQRiBram#dgs5hRiWD}>Ey z&z?P%)6>(ZAGUZTU?7DSVZE- zk_O2kq|sx3{e z<5g8vA2&2KG|SDSXgSUEe1x`We}5z))!5j0wY#Be-F^)z8kgaIn&b8 zYH!@QLBcCxh#8RFI*QYXklbXq9xE&?Jl@~m-yiRIh7p$)ZGaSHTqF|VmJve!&pk*1 zckiaRef#zgZ8qD*c*b%Z7ooh1y7kcp$TZ)%b?a6j))$S9jZM?Ge^{yk{D1obeh2U! zfUm7qYwP~~`#%VULU&_~;RAud4CP(2GfGY<3_6|8;_-OAV!c|Q&*uiPiykR5GIi<6 z314MVQPEp7Gc!Ml@eU3SI$4(8N4uL#Ho8fWJw{vlW}nYDa!<>jY(_5vAkB(YnXekG zp-t@Sfq{XcXx`r5-aY`NkAGZ5^~KCl6+P!K-MDe%p{}m3&)jae`_iRLU8SX^2cj=s zC~(<>G(w)q&(E(pfBt-j!{PX%xw-jbMn*=Ja6dzA(Ghb)9wOHcNSKh1aNUN)AXy5P vx^5#}KOpTX(q9vJ$;u^Mw^_V!0Qd{a+x8;jBM0#S0000JTm-NcCVM&Y4cOlv$6LVbBn17@JNtGyWCL}GC^j1ks zO6m?EeuJbBDe+%R>d0eYDCOlk?s^vAH%;sa7xNgH$RKI=B>rSZ+z6lIdS_=3sst*) z#{%y)LZsmeuq{X5-|+`&27YFc{Ax<>R4fB-06jVTCt}ZZD8?3>fhQK?Q&EzzX0d(CwNy#1PtUCaZJt1Tb(IxDL$q6~N~Z z8UXftjOIz4Ezg6){C0)K0PN39^90tUXA4XVqN9&6YR zp;axQc?!xrkvV~_foEp3Y8luXm=Ej)CjM6gOM!=GC3@#clNE~0fv6Pn-c%DFl&HOi zA_nTkrD#cA4-7fhWCa(iP#)w<$}w7AS#)x2F5+=O~Ca=_S~Gx z?m6ad2!9_t@mF9YaMlBN0zOlTgTNt={5AN_h5CW5z&Bq3LL_rhm0}I>!UuV%Z1kl` z#YbEdhfJq`09%05E=kKc4;%sZxgsm;Kr?9mC-~efQJE*Q+h%f)HbatTU{1z6F6*gP zW8zxQ{)yOW2I7^sI3}%SPLDsp4&X$NzO&*F(p(Hox76Kt{3rLnI1cQ|=yNBN#atyw zyKeAZQcr-(9=#3XSMy%>h+3zl3+9H%8%dWWEf09zrbE)8q)|yvCG|^MkhpFG`~^bL VRuLW>872S#002ovPDHLkV1nGdQ2GD> From 86f9c037075c52998ded619e9e580a60bf3e7beb Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 27 Feb 2022 12:25:53 +0800 Subject: [PATCH 02/79] =?UTF-8?q?=E6=B7=BB=E5=8A=A0LX=E4=B8=AD=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=9A=84=E5=BF=AB=E6=8D=B7=E6=93=8D=E4=BD=9C=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FAQ.md | 17 ++++++++++++++++- publish/changeLog.md | 17 +++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 9a2b1685..8a8d4325 100644 --- a/FAQ.md +++ b/FAQ.md @@ -6,7 +6,7 @@ 洛雪音乐的最初定位不是作为播放器开发的，它主要用于**查找歌曲**，软件的播放功能仅用于试听，不建议用作为常用播放器使用。 -## LX Music中的音乐播放列表机制 +## 音乐播放列表机制 1. 默认情况下，播放搜索列表、歌单列表、排行榜列表的歌曲时会自动将该歌曲添加到“我的列表”的试听列表后再播放，手动将歌曲添加到试听列表，再去试听列表找到这首歌点播放是等价的 2. 如果你想要播放多首歌曲，需要使用多选功能（若不知道如何多选请看常见问题）多选后，将歌曲这些歌曲添加到“我的列表”播放，或使用稍后播放功能播放 @@ -15,6 +15,21 @@ 5. 对于排行榜详情列表，除了可以使用第2条的方式播放外，你可以在右击排行榜名字后弹出的菜单中，播放或收藏整个排行榜，这与第四条的歌单中的播放、与收藏按钮功能一致 6. v1.18.0及之后新增了“双击列表里的歌曲时自动切换到当前列表播放”设置，默认关闭，此功能仅对歌单、排行榜有效 +## 可用的鼠标、键盘快捷操作 + +- 鼠标**右击**播放栏的歌曲图片封面可以**定位**当前播放的歌曲 +- 鼠标**右击**播放栏进度条上的`LRC`按钮可以锁定/解锁桌面歌词 +- 歌曲搜索框、歌单链接输入框内鼠标**右击**可以将当前剪贴板上的文字粘贴到输入框内 +- 鼠标**右击**搜索界面中的单条搜索历史可以将其移除 +- 歌曲列表内的文字在选中后，鼠标**右击**可以复制已选中的文字，此功能只对搜索、歌单、排行榜、我的列表中的列表有效 +- 鼠标在播放详情页内**右键双击**可以关闭播放详情页 +- 鼠标**左击**播放栏上的歌曲名字可以将它复制 +- 在歌单详情页按**退格键**可以返回歌单列表 +- 歌曲列表中可以使用`Ctrl`、`Shift`键进行多选，这类似Windows下的文件选择，详情看常见问题列表多选部分 +- 在我的列表内可以使用`Ctrl + f`键打开搜索框进行列表内歌曲搜索，搜索框按`Esc`键可以关闭搜索框 +- 在我的列表按住`Ctrl`键可以进入**列表拖动模式**，此时可以用鼠标拖动列表调整列表的位置 +- 编辑列表名时按`Esc`键可以取消编辑 + ## 歌曲无法试听与下载 ### 所有歌曲都提示 `请求异常😮，可以多试几次，若还是不行就换一首吧。。。` diff --git a/publish/changeLog.md b/publish/changeLog.md index 9b1e4a00..244a38df 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,20 @@ ### 优化 - 优化Windows任务栏缩略图工具栏控制按钮在浅色任务栏下的显示效果 + +### 文档 + +添加LX中定义的快捷操作汇总说明到常见问题中，这是目前可用的鼠标、键盘快捷操作，他们都可以在更新日志中找到 + +- 鼠标右击播放栏的歌曲图片封面可以定位当前播放的歌曲 +- 鼠标右击播放栏进度条上的LRC按钮可以锁定/解锁桌面歌词 +- 歌曲搜索框、歌单链接输入框内鼠标右击可以将当前剪贴板上的文字粘贴到输入框内 +- 鼠标右击搜索界面中的单条搜索历史可以将其移除 +- 歌曲列表内的文字在选中后，鼠标右击可以复制已选中的文字，此功能只对搜索、歌单、排行榜、我的列表中的列表有效 +- 鼠标在播放详情页内右键双击可以关闭播放详情页 +- 鼠标左击播放栏上的歌曲名字可以将它复制 +- 在歌单详情页按退格键可以返回歌单列表 +- 歌曲列表中可以使用Ctrl、Shift键进行多选，这类似Windows下的文件选择，详情看常见问题列表多选部分 +- 在我的列表内可以使用Ctrl + f键打开搜索框进行列表内歌曲搜索，搜索框按Esc键可以关闭搜索框 +- 在我的列表按住Ctrl键可以进入列表拖动模式，此时可以用鼠标拖动列表调整列表的位置 +- 编辑列表名时按Esc键可以取消编辑 From b51c8e155288b74ec3ebc64ffe29eaddb1aa0cff Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 28 Feb 2022 12:00:54 +0800 Subject: [PATCH 03/79] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=9C=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E5=A3=B0=E9=9F=B3=E8=BE=93=E5=87=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=A2=AB=E6=94=B9=E5=8F=98=E6=97=B6=E6=9A=82=E5=81=9C?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=AD=8C=E6=9B=B2=E2=80=9D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 4 ++++ src/renderer/core/useApp/usePlayer/useMediaDevice.js | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 244a38df..5952e28c 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -2,6 +2,10 @@ - 优化Windows任务栏缩略图工具栏控制按钮在浅色任务栏下的显示效果 +### 修复 + +- 修复“当前的声音输出设备被改变时暂停播放歌曲”设置无效的问题 + ### 文档 添加LX中定义的快捷操作汇总说明到常见问题中，这是目前可用的鼠标、键盘快捷操作，他们都可以在更新日志中找到 diff --git a/src/renderer/core/useApp/usePlayer/useMediaDevice.js b/src/renderer/core/useApp/usePlayer/useMediaDevice.js index fe439eed..04599c50 100644 --- a/src/renderer/core/useApp/usePlayer/useMediaDevice.js +++ b/src/renderer/core/useApp/usePlayer/useMediaDevice.js @@ -7,6 +7,10 @@ import { setMediaDeviceId } from '@renderer/plugins/player' import { isPlay } from '@renderer/core/share/player' import { player as eventPlayerNames } from '@renderer/event/names' +const getDevices = async() => { + const devices = await navigator.mediaDevices.enumerateDevices() + return devices.filter(({ kind }) => kind == 'audiooutput') +} export default ({ setting }) => { let prevDeviceLabel = null @@ -15,7 +19,7 @@ export default ({ setting }) => { const setMediaDevice = async(mediaDeviceId) => { let label = prevDeviceLabel - const devices = await navigator.mediaDevices.enumerateDevices() + const devices = await getDevices() let device = devices.find(device => device.deviceId === mediaDeviceId) if (device) { mediaDeviceId = device.deviceId @@ -41,12 +45,12 @@ export default ({ setting }) => { setting.value.player.isMediaDeviceRemovedStopPlay && isPlay.value && device.label != prevDeviceLabel - ) window.eventHub.emit(eventPlayerNames.setTogglePlay) + ) window.eventHub.emit(eventPlayerNames.setPause) } const handleMediaListChange = async() => { let mediaDeviceId = setting.value.player.mediaDeviceId - const devices = await navigator.mediaDevices.enumerateDevices() + const devices = await getDevices() let device = devices.find(device => device.deviceId === mediaDeviceId) if (!device) device = devices.find(device => device.deviceId === 'default') if (!device) device = { label: null, deviceId: null } From 52b985dd8e2db4c091584e05f15c82f251a98cd1 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 2 Mar 2022 18:41:29 +0800 Subject: [PATCH 04/79] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 52 +++++++++++++++++++++++++++++------------------ package.json | 6 +++--- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index e46135c3..255ee681 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6713,9 +6713,9 @@ } }, "electron-to-chromium": { - "version": "1.4.73", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz", - "integrity": "sha512-RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA==", + "version": "1.4.75", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz", + "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==", "dev": true }, "electron-updater": { @@ -8036,9 +8036,9 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "fast-json-stringify": { - "version": "2.7.12", - "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-2.7.12.tgz", - "integrity": "sha512-4hjwZDPmgj/ZUKXhEWovGPciE/5mWtAIQQxN+2VBDFun7DRTk2oOItbu9ZZp6kqj+eZ/u7z+dgBgM74cfGRnBQ==", + "version": "2.7.13", + "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-2.7.13.tgz", + "integrity": "sha512-ar+hQ4+OIurUGjSJD1anvYSDcUflywhKjfxnsW4TBTD7+u0tJufv6DKRWoQk3vI6YBOWMoz0TQtfbe7dxbQmvA==", "requires": { "ajv": "^6.11.0", "deepmerge": "^4.2.2", @@ -8060,6 +8060,11 @@ "boolean": "^3.1.4" } }, + "fast-safe-stringify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", + "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" + }, "fastest-levenshtein": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", @@ -8948,9 +8953,9 @@ } }, "http-terminator": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/http-terminator/-/http-terminator-3.0.4.tgz", - "integrity": "sha512-9xQ5RFxwBxuGJhFgaBzykLUkSYRPyOb2xcR3EAYzj4Y8WteWmu5zsfEQncxLiyCJQHCdAexjuDcciUqw9W3/Sw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/http-terminator/-/http-terminator-3.1.0.tgz", + "integrity": "sha512-c57dUVVHs+jLXeJvs3Y+GrEGMnGE5yxS8ngNTSh5HlP3Q12s6cxVlukE4UcI0xfWyfcm8RRPMAoaFVAlylKcYg==", "requires": { "delay": "^5.0.0", "p-wait-for": "^3.2.0", @@ -8959,23 +8964,23 @@ }, "dependencies": { "roarr": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-7.8.0.tgz", - "integrity": "sha512-BKPYQkqzoOsKeaJEkx0WWW4hh/SSxOyRqhjnL6SSypMHV3ZmINkKyGIDRvinB4AMXfKBUGiy1J7qtl6teIC5tQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-7.8.1.tgz", + "integrity": "sha512-QkHD0lqGjJbmy7a/Vsq/0atvhfzWyIjHv8XbMsMY9zNaA7MCT4RmxRhDes/oAiU3q+tF7pWnliLLfPMYLFMyeA==", "requires": { "boolean": "^3.1.4", "fast-json-stringify": "^2.7.10", "fast-printf": "^1.6.9", + "fast-safe-stringify": "^2.1.1", "globalthis": "^1.0.2", "is-circular": "^1.0.2", - "json-stringify-safe": "^5.0.1", "semver-compare": "^1.0.0" } }, "type-fest": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.6.0.tgz", - "integrity": "sha512-XN1FDGGtaSDA6CFsCW5iolTQqFsnJ+ZF6JqSz0SqXoh4F8GY0xqUv5RYnTilpmL+sOH8OH4FX8tf9YyAPM2LDA==" + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.12.0.tgz", + "integrity": "sha512-Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA==" } } }, @@ -15054,11 +15059,18 @@ } }, "vue-router": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.12.tgz", - "integrity": "sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.13.tgz", + "integrity": "sha512-LmXrC+BkDRLak+d5xTMgUYraT3Nj0H/vCbP+7usGvIl9Viqd1UP6AsP0i69pSbn9O0dXK/xCdp4yPw21HqV9Jw==", "requires": { - "@vue/devtools-api": "^6.0.0-beta.18" + "@vue/devtools-api": "^6.0.0" + }, + "dependencies": { + "@vue/devtools-api": { + "version": "6.0.12", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.12.tgz", + "integrity": "sha512-iO/4FIezHKXhiDBdKySCvJVh8/mZPxHpiQrTy+PXVqJZgpTPTdHy4q8GXulaY+UKEagdkBb0onxNQZ0LNiqVhw==" + } } }, "vue-template-compiler": { diff --git a/package.json b/package.json index c8ebeb66..969e77f0 100644 --- a/package.json +++ b/package.json @@ -197,7 +197,7 @@ "electron-builder": "^23.0.1", "electron-debug": "^3.2.0", "electron-devtools-installer": "^3.2.0", - "electron-to-chromium": "^1.4.73", + "electron-to-chromium": "^1.4.75", "electron-updater": "^5.0.0", "eslint": "^8.10.0", "eslint-config-standard": "^16.0.3", @@ -244,7 +244,7 @@ "electron-log": "^4.4.6", "electron-store": "^8.0.1", "font-list": "github:lyswhut/node-font-list#4edbb1933b49a9bac1eedd63a31da16b487fe57d", - "http-terminator": "^3.0.4", + "http-terminator": "^3.1.0", "iconv-lite": "^0.6.3", "image-size": "^1.0.1", "koa": "^2.13.4", @@ -258,7 +258,7 @@ "utf-8-validate": "^5.0.8", "vue": "^3.2.31", "vue-i18n": "^9.2.0-beta.30", - "vue-router": "^4.0.12", + "vue-router": "^4.0.13", "vuex": "^4.0.2" } } From ba3a70c524848756a008560aa74082dc6ac4ce43 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 3 Mar 2022 13:15:42 +0800 Subject: [PATCH 05/79] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FAQ.md | 3 ++- publish/changeLog.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/FAQ.md b/FAQ.md index 8a8d4325..62352458 100644 --- a/FAQ.md +++ b/FAQ.md @@ -24,9 +24,10 @@ - 歌曲列表内的文字在选中后，鼠标**右击**可以复制已选中的文字，此功能只对搜索、歌单、排行榜、我的列表中的列表有效 - 鼠标在播放详情页内**右键双击**可以关闭播放详情页 - 鼠标**左击**播放栏上的歌曲名字可以将它复制 +- 歌曲搜索框的候选内容可以用键盘上下方向键选择，按回车键搜索已选内容 - 在歌单详情页按**退格键**可以返回歌单列表 - 歌曲列表中可以使用`Ctrl`、`Shift`键进行多选，这类似Windows下的文件选择，详情看常见问题列表多选部分 -- 在我的列表内可以使用`Ctrl + f`键打开搜索框进行列表内歌曲搜索，搜索框按`Esc`键可以关闭搜索框 +- 在我的列表内可以使用`Ctrl + f`键打开搜索框进行列表内歌曲搜索，搜索框按`Esc`键可以关闭搜索框，搜索框内按上下方向键可以选择歌曲，按`回车`键跳转到已选歌曲，按`Ctrl + 回车`可以跳转并播放已选歌曲 - 在我的列表按住`Ctrl`键可以进入**列表拖动模式**，此时可以用鼠标拖动列表调整列表的位置 - 编辑列表名时按`Esc`键可以取消编辑 diff --git a/publish/changeLog.md b/publish/changeLog.md index 5952e28c..0762b232 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -17,8 +17,9 @@ - 歌曲列表内的文字在选中后，鼠标右击可以复制已选中的文字，此功能只对搜索、歌单、排行榜、我的列表中的列表有效 - 鼠标在播放详情页内右键双击可以关闭播放详情页 - 鼠标左击播放栏上的歌曲名字可以将它复制 +- 歌曲搜索框的候选内容可以用键盘上下方向键选择，按回车键搜索已选内容 - 在歌单详情页按退格键可以返回歌单列表 - 歌曲列表中可以使用Ctrl、Shift键进行多选，这类似Windows下的文件选择，详情看常见问题列表多选部分 -- 在我的列表内可以使用Ctrl + f键打开搜索框进行列表内歌曲搜索，搜索框按Esc键可以关闭搜索框 +- 在我的列表内可以使用Ctrl+f键打开搜索框进行列表内歌曲搜索，搜索框按Esc键可以关闭搜索框，搜索框内按上下方向键可以选择歌曲，按回车键跳转到已选歌曲，按Ctrl+回车可以跳转并播放已选歌曲 - 在我的列表按住Ctrl键可以进入列表拖动模式，此时可以用鼠标拖动列表调整列表的位置 - 编辑列表名时按Esc键可以取消编辑 From 4629d4cd3e3b14680326d48b7cddd77cfbe22632 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 3 Mar 2022 17:39:33 +0800 Subject: [PATCH 06/79] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=8C=E9=9D=A2?= =?UTF-8?q?=E6=AD=8C=E8=AF=8D=E6=B2=A1=E6=9C=89=E5=A4=84=E7=90=86=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E6=92=AD=E6=94=BE=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/renderer-lyric/components/core/Lyric.vue | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/publish/changeLog.md b/publish/changeLog.md index 0762b232..9f0b9efe 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -5,6 +5,7 @@ ### 修复 - 修复“当前的声音输出设备被改变时暂停播放歌曲”设置无效的问题 +- 修复桌面歌词没有处理停止播放状态的问题 ### 文档 diff --git a/src/renderer-lyric/components/core/Lyric.vue b/src/renderer-lyric/components/core/Lyric.vue index 7afdae25..5fc1d2b8 100644 --- a/src/renderer-lyric/components/core/Lyric.vue +++ b/src/renderer-lyric/components/core/Lyric.vue @@ -207,6 +207,13 @@ export default { this.isPlay = false window.lrc.pause() break + case 'stop': + this.isPlay = false + this.lyrics.lyric = '' + this.lyrics.tlyric = '' + this.lyrics.lxlyric = '' + this.setLyric() + break case 'info': // console.log('info', data) this.lyrics.lyric = data.lrc From cdc819fbe89464ce0824b48876967b5ad73e1bb1 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 5 Mar 2022 16:06:45 +0800 Subject: [PATCH 07/79] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E8=AF=A6=E6=83=85=E9=A1=B5=E6=AD=8C=E8=AF=8D=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E3=80=81=E6=98=AF=E5=90=A6=E7=BC=A9=E6=94=BE=E3=80=81?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F=E7=9A=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 4 ++ src/common/defaultSetting.js | 9 ++- src/lang/en-us.json | 9 +++ src/lang/zh-cn.json | 9 +++ src/lang/zh-tw.json | 9 +++ .../core/PlayDetail/LyricPlayer.vue | 62 ++++++++++++++++--- .../components/core/PlayDetail/index.vue | 2 +- src/renderer/store/mutations.js | 3 + src/renderer/views/setting/Setting.vue | 6 ++ .../setting/components/SettingPlayDetail.vue | 39 ++++++++++++ src/renderer/views/setting/setting.js | 7 +++ 11 files changed, 150 insertions(+), 9 deletions(-) create mode 100644 src/renderer/views/setting/components/SettingPlayDetail.vue diff --git a/publish/changeLog.md b/publish/changeLog.md index 9f0b9efe..fa0cde30 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,7 @@ +### 新增 + +- 新增对播放详情页歌词大小、是否缩放、对齐方式的设置，可以去设置-播放详情页设置查看 + ### 优化 - 优化Windows任务栏缩略图工具栏控制按钮在浅色任务栏下的显示效果 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index 4f6374b9..cb4dbb0a 100644 --- a/src/common/defaultSetting.js +++ b/src/common/defaultSetting.js @@ -2,7 +2,7 @@ const path = require('path') const os = require('os') const defaultSetting = { - version: '1.0.51', + version: '1.0.52', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -19,6 +19,13 @@ const defaultSetting = { waitPlayEndStop: true, waitPlayEndStopTime: '', }, + playDetail: { + isZoomActiveLrc: true, + style: { + fontSize: 100, + align: 'center', + }, + }, desktopLyric: { enable: false, isLock: false, diff --git a/src/lang/en-us.json b/src/lang/en-us.json index e0b2f8b6..02c3f279 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -323,6 +323,15 @@ "setting__other_tray_theme_native": "White", "setting__other_tray_theme_origin": "Primary Color", "setting__play": "Play", + "setting__play_detail": "Play details page settings", + "setting__play_detail_align": "Lyric Alignment", + "setting__play_detail_align_center": "Centered", + "setting__play_detail_align_left": "Left", + "setting__play_detail_align_right": "Right", + "setting__play_detail_font_size": "Lyrics font size (you can use the keyboard - adjust the font size on the playback details page)", + "setting__play_detail_font_size_current": "Current font size: {size}", + "setting__play_detail_font_size_reset": "Reset", + "setting__play_detail_font_zoom": "Zoom the currently playing lyrics", "setting__play_lyric_lxlrc": "Use Karaoke-style lyrics playback (if supported)", "setting__play_lyric_s2t": "Convert the playing and downloading lyrics to Traditional Chinese", "setting__play_lyric_transition": "Show lyrics translation", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 1440e3aa..e271a2be 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -323,6 +323,15 @@ "setting__other_tray_theme_native": "白色", "setting__other_tray_theme_origin": "原色", "setting__play": "播放设置", + "setting__play_detail": "播放详情页设置", + "setting__play_detail_align": "歌词对齐方式", + "setting__play_detail_align_center": "居中", + "setting__play_detail_align_left": "居左", + "setting__play_detail_align_right": "居右", + "setting__play_detail_font_size": "歌词字体大小（可以在播放详情页使用键盘的+-调整字体大小）", + "setting__play_detail_font_size_current": "当前字体大小：{size}", + "setting__play_detail_font_size_reset": "重置", + "setting__play_detail_font_zoom": "缩放当前正在播放的歌词", "setting__play_lyric_lxlrc": "使用卡拉OK式歌词播放（如果支持）", "setting__play_lyric_s2t": "将播放与下载的歌词转换为繁体中文", "setting__play_lyric_transition": "显示歌词翻译", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index bbb48883..992a8c68 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -323,6 +323,15 @@ "setting__other_tray_theme_native": "白色", "setting__other_tray_theme_origin": "原色", "setting__play": "播放設置", + "setting__play_detail": "播放詳情頁設置", + "setting__play_detail_align": "歌詞對齊方式", + "setting__play_detail_align_center": "居中", + "setting__play_detail_align_left": "居左", + "setting__play_detail_align_right": "居右", + "setting__play_detail_font_size": "歌詞字體大小（可以在播放詳情頁使用鍵盤的 -調整字體大小）", + "setting__play_detail_font_size_current": "當前字體大小：{size}", + "setting__play_detail_font_size_reset": "重置", + "setting__play_detail_font_zoom": "縮放當前正在播放的歌詞", "setting__play_lyric_lxlrc": "使用卡拉OK式歌詞播放（如果支持）", "setting__play_lyric_s2t": "將播放與下載的歌詞轉換為繁體中文", "setting__play_lyric_transition": "顯示歌詞翻譯", diff --git a/src/renderer/components/core/PlayDetail/LyricPlayer.vue b/src/renderer/components/core/PlayDetail/LyricPlayer.vue index 1db3cb57..f5846b33 100644 --- a/src/renderer/components/core/PlayDetail/LyricPlayer.vue +++ b/src/renderer/components/core/PlayDetail/LyricPlayer.vue @@ -1,6 +1,6 @@ + + diff --git a/src/renderer/views/setting/setting.js b/src/renderer/views/setting/setting.js index 93c6ff10..4f518198 100644 --- a/src/renderer/views/setting/setting.js +++ b/src/renderer/views/setting/setting.js @@ -86,7 +86,11 @@ export const currentStting = ref({ }, windowSizeId: 1, langId: 'cns', - themeId: 0, + theme: { + id: 0, + lightId: 0, + darkId: 13, + }, sourceId: 0, font: '', isShowAnimation: true, diff --git a/src/renderer/views/songList/SongList.vue b/src/renderer/views/songList/SongList.vue index 6b021345..cd554a33 100644 --- a/src/renderer/views/songList/SongList.vue +++ b/src/renderer/views/songList/SongList.vue @@ -158,7 +158,7 @@ export default { this.sortId = this.sorts[0] && this.sorts[0].id } }, - 'setting.themeId'() { + 'setting.theme.id'() { this.setTagListWidth() }, }, From 3c2a1093a0b19b100018bb798e6a214ac29727ae Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 10 Mar 2022 17:46:41 +0800 Subject: [PATCH 30/79] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 42 +++++++++++++++++++++--------------------- package.json | 10 +++++----- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index a06bf818..22f7b4d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "1.18.0", + "version": "1.19.0-beta2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4596,22 +4596,22 @@ } }, "browserslist": { - "version": "4.19.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz", - "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz", + "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001312", - "electron-to-chromium": "^1.4.71", + "caniuse-lite": "^1.0.30001313", + "electron-to-chromium": "^1.4.76", "escalade": "^3.1.1", "node-releases": "^2.0.2", "picocolors": "^1.0.0" }, "dependencies": { "caniuse-lite": { - "version": "1.0.30001312", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", - "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==", + "version": "1.0.30001314", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz", + "integrity": "sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==", "dev": true } } @@ -5831,9 +5831,9 @@ } }, "css-loader": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.0.tgz", - "integrity": "sha512-S7HCfCiDHLA+VXKqdZwyRZgoO0R9BnKDnVIoHMq5grl3N86zAu7MB+FBWHr5xOJC8SmvpTLha/2NpfFkFEN/ig==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz", + "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==", "dev": true, "requires": { "icss-utils": "^5.1.0", @@ -6713,9 +6713,9 @@ } }, "electron-to-chromium": { - "version": "1.4.76", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.76.tgz", - "integrity": "sha512-3Vftv7cenJtQb+k00McEBZ2vVmZ/x+HEF7pcZONZIkOsESqAqVuACmBxMv0JhzX7u0YltU0vSqRqgBSTAhFUjA==", + "version": "1.4.80", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.80.tgz", + "integrity": "sha512-COsbJCGVYCc/aAY4cd94x1Js3q0r406YKGbdL8LXHg0O9dEjuFEFU/vZneRxBxKo/f1lLHi0YyAR7sbFM+i8Bg==", "dev": true }, "electron-updater": { @@ -11116,9 +11116,9 @@ "dev": true }, "postcss": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz", - "integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==", + "version": "8.4.8", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz", + "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==", "requires": { "nanoid": "^3.3.1", "picocolors": "^1.0.0", @@ -14891,9 +14891,9 @@ "dev": true }, "utf-8-validate": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.8.tgz", - "integrity": "sha512-k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA==", + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz", + "integrity": "sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q==", "requires": { "node-gyp-build": "^4.3.0" } diff --git a/package.json b/package.json index 8ac2b933..7cf1145c 100644 --- a/package.json +++ b/package.json @@ -183,21 +183,21 @@ "@babel/preset-env": "^7.16.11", "babel-loader": "^8.2.3", "babel-preset-minify": "^0.5.1", - "browserslist": "^4.19.3", + "browserslist": "^4.20.0", "cfonts": "^2.10.0", "chalk": "^4.1.2", "changelog-parser": "^2.8.0", "copy-webpack-plugin": "^10.2.4", "core-js": "^3.21.1", "cross-env": "^7.0.3", - "css-loader": "^6.7.0", + "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^3.4.1", "del": "^6.0.0", "electron": "^13.6.9", "electron-builder": "^23.0.2", "electron-debug": "^3.2.0", "electron-devtools-installer": "^3.2.0", - "electron-to-chromium": "^1.4.76", + "electron-to-chromium": "^1.4.80", "electron-updater": "^5.0.0", "eslint": "^8.10.0", "eslint-config-standard": "^16.0.3", @@ -216,7 +216,7 @@ "markdown-it": "^12.3.2", "mini-css-extract-plugin": "^2.6.0", "node-loader": "^2.0.0", - "postcss": "^8.4.7", + "postcss": "^8.4.8", "postcss-loader": "^6.2.1", "postcss-pxtorem": "^6.0.0", "pug": "^3.0.2", @@ -255,7 +255,7 @@ "request": "^2.88.2", "socket.io": "^4.4.1", "sortablejs": "^1.14.0", - "utf-8-validate": "^5.0.8", + "utf-8-validate": "^5.0.9", "vue": "^3.2.31", "vue-i18n": "^9.2.0-beta.31", "vue-router": "^4.0.13", From 5d2fac9247a9d2c8611c612522a4309e115b75bc Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 10 Mar 2022 17:47:05 +0800 Subject: [PATCH 31/79] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7cf1145c..be78fdac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "1.19.0-beta2", + "version": "1.19.0-beta3", "description": "一个免费的音乐查找助手", "main": "./dist/electron/main.js", "productName": "lx-music-desktop", From 253746843cea9f14702e43640dca509c8ec30347 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 10 Mar 2022 19:02:09 +0800 Subject: [PATCH 32/79] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FAQ.md | 19 ++++++++++--------- publish/changeLog.md | 3 ++- src/lang/en-us.json | 2 +- src/lang/zh-cn.json | 2 +- src/lang/zh-tw.json | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/FAQ.md b/FAQ.md index 1f3aa57b..918a3e3b 100644 --- a/FAQ.md +++ b/FAQ.md @@ -17,18 +17,19 @@ ## 可用的鼠标、键盘快捷操作 -- 鼠标**右击**播放栏的歌曲图片封面可以**定位**当前播放的歌曲 -- 鼠标**右击**播放栏进度条上的`LRC`按钮可以锁定/解锁桌面歌词 -- 歌曲搜索框、歌单链接输入框内鼠标**右击**可以将当前剪贴板上的文字粘贴到输入框内 -- 鼠标**右击**搜索界面中的单条搜索历史可以将其移除 -- 歌曲列表内的文字在选中后，鼠标**右击**可以复制已选中的文字，此功能只对搜索、歌单、排行榜、我的列表中的列表有效 -- 鼠标在播放详情页内**右键双击**可以关闭播放详情页 -- 鼠标**左击**播放栏上的歌曲名字可以将它复制 +- 鼠标右击播放栏的歌曲图片封面可以定位当前播放的歌曲 +- 鼠标右击播放栏进度条上的`LRC`按钮可以锁定/解锁桌面歌词 +- 歌曲搜索框、歌单链接输入框内鼠标右击可以将当前剪贴板上的文字粘贴到输入框内 +- 鼠标右击搜索界面中的单条搜索历史可以将其移除 +- 歌曲列表内的文字在选中后，鼠标右击可以复制已选中的文字，此功能只对搜索、歌单、排行榜、我的列表中的列表有效 +- 鼠标在播放详情页内右键双击可以关闭播放详情页 +- 鼠标左击播放栏上的歌曲名字可以将它复制 +- 鼠标右击设置-主题设置的“道法自然（英文Auto）”主题可以打开亮、暗主题设置窗口 - 歌曲搜索框的候选内容可以用键盘上下方向键选择，按回车键搜索已选内容 -- 在歌单详情页按**退格键**可以返回歌单列表 +- 在歌单详情页按退格键可以返回歌单列表 - 歌曲列表中可以使用`Ctrl`、`Shift`键进行多选，这类似Windows下的文件选择，详情看常见问题列表多选部分 - 在我的列表内可以使用`Ctrl + f`键打开搜索框进行列表内歌曲搜索，搜索框按`Esc`键可以关闭搜索框，搜索框内按上下方向键可以选择歌曲，按`回车`键跳转到已选歌曲，按`Ctrl + 回车`可以跳转并播放已选歌曲 -- 在我的列表按住`Ctrl`键可以进入**列表拖动模式**，此时可以用鼠标拖动列表调整列表的位置 +- 在我的列表按住`Ctrl`键可以进入列表拖动模式，此时可以用鼠标拖动列表调整列表的位置 - 编辑列表名时按`Esc`键可以取消编辑 - 按F11可以进入、退出全屏状态（v1.19.0新增） diff --git a/publish/changeLog.md b/publish/changeLog.md index 5a1bf032..15431e8d 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -3,7 +3,7 @@ - 新增对播放详情页歌词大小、是否缩放、对齐方式的设置，可以去设置-播放详情页设置查看 - 新增播放详情页通过歌词调整播放进度，默认关闭，需要到设置-播放详情页设置开启，开启后在播放详情页拖动歌词时将会出现跳转当前行歌词播放的按钮 - 新增全屏状态，按F11可以进入、退出全屏状态，由于全屏时会隐藏控制栏按钮，所以需要使用鼠标右键双击（详情页的任意地方都可以）来关闭播放详情页 -- 新增动态主题“道法自然”，你可以预先设置一个亮色主题及暗色主题，此后将自动根据系统的亮、暗主题色自动切换为你预先设置的相应主题。注：鼠标 右击 此主题项即可打开亮、暗色主题设置窗口。 +- 新增动态主题“道法自然”，你可以预先设置一个亮色主题及暗色主题，此后将根据系统的亮、暗主题色自动切换为你预先设置的相应主题。注：鼠标 右击 此主题项即可打开亮、暗色主题设置窗口。 ### 优化 @@ -28,6 +28,7 @@ - 歌曲列表内的文字在选中后，鼠标右击可以复制已选中的文字，此功能只对搜索、歌单、排行榜、我的列表中的列表有效 - 鼠标在播放详情页内右键双击可以关闭播放详情页 - 鼠标左击播放栏上的歌曲名字可以将它复制 +- 鼠标右击“道法自然（英文Auto）”主题可以打开亮、暗主题设置窗口 - 歌曲搜索框的候选内容可以用键盘上下方向键选择，按回车键搜索已选内容 - 在歌单详情页按退格键可以返回歌单列表 - 歌曲列表中可以使用Ctrl、Shift键进行多选，这类似Windows下的文件选择，详情看常见问题列表多选部分 diff --git a/src/lang/en-us.json b/src/lang/en-us.json index c238519d..ac967261 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -228,7 +228,7 @@ "setting__basic_sourcename_real": "Original", "setting__basic_sourcename_title": "Select the name of music source", "setting__basic_theme": "Theme", - "setting__basic_theme_auto_tip": "This is a dynamic theme, you can preset a light theme and a dark theme, and then it will automatically switch to the corresponding theme you preset according to the system's light and dark theme colors.\nNote: Right-click this theme item to open the light and dark theme settings window.", + "setting__basic_theme_auto_tip": "This is a dynamic theme, you can preset a light theme and a dark theme, and then it will automatically switch to the corresponding theme you preset according to the system's light and dark theme colors.\nNote: Right-click this theme item to open the light and dark theme setting window.", "setting__basic_to_tray": "Do not exit the software when closing the software and minimize it to the system tray", "setting__basic_window_size": "Window size", "setting__basic_window_size_big": "Large", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 66595a34..63bd81cd 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -228,7 +228,7 @@ "setting__basic_sourcename_real": "原名", "setting__basic_sourcename_title": "选择音源名字类型", "setting__basic_theme": "主题颜色", - "setting__basic_theme_auto_tip": "此乃动态主题，你可以预先设置一个亮色主题及暗色主题，此后将自动根据系统的亮、暗主题色自动切换为你预先设置的相应主题。\n注：鼠标 右击 此主题项即可打开亮、暗色主题设置窗口。", + "setting__basic_theme_auto_tip": "此乃动态主题，你可以预先设置一个亮色主题及暗色主题，此后将根据系统的亮、暗主题色自动切换为你预先设置的相应主题。\n注：鼠标 右击 此主题项即可打开亮、暗色主题设置窗口。", "setting__basic_to_tray": "关闭软件时不退出软件将其最小化到系统托盘", "setting__basic_window_size": "窗口尺寸", "setting__basic_window_size_big": "大", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 7f835678..27f54799 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -228,7 +228,7 @@ "setting__basic_sourcename_real": "原名", "setting__basic_sourcename_title": "選擇音源名字類型", "setting__basic_theme": "主題顏色", - "setting__basic_theme_auto_tip": "此乃動態主題，你可以預先設置一個亮色主題及暗色主題，此後將自動根據系統的亮、暗主題色自動切換為你預先設置的相應主題。\n注：鼠標 右擊 此主題項即可打開亮、暗色主題設置窗口。", + "setting__basic_theme_auto_tip": "此乃動態主題，你可以預先設置一個亮色主題及暗色主題，此後將根據系統的亮、暗主題色自動切換為你預先設置的相應主題。\n注：鼠標 右擊 此主題項即可打開亮、暗色主題設置窗口。", "setting__basic_to_tray": "關閉軟件時不退出軟件將其最小化到系統托盤", "setting__basic_window_size": "窗口尺寸", "setting__basic_window_size_big": "大", From 09a5111e36af6333eedee670ef21fc399c557dae Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 10 Mar 2022 19:52:03 +0800 Subject: [PATCH 33/79] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/components/base/VirtualizedList.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/renderer/components/base/VirtualizedList.vue b/src/renderer/components/base/VirtualizedList.vue index 6a699743..99b132d8 100644 --- a/src/renderer/components/base/VirtualizedList.vue +++ b/src/renderer/components/base/VirtualizedList.vue @@ -215,6 +215,10 @@ export default { return isScrolling ? scrollToValue : dom_scrollContainer.value.scrollTop } + const handleResize = () => { + setTimeout(updateView) + } + const contentStyle = computed(() => ({ display: 'block', height: props.list.length * props.itemHeight + 'px', @@ -238,9 +242,11 @@ export default { startIndex = -1 endIndex = -1 updateView() + window.addEventListener('resize', handleResize) }) onBeforeUnmount(() => { dom_scrollContainer.value.removeEventListener('scroll', onScroll) + window.removeEventListener('resize', handleResize) if (cancelScroll) cancelScroll() }) From 081d6dc91eba9f9bf9fbe20734e5a01fc7542554 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Fri, 11 Mar 2022 10:10:01 +0800 Subject: [PATCH 34/79] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/PlayDetail/components/MusicComment/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/core/PlayDetail/components/MusicComment/index.vue b/src/renderer/components/core/PlayDetail/components/MusicComment/index.vue index d7522199..6a3b4587 100644 --- a/src/renderer/components/core/PlayDetail/components/MusicComment/index.vue +++ b/src/renderer/components/core/PlayDetail/components/MusicComment/index.vue @@ -134,6 +134,10 @@ export default { setWidth() { setTimeout(() => { this.$refs.dom_container.style.width = Math.floor(this.$refs.dom_container.parentNode.clientWidth * 0.5) + 'px' + + setTimeout(() => { + this.handleToggleTab(this.tabActiveId, true) + }) }) }, async getComment(musicInfo, page, limit, retryNum = 0) { @@ -221,8 +225,8 @@ export default { this.newComment.nextPage = page this.handleGetNewComment(this.currentMusicInfo, page, this.newComment.limit) }, - handleToggleTab(id) { - if (this.tabActiveId == id) return + handleToggleTab(id, force) { + if (!force && this.tabActiveId == id) return switch (id) { case 'hot': this.$refs.dom_tabMain.scrollLeft = 0 From bcc79541c19d72fc0f46ffe210650c059c77a1f5 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Fri, 11 Mar 2022 10:52:13 +0800 Subject: [PATCH 35/79] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E4=B8=8B=E7=9A=84UI=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/components/common/AudioVisualizer.vue | 7 +++++-- src/renderer/components/common/ListAddModal.vue | 12 ++++++------ .../components/common/ListAddMultipleModal.vue | 12 ++++++------ .../components/core/PlayDetail/LyricPlayer.vue | 4 +++- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/renderer/components/common/AudioVisualizer.vue b/src/renderer/components/common/AudioVisualizer.vue index 4a1e1548..bced8d9e 100644 --- a/src/renderer/components/common/AudioVisualizer.vue +++ b/src/renderer/components/common/AudioVisualizer.vue @@ -29,11 +29,14 @@ const themes = { const getBarWidth = canvasWidth => { let barWidth = (canvasWidth / 128) * 2.5 - const width = canvasWidth / 85 + const width = canvasWidth / 86 + const diffWidth = barWidth - width // console.log(barWidth - width) // if (barWidth - width > 20) newBarWidth = 20 // barWidth = newBarWidth - return barWidth - width > 12 ? width : barWidth + return diffWidth > 32 + ? canvasWidth / 128 // 4k屏、超宽屏直接显示所有频谱条 + : diffWidth > 12 ? width : barWidth } export default { setup() { diff --git a/src/renderer/components/common/ListAddModal.vue b/src/renderer/components/common/ListAddModal.vue index ad3c5f82..2a1516a8 100644 --- a/src/renderer/components/common/ListAddModal.vue +++ b/src/renderer/components/common/ListAddModal.vue @@ -92,11 +92,11 @@ export default { ...mapMutations('list', ['listAdd', 'listMove', 'createUserList']), handleResize() { const width = window.innerWidth - this.rowNum = width <= 1440 + this.rowNum = width < 1920 ? 3 - : width <= 1920 + : width < 2560 ? 4 - : width <= 2560 ? 5 : 6 + : width < 3840 ? 5 : 6 }, handleClick(index) { this.isMove @@ -212,19 +212,19 @@ export default { } @item-width2: (100% / 4); -@media screen and (min-width: 1920px){ +@media (min-width: 1920px){ .btn { width: calc(@item-width2 - 15px); } } @item-width3: (100% / 5); -@media screen and (min-width: 2048px){ +@media (min-width: 2560px){ .btn { width: calc(@item-width3 - 15px); } } @item-width4: (100% / 6); -@media screen and (min-width: 2560px){ +@media (min-width: 3840px){ .btn { width: calc(@item-width4 - 15px); } diff --git a/src/renderer/components/common/ListAddMultipleModal.vue b/src/renderer/components/common/ListAddMultipleModal.vue index 837e0818..b897b58d 100644 --- a/src/renderer/components/common/ListAddMultipleModal.vue +++ b/src/renderer/components/common/ListAddMultipleModal.vue @@ -93,11 +93,11 @@ export default { ...mapMutations('list', ['listAddMultiple', 'listMoveMultiple', 'createUserList']), handleResize() { const width = window.innerWidth - this.rowNum = width <= 1440 + this.rowNum = width < 1920 ? 3 - : width <= 1920 + : width < 2560 ? 4 - : width <= 2560 ? 5 : 6 + : width < 3840 ? 5 : 6 }, handleClick(index) { this.isMove @@ -210,19 +210,19 @@ export default { } @item-width2: (100% / 4); -@media screen and (min-width: 1920px){ +@media (min-width: 1920px){ .btn { width: calc(@item-width2 - 15px); } } @item-width3: (100% / 5); -@media screen and (min-width: 2048px){ +@media (min-width: 2560px){ .btn { width: calc(@item-width3 - 15px); } } @item-width4: (100% / 6); -@media screen and (min-width: 2560px){ +@media (min-width: 3840px){ .btn { width: calc(@item-width4 - 15px); } diff --git a/src/renderer/components/core/PlayDetail/LyricPlayer.vue b/src/renderer/components/core/PlayDetail/LyricPlayer.vue index 8d320c63..bb06c4ce 100644 --- a/src/renderer/components/core/PlayDetail/LyricPlayer.vue +++ b/src/renderer/components/core/PlayDetail/LyricPlayer.vue @@ -31,6 +31,7 @@