From 53248e58dd31501ec7bd4293f794144fc9ef3e7a Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sat, 23 May 2026 00:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8CKTV=E6=AD=8C=E8=AF=8D=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client | 2 +- server/core/build.gradle.kts | 2 +- .../server/core/command/sub/CommandHud.java | 4 +- .../core/command/sub/CommandHudSet.java | 52 ++++++++++--- .../server/core/command/sub/CommandNext.java | 2 +- .../allmusic/server/core/music/KtvLyric.java | 16 ---- .../allmusic/server/core/music/LyricSave.java | 72 +++++++----------- .../allmusic/server/core/music/PlayMusic.java | 2 +- .../server/core/music/PlayRuntime.java | 29 +++---- .../server/core/music/TopLyricSave.java | 14 +--- .../server/core/objs/config/ConfigObj.java | 5 -- .../server/core/objs/message/ARG.java | 42 +++++------ .../server/core/objs/message/HudNameObj.java | 7 ++ .../server/core/objs/message/HudObj.java | 33 +++++--- .../server/core/objs/music/LyricItemObj.java | 7 +- .../allmusic/server/core/side/BaseSide.java | 33 ++++++-- .../allmusic/server/core/utils/HudUtils.java | 75 +++++++++++-------- .../allmusic/server/netapi/LyricDecoder.java | 23 +++--- server/core/src/test/java/LyricTest.java | 36 +++++++++ 19 files changed, 257 insertions(+), 199 deletions(-) delete mode 100644 server/core/src/main/java/com/coloryr/allmusic/server/core/music/KtvLyric.java create mode 100644 server/core/src/test/java/LyricTest.java diff --git a/client b/client index 8bd1e1bb..c3a69da4 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 8bd1e1bb5fd6e5b723f68dcb3133471125731c2b +Subproject commit c3a69da4bdf44604d48b193300845026e6ab22b7 diff --git a/server/core/build.gradle.kts b/server/core/build.gradle.kts index 71c4a072..a296541c 100644 --- a/server/core/build.gradle.kts +++ b/server/core/build.gradle.kts @@ -3,6 +3,6 @@ dependencies { shadowImplementation("org.apache.httpcomponents.core5:httpcore5:${Versions.httpcore5}") shadowImplementation("org.apache.httpcomponents.core5:httpcore5-h2:${Versions.httpcore5_h2}") - compileOnly("com.google.code.gson:gson:${Versions.gson}") + implementation("com.google.code.gson:gson:${Versions.gson}") compileOnly("net.kyori:adventure-text-minimessage:${Versions.minimessage}") } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHud.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHud.java index 134e00eb..6d6516bb 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHud.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHud.java @@ -19,6 +19,7 @@ public class CommandHud extends ACommand { this.add("info"); this.add("list"); this.add("lyric"); + this.add("state"); this.add("pic"); }}; private final Map commandList = new HashMap<>(); @@ -29,6 +30,7 @@ public class CommandHud extends ACommand { commandList.put("info", new CommandHudSet(HudType.INFO)); commandList.put("list", new CommandHudSet(HudType.LIST)); commandList.put("lyric", new CommandHudSet(HudType.LYRIC)); + commandList.put("state", new CommandHudSet(HudType.STATE)); commandList.put("pic", new CommandHudSet(HudType.PIC)); } @@ -70,7 +72,7 @@ public class CommandHud extends ACommand { if (args.length == 2 || args.length == 3) { boolean temp = HudUtils.setHudEnable(name, null, args.length == 3 ? args[2] : null); AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.state - .replace(ARG.state, temp ? "启用" : "关闭") + .replace(ARG.value, temp ? AllMusic.getMessage().hudList.enable : AllMusic.getMessage().hudList.disable) .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(null))); return; } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHudSet.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHudSet.java index a6ae7839..0be01128 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHudSet.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandHudSet.java @@ -2,7 +2,7 @@ package com.coloryr.allmusic.server.core.command.sub; import com.coloryr.allmusic.codec.HudBasePosObj; import com.coloryr.allmusic.codec.HudPosType; -import com.coloryr.allmusic.codec.HudItemPosObj; +import com.coloryr.allmusic.codec.HudStatePosObj; import com.coloryr.allmusic.codec.HudType; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.command.ACommand; @@ -32,6 +32,8 @@ public class CommandHudSet extends AHudCommand { private static final List info = new ArrayList() {{ this.add("color"); this.add("shadow"); + this.add("loop"); + this.add("maxwidth"); }}; private static final List tf = new ArrayList() {{ this.add("true"); @@ -54,6 +56,7 @@ public class CommandHudSet extends AHudCommand { commandList.put("color", new HudColor(type)); commandList.put("shadow", new HudShadow(type)); commandList.put("loop", new HudLoop(type)); + commandList.put("maxwidth", new HudMaxWidth(type)); } } @@ -101,7 +104,7 @@ public class CommandHudSet extends AHudCommand { if (args.length == 3 || args.length == 4) { boolean temp = HudUtils.setHudEnable(name, type, args.length == 4 ? args[3] : null); AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.state - .replace(ARG.state, temp + .replace(ARG.value, temp ? AllMusic.getMessage().hudList.enable : AllMusic.getMessage().hudList.disable) .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(type))); @@ -178,9 +181,36 @@ public class CommandHudSet extends AHudCommand { return; } - AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.set4 + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.set5 .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(type)) - .replace(ARG.alpha, String.valueOf(obj.alpha))); + .replace(ARG.value, String.valueOf(obj.alpha))); + } catch (Exception e) { + AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); + } + } + } + + private static class HudMaxWidth extends AHudCommand { + public HudMaxWidth(HudType type) { + super(type); + } + + @Override + public void execute(Object sender, String name, String[] args) { + try { + if (args.length != 4) { + AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); + return; + } + int width = HudUtils.setHudHudMaxWidth(name, type, args[3]); + if (width == -1) { + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().command.error); + return; + } + + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().hud.set6 + .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(type)) + .replace(ARG.value, String.valueOf(width))); } catch (Exception e) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); } @@ -211,7 +241,7 @@ public class CommandHudSet extends AHudCommand { } AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.set1 .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(type)) - .replace(ARG.dir, AllMusic.getMessage().hudList.getDir(type1))); + .replace(ARG.value, AllMusic.getMessage().hudList.getDir(type1))); } @Override @@ -241,7 +271,7 @@ public class CommandHudSet extends AHudCommand { } AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.set2 .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(type)) - .replace(ARG.color, String.format("%06X", color & 0xFFFFFF))); + .replace(ARG.value, String.format("%06X", color & 0xFFFFFF))); } } @@ -255,7 +285,7 @@ public class CommandHudSet extends AHudCommand { if (args.length == 3 || args.length == 4) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.set3 .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(type)) - .replace(ARG.state, HudUtils.setShadow(name, type, args.length == 4 ? args[3] : null) + .replace(ARG.value, HudUtils.setShadow(name, type, args.length == 4 ? args[3] : null) ? AllMusic.getMessage().hudList.enable : AllMusic.getMessage().hudList.disable)); return; @@ -290,7 +320,7 @@ public class CommandHudSet extends AHudCommand { } AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.set2 .replace(ARG.hud, AllMusic.getMessage().hudList.getHud(type)) - .replace(ARG.color, loop)); + .replace(ARG.value, loop)); } @Override @@ -310,7 +340,7 @@ public class CommandHudSet extends AHudCommand { return; } AllMusic.side.sendMessage(sender, - AllMusic.getMessage().hud.picSize.replace(ARG.size, args[2])); + AllMusic.getMessage().hud.picSize.replace(ARG.value, args[2])); } } @@ -319,7 +349,7 @@ public class CommandHudSet extends AHudCommand { public void execute(Object sender, String name, String[] args) { if (args.length == 3 || args.length == 4) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.picRotate - .replace(ARG.state, HudUtils.setPicRotate(name, args.length == 4 ? args[3] : null) + .replace(ARG.value, HudUtils.setPicRotate(name, args.length == 4 ? args[3] : null) ? AllMusic.getMessage().hudList.enable : AllMusic.getMessage().hudList.disable)); return; @@ -344,7 +374,7 @@ public class CommandHudSet extends AHudCommand { return; } AllMusic.side.sendMessage(sender, - AllMusic.getMessage().hud.picSpeed.replace(ARG.size, args[3])); + AllMusic.getMessage().hud.picSpeed.replace(ARG.value, args[3])); } } } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandNext.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandNext.java index 6308953c..ecb2a22f 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandNext.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandNext.java @@ -10,7 +10,7 @@ public class CommandNext extends ACommand { @Override public void execute(Object sender, String name, String[] args) { - PlayMusic.musicLessTime = 1; + PlayMusic.musicLessTime = 10; AllMusic.side.sendMessage(sender, "[AllMusic3]已强制切歌"); BanSave.removeMutePlayer(name); } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/KtvLyric.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/KtvLyric.java deleted file mode 100644 index 7c3d0966..00000000 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/KtvLyric.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.coloryr.allmusic.server.core.music; - -import java.util.ArrayList; -import java.util.List; - -public class KtvLyric { - public List items = new ArrayList<>(); - public long start; - public long time; - - public static class KtvItem { - public long time; - public long start; - public String key; - } -} diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/LyricSave.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/LyricSave.java index 5c505712..52884894 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/LyricSave.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/LyricSave.java @@ -1,24 +1,32 @@ package com.coloryr.allmusic.server.core.music; import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; +import com.coloryr.allmusic.codec.KtvLyricObj; import java.util.HashMap; import java.util.Map; public class LyricSave { protected boolean haveLyric; - protected float kly = 0; protected LyricItemObj now; private Map lyric; - private Map klyric; - private KtvLyric ktvNow; + private Map klyric; + private KtvLyricObj ktvNow; public LyricSave() { haveLyric = false; lyric = new HashMap<>(); } - public void setKlyric(Map klyric) { + public KtvLyricObj getKtvNow() { + return ktvNow; + } + + public LyricItemObj getNow() { + return now; + } + + public void setKlyric(Map klyric) { this.klyric = klyric; } @@ -42,50 +50,17 @@ public class LyricSave { return now.tlyric; } - public float getKly() { - return kly; - } - - public void kUpdate(long playNow) { - if (now == null || now.lyric == null || now.lyric.isEmpty() - || ktvNow == null || ktvNow.items == null || ktvNow.items.isEmpty()) { - kly = 0.0f; - return; - } - - if (playNow < ktvNow.start) { - kly = 0.0f; - return; - } - - if (playNow >= ktvNow.start + ktvNow.time) { - kly = 1.0f; - return; - } - - for (int i = 0; i < ktvNow.items.size(); i++) { - KtvLyric.KtvItem item = ktvNow.items.get(i); - if (playNow >= item.start && playNow < item.start + item.time) { - float progressInChar = (float) (playNow - item.start) / item.time; - kly = (i + progressInChar) / ktvNow.items.size(); - return; - } - } - - kly = 0.0f; - } - - private void ktvGetNext(long time) { + public boolean ktvGetNext(long time) { if (klyric == null) - return; + return false; - KtvLyric temp = klyric.get(time); + KtvLyricObj temp = klyric.get(time); if (temp != null) { ktvNow = temp; - kly = 0.0f; + return true; } - kUpdate(time); + return false; } public boolean lyricGetNext(long playNow) { @@ -94,18 +69,21 @@ public class LyricSave { LyricItemObj temp = lyric.get(playNow); if (temp != null && now != temp) { + if (ktvNow != null) { + long time = Math.abs(ktvNow.start - temp.start); + KtvLyricObj.KtvItem start = ktvNow.items.get(0); + if (time > 500 && (start != null && !temp.lyric.startsWith(start.key))) { + ktvNow = null; + } + } + now = temp.copy(); if (now.tlyric == null) { now.tlyric = ""; } - kly = 0.0f; return true; } return false; } - - public void updateKtv(long playNow) { - ktvGetNext(playNow); - } } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayMusic.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayMusic.java index 2da2aab9..43905f5d 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayMusic.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayMusic.java @@ -296,7 +296,7 @@ public class PlayMusic { } if (AllMusic.getConfig().playListSwitch && (PlayMusic.nowPlayMusic != null && PlayMusic.nowPlayMusic.isList())) { - PlayMusic.musicLessTime = 1; + PlayMusic.musicLessTime = 10; if (!isList) { AllMusic.side.broadcastInTask(AllMusic.getMessage().musicPlay.switchMusic); } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayRuntime.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayRuntime.java index 37063904..06a8bcc7 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayRuntime.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/PlayRuntime.java @@ -18,10 +18,6 @@ public class PlayRuntime { */ private static int count = 0; private static int ping = 0; - /** - * 歌曲更新计数器 - */ - private static long times = 0; /** * 歌曲定时器 */ @@ -73,6 +69,7 @@ public class PlayRuntime { AllMusic.side.updateInfo(); HudUtils.sendClearHud(); HudUtils.sendHudNowData(); + HudUtils.sendHudTime(); HudUtils.sendHudLyricData(); HudUtils.sendHudListData(); } @@ -84,10 +81,10 @@ public class PlayRuntime { private static void time1() { if (isPlay) { PlayMusic.musicNowTime += 10; - count++; - if (count == 100) { - PlayMusic.musicLessTime--; - count = 0; + if (PlayMusic.musicLessTime >= 10) { + PlayMusic.musicLessTime -= 10; + } else { + PlayMusic.musicLessTime = 0; } } @@ -99,17 +96,11 @@ public class PlayRuntime { if (res) { HudUtils.sendHudLyricData(); AllMusic.side.updateLyric(); - if (AllMusic.getConfig().ktvMode) { - PlayMusic.lyric.updateKtv(PlayMusic.musicNowTime); - HudUtils.sendHudKtv(); - } } if (AllMusic.getConfig().ktvMode) { - PlayMusic.lyric.updateKtv(PlayMusic.musicNowTime); - if ((PlayMusic.musicNowTime - times) > AllMusic.getConfig().ktvSendDelay) { - times = PlayMusic.musicNowTime; - HudUtils.sendHudKtv(); + if (PlayMusic.lyric.ktvGetNext(PlayMusic.musicNowTime)) { + AllMusic.side.sendHudKtv(); } } } catch (Exception e) { @@ -212,6 +203,7 @@ public class PlayRuntime { } else { HudUtils.sendClearHud(); HudUtils.sendHudNowData(); + HudUtils.sendHudTime(); HudUtils.sendHudLyricData(); HudUtils.sendHudListData(); AllMusic.side.sendHudUtilsAll(); @@ -239,7 +231,7 @@ public class PlayRuntime { PlayMusic.lyric = new LyricSave(); if (PlayMusic.nowPlayMusic.getLength() != 0) { - PlayMusic.musicAllTime = PlayMusic.musicLessTime = (PlayMusic.nowPlayMusic.getLength() / 1000) + 3; + PlayMusic.musicAllTime = PlayMusic.musicLessTime = PlayMusic.nowPlayMusic.getLength(); isPlay = true; AllMusic.side.sendMusic(PlayMusic.url); if (!AllMusic.getConfig().mutePlayMessage) { @@ -275,9 +267,10 @@ public class PlayRuntime { while (PlayMusic.musicLessTime > 0) { HudUtils.sendHudNowData(); + HudUtils.sendHudTime(); HudUtils.sendHudListData(); if (PlayMusic.nowPlayMusic == null || !AllMusic.side.needPlay(PlayMusic.nowPlayMusic.isList())) { - PlayMusic.musicLessTime = 1; + PlayMusic.musicLessTime = 10; } Thread.sleep(AllMusic.getConfig().sendDelay); } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/TopLyricSave.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/TopLyricSave.java index b5b85e2a..ace3b09d 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/music/TopLyricSave.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/music/TopLyricSave.java @@ -7,28 +7,18 @@ public class TopLyricSave extends LyricSave { public void setTlyric(String data) { if (now == null) { - now = new LyricItemObj(data, ""); + now = new LyricItemObj(data, "", 0); } now.lyric = data; } public void setLyric(String data) { if (now == null) { - now = new LyricItemObj("", data); + now = new LyricItemObj("", data, 0); } now.lyric = data; } - public void setKly(float data) { - kly = data; - } - - public void setHaveK(boolean data) { - if (!data) { - kly = 0; - } - } - public void setHaveT(boolean data) { if (!data) { now = null; diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/config/ConfigObj.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/config/ConfigObj.java index 9b04a17f..a9eba728 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/config/ConfigObj.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/config/ConfigObj.java @@ -31,10 +31,6 @@ public class ConfigObj { * 歌曲延迟 */ public int lyricDelay; - /** - * KTV歌词更新延迟 - */ - public int ktvSendDelay; /** * 默认添加歌曲方式 */ @@ -175,7 +171,6 @@ public class ConfigObj { playListSwitch = true; playListRandom = true; playListEscapeDeep = 40; - ktvSendDelay = 50; sendLyric = true; needPermission = false; mutePlayMessage = false; diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/ARG.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/ARG.java index 4c63e914..edee2a1c 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/ARG.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/ARG.java @@ -1,28 +1,22 @@ package com.coloryr.allmusic.server.core.objs.message; public class ARG { - public static String musicName = "%MusicName%"; - public static String musicAuthor = "%MusicAuthor%"; - public static String musicAlia = "%MusicAlia%"; - public static String musicAl = "%MusicAl%"; - public static String musicId = "%MusicID%"; - public static String hud = "%Hud%"; - public static String cost = "%Cost%"; - public static String index = "%Index%"; - public static String state = "%State%"; - public static String alpha = "%Alpha%"; - public static String x = "%X%"; - public static String y = "%Y%"; - public static String dir = "%Dir%"; - public static String color = "%Color%"; - public static String size = "%Size%"; - public static String name = "%Name%"; - public static String allTime = "%AllTime%"; - public static String nowTime = "%NowTime%"; - public static String player = "%Player%"; - public static String lyric = "%Lyric%"; - public static String list = "%List%"; - public static String count = "%Count%"; - public static String countAll = "%CountAll%"; - public static String time = "%Time%"; + public static String musicName = "%music_name%"; + public static String musicAuthor = "%music_author%"; + public static String musicAlia = "%music_alia%"; + public static String musicAl = "%music_al%"; + public static String musicId = "%music_id%"; + public static String hud = "%hud%"; + public static String cost = "%cost%"; + public static String index = "%index%"; + public static String value = "%value%"; + public static String x = "%x%"; + public static String y = "%y%"; + public static String name = "%name%"; + public static String player = "%player%"; + public static String lyric = "%lyric%"; + public static String list = "%list%"; + public static String count = "%count%"; + public static String countAll = "%count_all%"; + public static String time = "%time%"; } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudNameObj.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudNameObj.java index 25c061ff..f68fadeb 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudNameObj.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudNameObj.java @@ -7,6 +7,7 @@ public class HudNameObj { public String list; public String lyric; public String info; + public String state; public String all; public String pic; public String picRoute; @@ -35,6 +36,8 @@ public class HudNameObj { return true; if (lyric == null) return true; + if (state == null) + return true; if (info == null) return true; if (all == null) @@ -79,6 +82,8 @@ public class HudNameObj { return lyric; case LIST: return list; + case STATE: + return state; } return null; } @@ -113,6 +118,8 @@ public class HudNameObj { public void init() { if (list == null) list = "待播放列表"; + if (state == null) + state = "播放进度"; if (lyric == null) lyric = "歌词"; if (info == null) diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudObj.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudObj.java index 3621b743..464d9a57 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudObj.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/message/HudObj.java @@ -7,6 +7,8 @@ public class HudObj { public String set2; public String set3; public String set4; + public String set5; + public String set6; public String reset; public String emptyMusic; public String emptyList; @@ -40,6 +42,10 @@ public class HudObj { return true; if (set4 == null) return true; + if (set5 == null) + return true; + if (set6 == null) + return true; if (reset == null) return true; if (emptyMusic == null) @@ -67,17 +73,21 @@ public class HudObj { public void init() { if (state == null) - state = "[AllMusic3]设置信息位置:" + ARG.hud + ",状态:" + ARG.state; + state = "[AllMusic3]设置信息位置:" + ARG.hud + ",状态:" + ARG.value; if (set == null) set = "[AllMusic3]已设置[" + ARG.hud + "]的坐标为[" + ARG.x + ", " + ARG.y + "]"; if (set1 == null) - set1 = "[AllMusic3]已设置[" + ARG.hud + "]的对齐方式为[" + ARG.dir + "]"; + set1 = "[AllMusic3]已设置[" + ARG.hud + "]的对齐方式为[" + ARG.value + "]"; if (set2 == null) - set2 = "[AllMusic3]已设置[" + ARG.hud + "]的颜色为[" + ARG.color + "]"; + set2 = "[AllMusic3]已设置[" + ARG.hud + "]的颜色为[" + ARG.value + "]"; if (set3 == null) - set3 = "[AllMusic3]已设置[" + ARG.hud + "]的阴影为[" + ARG.state + "]"; + set3 = "[AllMusic3]已设置[" + ARG.hud + "]的阴影为[" + ARG.value + "]"; if (set4 == null) - set4 = "[AllMusic3]已设置[" + ARG.hud + "]的透明度为[" + ARG.alpha + "]"; + set4 = "[AllMusic3]已设置[" + ARG.hud + "]的透明度为[" + ARG.value + "]"; + if (set5 == null) + set5 = "[AllMusic3]已设置[" + ARG.hud + "]的循环模式为[" + ARG.value + "]"; + if (set6 == null) + set6 = "[AllMusic3]已设置[" + ARG.hud + "]的最大宽度为[" + ARG.value + "]"; if (reset == null) reset = "[AllMusic3]界面[" + ARG.hud + "]恢复至默认位置"; if (emptyMusic == null) @@ -87,22 +97,21 @@ public class HudObj { if (emptyLyric == null) emptyLyric = "无歌词"; if (picSize == null) - picSize = "[AllMusic3]设置图片尺寸为[" + ARG.size + "]"; + picSize = "[AllMusic3]设置图片尺寸为[" + ARG.value + "]"; if (picRotate == null) - picRotate = "[AllMusic3]设置图片旋转为[" + ARG.state + "]"; + picRotate = "[AllMusic3]设置图片旋转为[" + ARG.value + "]"; if (picSpeed == null) - picSpeed = "[AllMusic3]设置图片旋转速度为[" + ARG.size + "]"; + picSpeed = "[AllMusic3]设置图片旋转速度为[" + ARG.value + "]"; if (music == null) - music = ARG.name + " " + ARG.allTime + "/" + ARG.nowTime - + "\n" + ARG.musicAuthor + "\n" + ARG.musicAlia + "\n" + ARG.musicAl + music = ARG.name + " " + ARG.musicAuthor + "\n" + ARG.musicAlia + "\n" + ARG.musicAl + "\nby: " + ARG.player; if (lyric == null) lyric = ARG.lyric; if (tlyric == null) tlyric = ARG.lyric; if (klyric == null) - klyric = "§e" + ARG.lyric; + klyric = "§b" + ARG.lyric; if (list == null) - list = "播放列表里面有" + ARG.size + "首歌\n" + ARG.list; + list = "播放列表里面有" + ARG.value + "首歌\n" + ARG.list; } } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/music/LyricItemObj.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/music/LyricItemObj.java index 39d2971d..200712ef 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/music/LyricItemObj.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/objs/music/LyricItemObj.java @@ -4,12 +4,15 @@ public class LyricItemObj { public String lyric; public String tlyric; - public LyricItemObj(String lyric, String tlyric) { + public long start; + + public LyricItemObj(String lyric, String tlyric, long start) { this.lyric = lyric; this.tlyric = tlyric; + this.start = start; } public LyricItemObj copy() { - return new LyricItemObj(this.lyric, this.tlyric); + return new LyricItemObj(this.lyric, this.tlyric, this.start); } } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/side/BaseSide.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/side/BaseSide.java index db5c80e3..d668b26e 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/side/BaseSide.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/side/BaseSide.java @@ -4,12 +4,13 @@ import com.coloryr.allmusic.codec.CommandType; import com.coloryr.allmusic.codec.HudPosObj; import com.coloryr.allmusic.codec.HudType; import com.coloryr.allmusic.codec.MusicPack; +import com.coloryr.allmusic.codec.KtvLyricObj; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.LyricSave; import com.coloryr.allmusic.server.core.music.PlayMusic; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.saves.HudSave; -import com.coloryr.allmusic.server.core.utils.HudUtils; import net.kyori.adventure.text.Component; import java.io.File; @@ -258,10 +259,10 @@ public abstract class BaseSide { /** * 发送Hud的歌词数据 - * - * @param state 数据 */ - public final void sendHudKtv(float state) { + public final void sendHudKtv() { + MusicPack.LyricKtvMusicPack pack = new MusicPack.LyricKtvMusicPack(PlayMusic.musicNowTime, PlayMusic.lyric.getKtvNow()); + for (Object player : getPlayers()) { String name = getPlayerName(player); if (name == null) @@ -273,7 +274,7 @@ public abstract class BaseSide { HudPosObj obj = HudSave.getOrNew(name); if (!obj.lyric.enable) continue; - send(player, new MusicPack.FloatMusicPack(CommandType.LYRIC_STATE, state)); + send(player, pack); } catch (Exception e) { AllMusic.log.data("[AllMusic]歌词发送出错"); e.printStackTrace(); @@ -296,7 +297,7 @@ public abstract class BaseSide { continue; try { HudPosObj obj = HudSave.getOrNew(name); - if (!obj.lyric.enable) + if (!obj.info.enable) continue; send(player, new MusicPack.StringMusicPack(CommandType.INFO, data)); } catch (Exception e) { @@ -306,6 +307,26 @@ public abstract class BaseSide { } } + public final void sendHudTime(MusicPack.TimeMusicPack pack) { + for (Object player : getPlayers()) { + String name = getPlayerName(player); + if (name == null) + continue; + name = name.toLowerCase(Locale.ROOT); + if (AllMusic.isSkip(name, getPlayerServer(player), true)) + continue; + try { + HudPosObj obj = HudSave.getOrNew(name); + if (!obj.state.enable) + continue; + send(player, pack); + } catch (Exception e) { + AllMusic.log.data("[AllMusic]歌词信息发送出错"); + e.printStackTrace(); + } + } + } + /** * 发送Hud的位置信息 * diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/core/utils/HudUtils.java b/server/core/src/main/java/com/coloryr/allmusic/server/core/utils/HudUtils.java index c8cbbbf0..1e49e949 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/core/utils/HudUtils.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/core/utils/HudUtils.java @@ -41,6 +41,9 @@ public class HudUtils { case PIC: posOBJ = obj.pic; break; + case STATE: + posOBJ = obj.state; + break; default: return null; } @@ -93,6 +96,42 @@ public class HudUtils { return posOBJ; } + /** + * 设置组件透明度 + * + * @param player 用户名 + * @param pos 位置 + * @param width 最大宽度 + * @return 组件数据 + */ + public static int setHudHudMaxWidth(String player, HudType pos, String width) { + HudPosObj obj = HudSave.getOrNew(player); + + if (!Function.isInteger(width)) + return -1; + int maxwidth = Integer.parseInt(width); + if (maxwidth <= 0) { + return -1; + } + switch (pos) { + case LYRIC: + obj.lyric.maxWidth = maxwidth; + break; + case LIST: + obj.list.maxWidth = maxwidth; + break; + case INFO: + obj.info.maxWidth = maxwidth; + break; + default: + return -1; + } + + HudSave.update(player, obj); + HudUtils.sendHudPos(player); + return maxwidth; + } + /** * 更新Hud的List数据 */ @@ -116,25 +155,13 @@ public class HudUtils { list.append(now).append("\n"); } info = AllMusic.getMessage().hud.list - .replace(ARG.size, String.valueOf(PlayMusic.getList().size())) + .replace(ARG.value, String.valueOf(PlayMusic.getList().size())) .replace(ARG.list, list.toString()); } AllMusic.side.sendHudList(info); } - /** - * 时间转换 - * - * @param time 时间 - * @return 结果 - */ - private static String tranTime(long time) { - long m = time / 60; - long s = time - m * 60; - return (m < 10 ? "0" : "") + m + ":" + (s < 10 ? "0" : "") + s; - } - /** * 更新Hud的信息数据 */ @@ -145,8 +172,6 @@ public class HudUtils { } else { info = AllMusic.getMessage().hud.music .replace(ARG.name, infoLimit(PlayMusic.nowPlayMusic.getName())) - .replace(ARG.allTime, tranTime(PlayMusic.musicAllTime)) - .replace(ARG.nowTime, tranTime(PlayMusic.musicNowTime / 1000)) .replace(ARG.musicAuthor, infoLimit(PlayMusic.nowPlayMusic.getAuthor())) .replace(ARG.musicAlia, infoLimit(PlayMusic.nowPlayMusic.getAlia())) .replace(ARG.musicAl, infoLimit(PlayMusic.nowPlayMusic.getAl())) @@ -156,6 +181,11 @@ public class HudUtils { AllMusic.side.sendHudInfo(info); } + public static void sendHudTime() { + MusicPack.TimeMusicPack pack = new MusicPack.TimeMusicPack(PlayMusic.musicAllTime, PlayMusic.musicNowTime); + AllMusic.side.sendHudTime(pack); + } + /** * 更新Hud的歌词数据 */ @@ -182,18 +212,6 @@ public class HudUtils { AllMusic.side.sendHudLyric(new MusicPack.LyricMusicPack(lyr, tran, ktv)); } - public static void sendHudKtv() { - float kLyric; - LyricSave obj = PlayMusic.lyric; - if (obj == null) { - kLyric = 0.0f; - } else { - kLyric = obj.getKly(); - - } - AllMusic.side.sendHudKtv(kLyric); - } - /** * 更新Hud的开启关闭数据 * @@ -526,9 +544,6 @@ public class HudUtils { case LIST: obj.list.loop = loop; break; - case LYRIC: - obj.lyric.loop = loop; - break; case PIC: return null; } diff --git a/server/core/src/main/java/com/coloryr/allmusic/server/netapi/LyricDecoder.java b/server/core/src/main/java/com/coloryr/allmusic/server/netapi/LyricDecoder.java index 67cdf264..6213c163 100644 --- a/server/core/src/main/java/com/coloryr/allmusic/server/netapi/LyricDecoder.java +++ b/server/core/src/main/java/com/coloryr/allmusic/server/netapi/LyricDecoder.java @@ -1,7 +1,7 @@ package com.coloryr.allmusic.server.netapi; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.music.KtvLyric; +import com.coloryr.allmusic.codec.KtvLyricObj; import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; import com.coloryr.allmusic.server.core.utils.Function; import com.coloryr.allmusic.server.netapi.obj.music.lyric.WLyricObj; @@ -15,13 +15,13 @@ public class LyricDecoder { private final Map lyrics = new LinkedHashMap<>(); public boolean isHave = false; public boolean isHaveK = false; - public Map kly = new LinkedHashMap<>(); + public Map kly = new LinkedHashMap<>(); public Map getLyrics() { return lyrics; } - public Map getKLyric() { + public Map getKLyric() { return kly; } @@ -55,7 +55,7 @@ public class LyricDecoder { if (temp2 != null && !temp2.isEmpty()) { String[] klyric = temp2.split("\n"); for (String item : klyric) { - KtvLyric temp4 = getKTime(item, obj.getVersion()); + KtvLyricObj temp4 = getKTime(item, obj.getVersion()); if (temp4 != null) { kly.put(temp4.start, temp4); } @@ -65,13 +65,13 @@ public class LyricDecoder { if (isHaveK) { for (Map.Entry item : temp.entrySet()) { - this.lyrics.put(item.getKey(), new LyricItemObj(item.getValue(), haveT ? temp1.get(item.getKey()) : null)); + this.lyrics.put(item.getKey(), new LyricItemObj(item.getValue(), haveT ? temp1.get(item.getKey()) : null, item.getKey())); } } else { for (Map.Entry item : temp.entrySet()) { String value = AllMusic.getReplacer().replace(item.getValue()); String value1 = AllMusic.getReplacer().replace(temp1.get(item.getKey())); - this.lyrics.put(item.getKey(), new LyricItemObj(value, haveT ? value1 : null)); + this.lyrics.put(item.getKey(), new LyricItemObj(value, haveT ? value1 : null, item.getKey())); } } @@ -121,14 +121,14 @@ public class LyricDecoder { milt /= 10; } time = Long.parseLong(min) * 60 * 1000 + Long.parseLong(sec) * 1000 + milt * 10; - if (time > 0 && time + AllMusic.getConfig().lyricDelay > 0) - time += AllMusic.getConfig().lyricDelay / 10 * 10; +// if (time > 0 && time + AllMusic.getConfig().lyricDelay > 0) +// time += AllMusic.getConfig().lyricDelay / 10 * 10; res.put(time, Function.getString(s, "]", null)); } return res; } - private KtvLyric getKTime(String lyric, boolean yrc) { + private KtvLyricObj getKTime(String lyric, boolean yrc) { if (!lyric.startsWith("[") || !lyric.contains("](")) return null; @@ -148,12 +148,13 @@ public class LyricDecoder { long now = Integer.parseInt(temp11[0]) / 10 * 10; long time = Integer.parseInt(temp11[1]) / 10 * 10; - KtvLyric ktv = new KtvLyric(); + KtvLyricObj ktv = new KtvLyricObj(); ktv.start = now; ktv.time = time; for (int a = 1; a < datas.length; a++) { - KtvLyric.KtvItem item = new KtvLyric.KtvItem(); + KtvLyricObj.KtvItem item = new KtvLyricObj.KtvItem(); item.key = datas[a]; + ktv.charCount += item.key.length(); String temp3 = temp1111.get(a - 1); String[] temp8 = temp3.split(","); long temp5; diff --git a/server/core/src/test/java/LyricTest.java b/server/core/src/test/java/LyricTest.java new file mode 100644 index 00000000..64789066 --- /dev/null +++ b/server/core/src/test/java/LyricTest.java @@ -0,0 +1,36 @@ +import com.coloryr.allmusic.server.core.music.LyricSave; +import com.coloryr.allmusic.server.netapi.LyricDecoder; +import com.coloryr.allmusic.server.netapi.obj.music.lyric.WLyricObj; +import com.google.gson.Gson; + +import java.io.PrintStream; +import java.nio.charset.StandardCharsets; + +public class LyricTest { + public static String temp = "{\"sgc\":false,\"sfy\":false,\"qfy\":false,\"transUser\":{\"id\":3342458,\"status\":99,\"demand\":1,\"userid\":34139657,\"nickname\":\"槿萝绿绿\",\"uptime\":1435895824331},\"lyricUser\":{\"id\":3342453,\"status\":99,\"demand\":0,\"userid\":3230133,\"nickname\":\"宇宙防衛計画\",\"uptime\":1435895824331},\"lrc\":{\"version\":15,\"lyric\":\"[00:23.99]まっすぐに羽を伸ばし\\n[00:28.86]傷跡癒し続ける旅\\n[00:35.33]私はそれでもいい 誰かのために\\n[00:46.28]飛び立てることにもう少し\\n[00:52.04]喜び感じていたいから\\n[00:57.75]あなたとここで出会えたこと \\n[01:03.50]奇跡と呼ばせてください\\n[01:11.25]Over the sky 遠くを見つめてる\\n[01:16.33]その眼に 光が差すように\\n[01:22.45]Open the mind 世界を きっと変えていく\\n[01:30.24]そして 空へ\\n[01:46.45]時々不安になる\\n[01:51.80]私に何ができるのだろう\\n[01:58.42]時間は無限じゃない そんな中で\\n[02:09.04]生きてきた時間の中には\\n[02:14.90]忘れたいこともあるけど\\n[02:20.66]誰かと分かち合えるのなら \\n[02:26.56]記憶は輝き始める\\n[02:34.02]Over the sky 全てが終わるとき\\n[02:39.82]その手で強く抱きしめて\\n[02:45.50]Open the mind 真実 分かる日がきても ずっと···\\n[02:57.77]突然 見つけた希望 偶然 舞い降りてきた夢\\n[03:27.73]Over the sky 遠くを見つめてる\\n[03:33.41]その眼は 光に満ちている\\n[03:39.22]Open the mind 世界を きっと変えていく\\n[03:47.05]そして···\\n[03:53.16]Over the sky 遥かな物語\\n[03:58.62]まだ見ぬ景色が呼んでる\\n[04:04.36]Open the mind 世界に光が差すとき\\n[04:10.41]笑って どこかで見ているから\\n\"},\"klyric\":{\"version\":0,\"lyric\":\"\"},\"tlyric\":{\"version\":4,\"lyric\":\"[by:槿萝绿绿]\\n[00:23.99]笔直地展翅飞去\\n[00:28.86]持续着抚平伤痕的旅途\\n[00:35.33]对我来说这样就好 为了某人\\n[00:46.28]稍稍迟点出发\\n[00:52.04]因为想感受喜悦\\n[00:57.75]请把能在此与你邂逅\\n[01:03.50]称为奇迹\\n[01:11.25]跨越天空 注视着远方\\n[01:16.33]希望那眼中 能被光芒照耀\\n[01:22.45]打开心扉 世界就一定能为之一变\\n[01:30.24]然后 向着天空\\n[01:46.45]偶尔会感到不安\\n[01:51.80]凭我的力量又能做到什么呢\\n[01:58.42]在这有限的时间里\\n[02:09.04]至今已经活过的时光中\\n[02:14.90]尽管也有试图忘记的事\\n[02:20.66]但如果能和谁分担\\n[02:26.56]记忆就会开始闪烁光辉\\n[02:34.02]跨越天空 全部终结之时\\n[02:39.82]请用那双手抱紧我\\n[02:45.50]打开心扉 即使真实揭晓的一天来临 也一直……\\n[02:57.77]突然找到的希望 偶然降临的梦境\\n[03:27.73]跨越天空 注视着远方\\n[03:33.41]那眼中 充满着光辉\\n[03:39.22]打开心扉 世界就一定能为之一变\\n[03:47.05]并且…\\n[03:53.16]跨越天空 遥远的传说\\n[03:58.62]尚未见过的景色 正在呼唤\\n[04:04.36]打开心扉 当世界被光芒所笼罩\\n[04:10.41]微笑吧 因为我正在某处看着你\\n\"},\"romalrc\":{\"version\":2,\"lyric\":\"[00:23.990]ma ssu gu ni ha ne wo no ba shi\\n[00:28.860]ki zu a to i ya shi tsu zu ke ru ta bi\\n[00:35.330]wa ta shi wa so re de mo i i da re ka no ta me ni\\n[00:46.280]to bi ta te ru ko to ni mo u su ko shi\\n[00:52.040]yo ro ko bi ka n ji te i ta i ka ra\\n[00:57.750]a na ta to ko ko de de a e ta ko to\\n[01:03.500]ki se ki to yo ba se te ku da sa i\\n[01:11.250]Over the sky to o ku wo mi tsu me te ru\\n[01:16.330]so no me ni hi ka ri ga sa su yo u ni\\n[01:22.450]Open the mind se ka i wo ki tto ka e te i ku\\n[01:30.240]so shi te so ra e\\n[01:46.450]to ki do ki fu a n ni na ru\\n[01:51.800]wa ta shi ni na ni ga de ki ru no da ro u\\n[01:58.420]ji ka n wa mu ge n ja na i so n na na ka de\\n[02:09.040]i ki te ki ta ji ka n no na ka ni wa\\n[02:14.900]wa su re ta i ko to mo a ru ke do\\n[02:20.660]da re ka to wa ka chi a e ru no na ra\\n[02:26.560]ki o ku wa ka ga ya ki ha ji me ru\\n[02:34.020]Over the sky su be te ga o wa ru to ki\\n[02:39.820]so no te de tsu yo ku da ki shi me te\\n[02:45.500]Open the mind shi n ji tsu wa ka ru hi ga ki te mo zu tto···\\n[02:57.770]to tsu ze n mi tsu ke ta ki bo u gu u ze n ma i o ri te ki ta yu me\\n[03:27.730]Over the sky to o ku wo mi tsu me te ru\\n[03:33.410]so no me wa hi ka ri ni mi chi te i ru\\n[03:39.220]Open the mind se ka i wo ki tto ka e te i ku\\n[03:47.050]so shi te···\\n[03:53.160]Over the sky ha ru ka na mo no ga ta ri\\n[03:58.620]ma da mi nu ke shi ki ga yo n de ru\\n[04:04.360]Open the mind se ka i ni hi ka ri ga sa su to ki\\n[04:10.410]wa ra tte do ko ka de mi te i ru ka ra\"},\"yrc\":{\"version\":4,\"lyric\":\"[23930,5030](23930,840,0)ま(24770,160,0)っ(24930,230,0)す(25160,300,0)ぐ(25460,840,0)に(26300,600,0)羽(26900,920,0)を(27820,310,0)伸(28130,150,0)ば(28280,680,0)し\\n[29750,5620](29750,1280,0)傷(31030,940,0)跡(31970,480,0)癒(32450,270,0)し(32720,940,0)続(33660,270,0)け(33930,240,0)る(34170,1200,0)旅\\n[35550,10030](35550,1510,0)私(37060,910,0)は(37970,320,0)そ(38290,250,0)れ(38540,660,0)で(39200,550,0)も(39750,70,0)い(39820,820,0)い(40640,540,0)誰(41180,240,0)か(41420,2010,0)の(43430,120,0)た(43550,770,0)め(44320,1260,0)に\\n[46500,5480](46500,260,0)飛(46760,240,0)び(47000,230,0)立(47230,460,0)て(47690,540,0)る(48230,90,0)こ(48320,1320,0)と(49640,60,0)に(49700,120,0)も(49820,1210,0)う(51030,500,0)少(51530,450,0)し\\n[52260,5720](52260,790,0)喜(53050,1300,0)び(54350,130,0)感(54480,1290,0)じ(55770,70,0)て(55840,120,0)い(55960,1190,0)た(57150,30,0)い(57180,210,0)か(57390,590,0)ら\\n[58370,5240](58370,240,0)あ(58610,220,0)な(58830,490,0)た(59320,200,0)と(59520,1150,0)こ(60670,60,0)こ(60730,510,0)で(61240,290,0)出(61530,230,0)会(61760,980,0)え(62740,220,0)た(62960,250,0)こ(63210,400,0)と\\n[63880,6570](63880,270,0)奇(64150,510,0)跡(64660,700,0)と(65360,300,0)呼(65660,180,0)ば(65840,270,0)せ(66110,660,0)て(66770,340,0)く(67110,190,0)だ(67300,260,0)さ(67560,2890,0)い\\n[71220,5570](71220,450,0)Over (71670,160,0)the (71830,1040,0)sky (72870,480,0)遠(73350,150,0)く(73500,810,0)を(74310,510,0)見(74820,490,0)つ(75310,500,0)め(75810,480,0)て(76290,500,0)る\\n[76930,5640](76930,290,0)そ(77220,230,0)の(77450,280,0)眼(77730,870,0)に (78600,1100,0)光(79700,390,0)が(80090,450,0)差(80540,1230,0)す(81770,160,0)よ(81930,150,0)う(82080,490,0)に\\n[82830,7460](82830,470,0)Open (83300,170,0)the (83470,980,0)mind(84450,270,0)世(84720,770,0)界(85490,460,0)を(85950,900,0)き(86850,100,0)っ(86950,470,0)と(87420,340,0)変(87760,600,0)え(88360,200,0)て(88560,700,0)い(89260,1030,0)く\\n[90620,9080](90620,1050,0)そ(91670,580,0)し(92250,2420,0)て(94670,450,0)空(95120,4580,0)へ\\n[106710,4940](106710,1280,0)時(107990,1090,0)々(109080,370,0)不(109450,1120,0)安(110570,300,0)に(110870,230,0)な(111100,550,0)る\\n[113500,4580](113500,500,0)私(114000,620,0)に(114620,610,0)何(115230,230,0)が(115460,700,0)で(116160,290,0)き(116450,230,0)る(116680,240,0)の(116920,700,0)だ(117620,290,0)ろ(117910,170,0)う\\n[118320,9540](118320,990,0)時(119310,390,0)間(119700,1000,0)は(120700,320,0)無(121020,850,0)限(121870,180,0)じ(122050,390,0)ゃ(122440,270,0)な(122710,640,0)い(123350,620,0)そ(123970,260,0)ん(124230,1320,0)な(125550,1570,0)中(127120,740,0)で\\n[129240,5600](129240,260,0)生(129500,250,0)き(129750,200,0)て(129950,530,0)き(130480,400,0)た(130880,550,0)時(131430,920,0)間(132350,550,0)の(132900,1180,0)中(134080,230,0)に(134310,530,0)は\\n[135020,5850](135020,510,0)忘(135530,230,0)れ(135760,280,0)た(136040,720,0)い(136760,440,0)こ(137200,490,0)と(137690,510,0)も(138200,480,0)あ(138680,1170,0)る(139850,260,0)け(140110,760,0)ど\\n[141100,5320](141100,470,0)誰(141570,440,0)か(142010,510,0)と(142520,510,0)分(143030,480,0)か(143510,510,0)ち(144020,130,0)合(144150,400,0)え(144550,860,0)る(145410,310,0)の(145720,260,0)な(145980,440,0)ら\\n[146630,6800](146630,340,0)記(146970,300,0)憶(147270,810,0)は(148080,770,0)輝(148850,660,0)き(149510,520,0)始(150030,290,0)め(150320,3110,0)る\\n[153930,5750](153930,460,0)Over (154390,180,0)the (154570,1050,0)sky(155620,450,0)全(156070,550,0)て(156620,480,0)が(157100,440,0)終(157540,480,0)わ(158020,490,0)る(158510,430,0)と(158940,740,0)き\\n[159710,5550](159710,280,0)そ(159990,220,0)の(160210,250,0)手(160460,890,0)で(161350,580,0)強(161930,480,0)く(162410,380,0)抱(162790,470,0)き(163260,1110,0)し(164370,440,0)め(164810,450,0)て\\n[165540,10960](165540,500,0)Open (166040,160,0)the (166200,980,0)mind(167180,530,0)真(167710,990,0)実 (168700,450,0)分(169150,490,0)か(169640,450,0)る(170090,580,0)日(170670,410,0)が(171080,540,0)き(171620,380,0)て(172000,1460,0)も(173460,1420,0)ず(174880,110,0)っ(174990,1480,0)と(176470,30,0)···\\n[177140,11520](177140,740,0)突(177880,910,0)然 (178790,520,0)見(179310,120,0)つ(179430,1340,0)け(180770,950,0)た(181720,240,0)希(181960,920,0)望 (182880,820,0)偶(183700,880,0)然 (184580,290,0)舞(184870,300,0)い(185170,690,0)降(185860,500,0)り(186360,200,0)て(186560,970,0)き(187530,320,0)た(187850,810,0)夢\\n[201550,11650](201550,6490,0)Over (208040,240,0)the (208280,1050,0)sky (209330,450,0)遠(209780,160,0)く(209940,870,0)を(210810,470,0)見(211280,440,0)つ(211720,550,0)め(212270,500,0)て(212770,430,0)る\\n[213390,5620](213390,280,0)そ(213670,230,0)の(213900,290,0)眼(214190,950,0)は(215140,1010,0)光(216150,410,0)に(216560,500,0)満(217060,510,0)ち(217570,100,0)て(217670,910,0)い(218580,430,0)る\\n[219280,7690](219280,480,0)Open (219760,170,0)the (219930,1040,0)mind(220970,220,0)世(221190,750,0)界(221940,420,0)を(222360,940,0)き(223300,110,0)っ(223410,470,0)と(223880,430,0)変(224310,460,0)え(224770,160,0)て(224930,740,0)い(225670,1300,0)く\\n[227140,5170](227140,980,0)そ(228120,550,0)し(228670,3610,0)て(232280,30,0)···\\n[232310,5710](232310,460,0)Over (232770,190,0)the (232960,1050,0)sky (234010,500,0)遥(234510,470,0)か(234980,450,0)な(235430,1010,0)物(236440,1580,0)語\\n[238050,5620](238050,330,0)ま(238380,220,0)だ(238600,400,0)見(239000,850,0)ぬ(239850,160,0)景(240010,830,0)色(240840,400,0)が(241240,1610,0)呼(242850,110,0)ん(242960,230,0)で(243190,480,0)る\\n[243950,5990](243950,470,0)Open (244420,170,0)the (244590,1070,0)mind(245660,190,0)世(245850,780,0)界(246630,440,0)に(247070,1030,0)光(248100,410,0)が(248510,250,0)差(248760,280,0)す(249040,420,0)と(249460,480,0)き\\n[249970,9250](249970,960,0)笑(250930,70,0)っ(251000,450,0)て(251450,210,0)ど(251660,270,0)こ(251930,490,0)か(252420,450,0)で(252870,280,0)見(253150,190,0)て(253340,540,0)い(253880,470,0)る(254350,90,0)か(254440,4780,0)ら\\n\"},\"ytlrc\":{\"version\":3,\"lyric\":\"[00:23.930]笔直地展翅飞去\\n[00:29.750]持续着抚平伤痕的旅途\\n[00:35.550]对我来说这样就好 为了某人\\n[00:46.500]稍稍迟点出发\\n[00:52.260]因为想感受喜悦\\n[00:58.370]请把能在此与你邂逅\\n[01:03.880]称为奇迹\\n[01:11.220]跨越天空 注视着远方\\n[01:16.930]希望那眼中 能被光芒照耀\\n[01:22.830]打开心扉 世界就一定能为之一变\\n[01:30.620]然后 向着天空\\n[01:46.710]偶尔会感到不安\\n[01:53.500]凭我的力量又能做到什么呢\\n[01:58.320]在这有限的时间里\\n[02:09.240]至今已经活过的时光中\\n[02:15.020]尽管也有试图忘记的事\\n[02:21.100]但如果能和谁分担\\n[02:26.630]记忆就会开始闪烁光辉\\n[02:33.930]跨越天空 全部终结之时\\n[02:39.710]请用那双手抱紧我\\n[02:45.540]打开心扉 即使真实揭晓的一天来临 也一直……\\n[02:57.140]突然找到的希望 偶然降临的梦境\\n[03:21.550]跨越天空 注视着远方\\n[03:33.390]那眼中 充满着光辉\\n[03:39.280]打开心扉 世界就一定能为之一变\\n[03:47.140]并且…\\n[03:52.310]跨越天空 遥远的传说\\n[03:58.050]尚未见过的景色 正在呼唤\\n[04:03.950]打开心扉 当世界被光芒所笼罩\\n[04:09.970]微笑吧 因为我正在某处看着你\"},\"yromalrc\":{\"version\":4,\"lyric\":\"[00:23.930]ma ssu gu ni ha ne wo no ba shi \\n[00:29.750]ki zu a to i ya shi tsu zu ke ru ta bi \\n[00:35.550]wa ta shi wa so re de mo i i da re ka no ta me ni \\n[00:46.500]to bi ta te ru ko to ni mo u su ko shi \\n[00:52.260]yo ro ko bi ka n ji te i ta i ka ra \\n[00:58.370]a na ta to ko ko de de a e ta ko to \\n[01:03.880]ki se ki to yo ba se te ku da sa i \\n[01:11.220]Over the sky to o ku wo mi tsu me te ru \\n[01:16.930]so no me ni hi ka ri ga sa su yo u ni \\n[01:22.830]Open the mind se ka i wo ki tto ka e te i ku \\n[01:30.620]so shi te so ra e \\n[01:46.710]to ki do ki fu a n ni na ru \\n[01:53.500]wa ta shi ni na ni ga de ki ru no da ro u \\n[01:58.320]ji ka n wa mu ge n ja na i so n na na ka de \\n[02:09.240]i ki te ki ta ji ka n no na ka ni wa \\n[02:15.020]wa su re ta i ko to mo a ru ke do \\n[02:21.100]da re ka to wa ka chi a e ru no na ra \\n[02:26.630]ki o ku wa ka ga ya ki ha ji me ru \\n[02:33.930]Over the sky su be te ga o wa ru to ki \\n[02:39.710]so no te de tsu yo ku da ki shi me te \\n[02:45.540]Open the mind shi n ji tsu wa ka ru hi ga ki te mo zu tto ··· \\n[02:57.140]to tsu ze n mi tsu ke ta ki bo u gu u ze n ma i o ri te ki ta yu me \\n[03:21.550]Over the sky to o ku wo mi tsu me te ru \\n[03:33.390]so no me wa hi ka ri ni mi chi te i ru \\n[03:39.280]Open the mind se ka i wo ki tto ka e te i ku \\n[03:47.140]so shi te ··· \\n[03:52.310]Over the sky ha ru ka na mo no ga ta ri \\n[03:58.050]ma da mi nu ke shi ki ga yo n de ru \\n[04:03.950]Open the mind se ka i ni hi ka ri ga sa su to ki \\n[04:09.970]wa ra tte do ko ka de mi te i ru ka ra \"},\"code\":200}"; + + public static void main(String[] args) { + WLyricObj obj = new Gson().fromJson(temp, WLyricObj.class); + LyricDecoder docoder = new LyricDecoder(); + docoder.check(obj); + + System.setOut(new PrintStream(System.out, true, StandardCharsets.UTF_8)); + + LyricSave save = new LyricSave(); + save.setLyric(docoder.getLyrics()); + save.setKlyric(docoder.getKLyric()); + + int a = 0; + do { + a += 10; + + if (save.lyricGetNext(a)) { + System.out.println("time: " + a + " lyric: " + save.getNow().lyric); + } + if (save.updateKtv(a)) { + System.out.println("time: " + a + " klyric: " + save.getKtvNow().build()); + } + + } while (a <= 1000000); + } +}