diff --git a/build.gradle b/build.gradle index 96d02fda..e0057ee7 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "2.18.1" +version = "2.18.2" repositories { mavenCentral() diff --git a/src/main/java/coloryr/allmusic/AllMusic.java b/src/main/java/coloryr/allmusic/AllMusic.java index 0f35adb6..7f3b054a 100644 --- a/src/main/java/coloryr/allmusic/AllMusic.java +++ b/src/main/java/coloryr/allmusic/AllMusic.java @@ -37,7 +37,7 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "2.18.0"; + public static final String version = "2.18.2"; /** * 配置文件版本号 */ diff --git a/src/main/java/coloryr/allmusic/music/play/PlayGo.java b/src/main/java/coloryr/allmusic/music/play/PlayGo.java index 19bc828d..7297dacb 100644 --- a/src/main/java/coloryr/allmusic/music/play/PlayGo.java +++ b/src/main/java/coloryr/allmusic/music/play/PlayGo.java @@ -75,13 +75,13 @@ public class PlayGo { * 清空歌曲数据 */ private static void clear() { + closeTimer(); PlayMusic.musicNowTime = 0; PlayMusic.musicAllTime = 0; PlayMusic.musicLessTime = 0; PlayMusic.lyric = null; PlayMusic.nowPlayMusic = null; AllMusic.side.updateInfo(); - closeTimer(); HudUtils.clearHud(); } @@ -96,7 +96,10 @@ public class PlayGo { private static void time2() { try { - boolean res = PlayMusic.lyric.checkTime(PlayMusic.musicNowTime, AllMusic.getConfig().KtvMode); + if (PlayMusic.lyric == null) + return; + boolean res = PlayMusic.lyric + .checkTime(PlayMusic.musicNowTime, AllMusic.getConfig().KtvMode); if (res) { times = 0; HudUtils.sendHudLyricData(); diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java index 4644402d..c8d2597a 100644 --- a/src/test/java/RunTest.java +++ b/src/test/java/RunTest.java @@ -13,8 +13,8 @@ public class RunTest implements IMyLogger { // { // // } - //https://music.163.com/song?id=1971144922&userid=124183854 - LyricSave obj = AllMusic.getMusicApi().getLyric("1971144922"); + //https://music.163.com/song?id=1422767271&userid=124183854 + LyricSave obj = AllMusic.getMusicApi().getLyric("1449794087"); if (obj.isHaveLyric()) { int time = 0; while (true) {