From 43906f95061d9e3f1313d24dd5b10e4e6814b8cc Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 10 Dec 2022 13:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E6=AD=8C?= =?UTF-8?q?=E6=9B=B2=E7=9A=84=E6=A1=8C=E9=9D=A2=E6=AD=8C=E8=AF=8D=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E6=88=96=E7=BD=97=E9=A9=AC=E9=9F=B3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/toside/music/mobile/lyric/LyricPlayer.java | 4 ++-- publish/changeLog.md | 14 +------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/android/app/src/main/java/cn/toside/music/mobile/lyric/LyricPlayer.java b/android/app/src/main/java/cn/toside/music/mobile/lyric/LyricPlayer.java index 4c1317d..280da78 100644 --- a/android/app/src/main/java/cn/toside/music/mobile/lyric/LyricPlayer.java +++ b/android/app/src/main/java/cn/toside/music/mobile/lyric/LyricPlayer.java @@ -124,7 +124,7 @@ public class LyricPlayer { Matcher timeMatchResult = timePattern.matcher(timeField); while (timeMatchResult.find()) { String timeStr = timeMatchResult.group(); - timeStr = timeStr.replace("(\\.\\d\\d)0$", "$1"); + timeStr = timeStr.replaceAll("(?:\\.0+|0+)$", ""); HashMap targetLine = (HashMap) linesMap.get(timeStr); if (targetLine != null) ((ArrayList) targetLine.get("extendedLyrics")).add(text); } @@ -150,7 +150,7 @@ public class LyricPlayer { Matcher timeMatchResult = timePattern.matcher(timeField); while (timeMatchResult.find()) { String timeStr = timeMatchResult.group(); - timeStr = timeStr.replace("(\\.\\d\\d)0$", "$1"); + timeStr = timeStr.replaceAll("(?:\\.0+|0+)$", ""); if (linesMap.containsKey(timeStr)) { ((ArrayList) ((HashMap) linesMap.get(timeStr)).get("extendedLyrics")).add(text); continue; diff --git a/publish/changeLog.md b/publish/changeLog.md index 9880979..5376157 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,15 +1,3 @@ -### 新增 - -- 支持导入PC端v2版本的列表数据 -- 添加kg源罗马音歌词的支持 -- 支持打开波点音乐歌单（需在酷我源打开） - ### 修复 -- 支持单行多时间标签歌词解析，修复某些歌词会出现时间标签的问题 -- 修复某些类型的kg歌单无法导入的问题 -- 修复异常歌单、歌曲数据导致的崩溃问题（#157） - -### 其他 - -- 升级react-native到 v0.68.5 +- 修复某些歌曲的桌面歌词翻译或罗马音没有显示的问题