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 18c600d..3b2eee9 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,8 @@ public class LyricPlayer { Matcher timeMatchResult = timePattern.matcher(timeField); while (timeMatchResult.find()) { String timeStr = timeMatchResult.group(); - timeStr = timeStr.replaceAll("(?:\\.0+|(\\.\\d+?)0+)$", "$1"); + if (!timeStr.contains(".")) timeStr += ".0"; + timeStr = timeStr.replaceAll("(?:\\.0+|0+)$", ""); HashMap targetLine = (HashMap) linesMap.get(timeStr); if (targetLine != null) ((ArrayList) targetLine.get("extendedLyrics")).add(text); } @@ -150,7 +151,8 @@ public class LyricPlayer { Matcher timeMatchResult = timePattern.matcher(timeField); while (timeMatchResult.find()) { String timeStr = timeMatchResult.group(); - timeStr = timeStr.replaceAll("(?:\\.0+|(\\.\\d+?)0+)$", "$1"); + if (!timeStr.contains(".")) timeStr += ".0"; + timeStr = timeStr.replaceAll("(?:\\.0+|0+)$", ""); if (linesMap.containsKey(timeStr)) { ((ArrayList) ((HashMap) linesMap.get(timeStr)).get("extendedLyrics")).add(text); continue; diff --git a/package-lock.json b/package-lock.json index fe559aa..2725225 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "events": "^3.3.0", "i18next": "^22.1.5", "js-htmlencode": "^0.3.0", - "lrc-file-parser": "^2.2.6", + "lrc-file-parser": "^2.2.7", "pako": "^2.1.0", "process": "^0.11.10", "prop-types": "^15.8.1", @@ -9691,9 +9691,9 @@ } }, "node_modules/lrc-file-parser": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/lrc-file-parser/-/lrc-file-parser-2.2.6.tgz", - "integrity": "sha512-UftPzQMKaz8U7gZZRvULnL2lenr7giwkVVToY1LD1R2R+wk+ERQP6F/HDnTvXoM3ZWI/jXRx7py33NIiM/5CSQ==" + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/lrc-file-parser/-/lrc-file-parser-2.2.7.tgz", + "integrity": "sha512-gH/5FYUdrQ7YTzNpkBM8fLFsM4OUh0pgYtvgvasDI5eSKW9kQbE/xRYeWKw/++9hBrTI9iGzujuvaFr4qYJaBQ==" }, "node_modules/lru-cache": { "version": "6.0.0", @@ -21624,9 +21624,9 @@ } }, "lrc-file-parser": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/lrc-file-parser/-/lrc-file-parser-2.2.6.tgz", - "integrity": "sha512-UftPzQMKaz8U7gZZRvULnL2lenr7giwkVVToY1LD1R2R+wk+ERQP6F/HDnTvXoM3ZWI/jXRx7py33NIiM/5CSQ==" + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/lrc-file-parser/-/lrc-file-parser-2.2.7.tgz", + "integrity": "sha512-gH/5FYUdrQ7YTzNpkBM8fLFsM4OUh0pgYtvgvasDI5eSKW9kQbE/xRYeWKw/++9hBrTI9iGzujuvaFr4qYJaBQ==" }, "lru-cache": { "version": "6.0.0", diff --git a/package.json b/package.json index fd32b42..88fd251 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "events": "^3.3.0", "i18next": "^22.1.5", "js-htmlencode": "^0.3.0", - "lrc-file-parser": "^2.2.6", + "lrc-file-parser": "^2.2.7", "pako": "^2.1.0", "process": "^0.11.10", "prop-types": "^15.8.1", diff --git a/publish/changeLog.md b/publish/changeLog.md index 6a5495c..66d7235 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,3 @@ ### 修复 -- 修复潜在的歌词解析导致应用崩溃问题 +- 修复鸿蒙系统下的崩溃问题