diff --git a/app/src/main/java/cn/zhaiyifan/lyric/LyricUtils.java b/app/src/main/java/cn/zhaiyifan/lyric/LyricUtils.java index 08a6b05..5cc77f2 100644 --- a/app/src/main/java/cn/zhaiyifan/lyric/LyricUtils.java +++ b/app/src/main/java/cn/zhaiyifan/lyric/LyricUtils.java @@ -72,9 +72,9 @@ public static Lyric parseLyric(ILrcProvider.LyricResult lyricResult, ILrcProvide BufferedReader tbr = new BufferedReader(new StringReader(lyricResult.mTranslatedLyric)); String transLine; while ((transLine = tbr.readLine()) != null) { - if (!parseLine(lyric.transSentenceList, transLine, lyric)) return null; + if (!parseLine(lyric.translatedSentenceList, transLine, lyric)) return null; } - lyric.transSentenceList.sort(new Lyric.SentenceComparator()); + lyric.translatedSentenceList.sort(new Lyric.SentenceComparator()); } catch (IOException e) { e.fillInStackTrace(); } diff --git a/app/src/main/java/cn/zhaiyifan/lyric/model/Lyric.java b/app/src/main/java/cn/zhaiyifan/lyric/model/Lyric.java index fce2923..96e2598 100644 --- a/app/src/main/java/cn/zhaiyifan/lyric/model/Lyric.java +++ b/app/src/main/java/cn/zhaiyifan/lyric/model/Lyric.java @@ -17,7 +17,7 @@ public class Lyric { public int offset; // 偏移值 public long length; // 歌曲长度 public List sentenceList = new ArrayList(100); - public List transSentenceList = new ArrayList(100); + public List translatedSentenceList = new ArrayList(100); @NotNull public String toString() { @@ -34,9 +34,9 @@ public String toString() { stringBuilder.append(sentence.toString()).append("\n"); } } - if (transSentenceList != null) { + if (translatedSentenceList != null) { stringBuilder.append ("--- Translate Lyrics ---\n"); - for (Sentence sentence : transSentenceList) { + for (Sentence sentence : translatedSentenceList) { stringBuilder.append(sentence.toString()).append("\n"); } } @@ -68,4 +68,4 @@ public String toString() { return fromTime + ": " + content; } } -} \ No newline at end of file +} diff --git a/app/src/main/java/statusbar/finder/MusicListenerService.java b/app/src/main/java/statusbar/finder/MusicListenerService.java index 26de159..ae91a95 100644 --- a/app/src/main/java/statusbar/finder/MusicListenerService.java +++ b/app/src/main/java/statusbar/finder/MusicListenerService.java @@ -365,21 +365,16 @@ private void updateLyric(long position) { } } - private int calculateDelay(long position) { // 计算Delay - int delay = 0; - int nextFound = LyricUtils.getSentenceIndex(mLyric.sentenceList, position, 0, mLyric.offset) + 1; // 获取下一句歌词的 Sentence - - if (nextFound < mLyric.sentenceList.size()) { //判断是否超出范围 防止崩溃 - Lyric.Sentence nextSentence = mLyric.sentenceList.get(nextFound); - delay = (int) (nextSentence.fromTime - position) / 1000 / 3; - } - - return delay; + private int calculateDelay(long position) { + int nextFoundIndex = LyricUtils.getSentenceIndex(mLyric.sentenceList, position, 0, mLyric.offset) + 1; + return nextFoundIndex >= mLyric.sentenceList.size() ? 0 : + (int) (mLyric.sentenceList.get(nextFoundIndex) + .fromTime - position / 1000) / 3; } private Lyric.Sentence getTranslatedSentence(long position) { // 获取翻译歌词 - if (!mLyric.transSentenceList.isEmpty()) { - return LyricUtils.getSentence(mLyric.transSentenceList, position, 0, mLyric.offset); + if (!mLyric.translatedSentenceList.isEmpty()) { + return LyricUtils.getSentence(mLyric.translatedSentenceList, position, 0, mLyric.offset); } return null; }