From 6d652c548dc685046f824482143bb177785534a9 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sun, 8 Jan 2023 16:21:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=87=E8=91=A9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ηœ‹θΏ™ι‡Œ](https://github.com/Binaryify/NeteaseCloudMusicApi/issues/1667) --- .../coloryr/allmusic/music/play/LyricDo.java | 6 ++++-- .../allmusic/objs/api/music/lyric/WLyricOBJ.java | 16 ++++++++++++++++ src/test/java/RunTest.java | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/coloryr/allmusic/music/play/LyricDo.java b/src/main/java/coloryr/allmusic/music/play/LyricDo.java index 767875ae..3f93cbc5 100644 --- a/src/main/java/coloryr/allmusic/music/play/LyricDo.java +++ b/src/main/java/coloryr/allmusic/music/play/LyricDo.java @@ -46,8 +46,10 @@ public class LyricDo { temp1 = getTime(tlyric); } - if (obj.getKlyric() != null && !obj.getKlyric().isEmpty()) { - String[] klyric = obj.getKlyric().split("\n"); + String temp2 = obj.getYrc() == null ? obj.getLyric() : obj.getYrc(); + + if (temp2 != null && !temp2.isEmpty()) { + String[] klyric = temp2.split("\n"); for (String item : klyric) { Map temp4 = getKTime(item); if (temp4 != null) { diff --git a/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricOBJ.java b/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricOBJ.java index e3c1339d..581b6ea7 100644 --- a/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricOBJ.java @@ -4,6 +4,7 @@ public class WLyricOBJ { private lrc lrc; private tlyric tlyric; private klyric klyric; + private yrc yrc; private boolean nolyric; private boolean uncollected; @@ -27,6 +28,12 @@ public class WLyricOBJ { return klyric.getLyric(); } + public String getYrc() { + if(yrc == null) + return null; + return yrc.getLyric(); + } + public boolean isNone() { return nolyric || uncollected; } @@ -52,6 +59,15 @@ class klyric { private String lyric; + public String getLyric() { + return lyric == null ? "" : lyric; + } +} + +class yrc +{ + private String lyric; + public String getLyric() { return lyric == null ? "" : lyric; } diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java index 95852da7..dde2b95a 100644 --- a/src/test/java/RunTest.java +++ b/src/test/java/RunTest.java @@ -13,7 +13,7 @@ public class RunTest implements IMyLogger { // { // // } - LyricSave obj = AllMusic.getMusicApi().getLyric("28151022"); + LyricSave obj = AllMusic.getMusicApi().getLyric("26201959"); if (obj.isHaveLyric()) { int time = 0; while (true) {