diff --git a/android/app/build.gradle b/android/app/build.gradle index 57b487b3..e69908c1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -91,21 +91,21 @@ static def getVersion() { return packageJson["version"] } -static def versionStringToCode(String version) { - def parts = version.split('\\.') - def versionCode = 0 - def multiplier = 1000000 - - parts.each { part -> - versionCode += part.toInteger() * multiplier - multiplier /= 1000 - } - - return versionCode.intValue() -} +// static def versionStringToCode(String version) { +// def parts = version.split('\\.') +// def versionCode = 0 +// def multiplier = 1000000 +// +// parts.each { part -> +// versionCode += part.toInteger() * multiplier +// multiplier /= 1000 +// } +// +// return versionCode.intValue() +// } def appVersion = getVersion() -def appVersionCode = versionStringToCode(appVersion) +def appVersionCode = 400011 android { @@ -146,19 +146,7 @@ android { } } - applicationVariants.all { variant -> - variant.outputs.each { output -> - def versionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4] - - def abi = output.getFilter(OutputFile.ABI) - if (abi != null) { - output.versionCodeOverride = defaultConfig.versionCode * 100 + versionCodes.get(abi); - } else { - output.versionCodeOverride = defaultConfig.versionCode * 100 - } - } - } buildTypes { debug { diff --git a/android/app/src/main/java/fun/upup/musicfree/lyricUtil/LyricUtilModule.kt b/android/app/src/main/java/fun/upup/musicfree/lyricUtil/LyricUtilModule.kt index 83636291..0c5cae65 100644 --- a/android/app/src/main/java/fun/upup/musicfree/lyricUtil/LyricUtilModule.kt +++ b/android/app/src/main/java/fun/upup/musicfree/lyricUtil/LyricUtilModule.kt @@ -37,7 +37,7 @@ class LyricUtilModule(private val reactContext: ReactApplicationContext): ReactC } @ReactMethod - fun showStatusBarLyric(initLyric: String, options: ReadableMap, promise: Promise) { + fun showStatusBarLyric(initLyric: String?, options: ReadableMap?, promise: Promise) { try { UiThreadUtil.runOnUiThread { if (lyricView == null) { @@ -45,6 +45,9 @@ class LyricUtilModule(private val reactContext: ReactApplicationContext): ReactC } val mapOptions = mutableMapOf().apply { + if (options == null) { + return@apply + } if (options.hasKey("topPercent")) { put("topPercent", options.getDouble("topPercent")) } @@ -58,13 +61,13 @@ class LyricUtilModule(private val reactContext: ReactApplicationContext): ReactC options.getString("color")?.let { put("color", it) } } if (options.hasKey("backgroundColor")) { - options.getString("backgroundColor")?.let { put("color", it) } + options.getString("backgroundColor")?.let { put("backgroundColor", it) } } if (options.hasKey("widthPercent")) { - put("color", options.getDouble("widthPercent")) + put("widthPercent", options.getDouble("widthPercent")) } if (options.hasKey("fontSize")) { - put("color", options.getDouble("fontSize")) + put("fontSize", options.getDouble("fontSize")) } } diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 8403b999..dbd0daab 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,5 +1,9 @@ MusicFree true + + musicfree_temporary_channel + + musicfree_temporary_channel MusicFree diff --git a/changelog.md b/changelog.md index f2c0b653..5360586e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,10 @@ +`2024.9.8 v0.4.1` +安装包上传到了飞书云文档,浏览器打开链接后有个下载说明,可以根据这个指引安装apk +1. 【修复】修复桌面歌词无法开启的问题 +2. 【修复】修复了修改桌面歌词颜色会导致闪退的问题 +3. 【修复】回滚了本地音乐部分读取文件的逻辑 +4. 【修复】修复了点击【编辑歌单信息】按钮无效的问题 + `2024.9.1 v0.4.0` 本次更新修改了歌单的存储机制,建议谨慎更新 安装包上传到了飞书云文档,浏览器打开链接后有个下载说明,可以根据这个指引安装apk diff --git a/package.json b/package.json index 2abc3155..6c5699c0 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "MusicFree", - "version": "0.4.0", + "version": "0.4.1", "private": true, - "license": "GPL", + "license": "AGPL", "author": { "name": "猫头猫", "email": "lhx_xjtu@163.com" diff --git a/release/version.json b/release/version.json index 8fca931e..8e012267 100644 --- a/release/version.json +++ b/release/version.json @@ -1 +1 @@ -{"version":"0.4.0","changeLog":["本次更新修改了歌单的存储机制,建议谨慎更新","安装包上传到了飞书云文档,浏览器打开链接后有个下载说明,可以根据这个指引安装apk","1. 【升级】ReactNative升级到0.74.4","2. 【功能】换了个logo和开屏页","3. 【功能】播放列表的歌曲限制从1500首调整到10000首","4. 【功能】重写了歌曲排序机制","5. 【功能】插件新增评论区功能(需要插件实现getMusicComments方法)","6. 【优化】调整部分样式,优化删除歌曲时的性能","7. 【修复】修复歌词翻译错位的问题","8. 【修复】修复部分情况下无法复制作者/专辑的问题","9. 【修复】修复在歌单详情页删除歌单会导致白屏的问题","10. 【修复】修复搜索框在部分情况下自动触发搜索的问题","11. 【修复】修复右上角菜单位置跳变的问题","12. 【修复】修复在预览专辑封面时触发返回不会关闭预览弹窗的问题","13. 【修复】下载文件时转移文件中的保留字符(感谢@GuGuMur)","14. 【其他】分架构打包,更新开源协议为 AGPL 3.0", "15. 【其他】支持上传本地歌词"],"download":["https://r0rvr854dd1.feishu.cn/drive/folder/KLqKfWOA3lx8MKdo8xNcYpR8n7t"]} +{"version":"0.4.1","changeLog":["安装包上传到了飞书云文档,浏览器打开链接后有个下载说明,可以根据这个指引安装apk","1. 【修复】修复桌面歌词无法开启的问题","2. 【修复】修复了修改桌面歌词颜色会导致闪退的问题","3. 【修复】回滚了本地音乐部分读取文件的逻辑","4. 【修复】修复了点击【编辑歌单信息】按钮无效的问题"],"download":["https://r0rvr854dd1.feishu.cn/drive/folder/KLqKfWOA3lx8MKdo8xNcYpR8n7t"]} diff --git a/src/components/base/toast.tsx b/src/components/base/toast.tsx index 9b10f167..64ac782b 100644 --- a/src/components/base/toast.tsx +++ b/src/components/base/toast.tsx @@ -131,7 +131,7 @@ export function ToastBaseComponent() { color={typeConfig[activeToast.type].color} /> {activeToast.message} diff --git a/src/components/dialogs/components/downloadDialog.tsx b/src/components/dialogs/components/downloadDialog.tsx index d894f95c..314a388a 100644 --- a/src/components/dialogs/components/downloadDialog.tsx +++ b/src/components/dialogs/components/downloadDialog.tsx @@ -73,6 +73,7 @@ export default function DownloadDialog(props: IDownloadDialogProps) {