mirror of
https://github.com/algerkong/AlgerMusicPlayer.git
synced 2026-04-06 08:20:51 +08:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f33861fd25 |
@@ -3,7 +3,7 @@ description: 这个规则是项目描述
|
||||
globs:
|
||||
alwaysApply: false
|
||||
---
|
||||
您是 TypeScript、Node.js、Vue3、Electron、naive-ui、VueUse 和 Tailwind 方面的专家。
|
||||
您是 TypeScript、Node.j、Vue3、Electron、naive-ui、VueUse 和 Tailwind 方面的专家。
|
||||
|
||||
项目结构
|
||||
- 这是 Electron 项目，使用 Vue3 和 Pinia 进行开发的第三方网易云音乐播放器。
|
||||
|
||||
@@ -4,7 +4,8 @@ require('@rushstack/eslint-patch/modern-module-resolution');
|
||||
module.exports = {
|
||||
extends: [
|
||||
'eslint:recommended',
|
||||
'plugin:@typescript-eslint/recommended',
|
||||
'plugin:@typescript-eslint/recommended',
|
||||
'eslint-config-airbnb-base',
|
||||
'@vue/typescript/recommended',
|
||||
'plugin:vue/vue3-recommended',
|
||||
'plugin:vue-scoped-css/base',
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -25,5 +25,3 @@ out
|
||||
.cursorrules
|
||||
|
||||
.github/deploy_keys
|
||||
|
||||
resources/android/**/*
|
||||
33
CHANGELOG.md
33
CHANGELOG.md
@@ -1,23 +1,22 @@
|
||||
# 更新日志
|
||||
|
||||
## v4.4.0
|
||||
## 更新时间 2025 年 4 月 23 日 00:16
|
||||
> 如果更新遇到问题，请前往 <a href="http://donate.alger.fun/download" target="_blank">下载 AlgerMusicPlayer</a>
|
||||
|
||||
> 帮我点个 star <a href="https://github.com/algerkong/AlgerMusicPlayer" target="_blank">github star</a>
|
||||
|
||||
> 请我喝咖啡 ☕️ <a href="http://donate.alger.fun/donate" target="_blank">赏你</a>
|
||||
|
||||
> QQ群 976962720
|
||||
## v4.2.0
|
||||
|
||||
### ✨ 新功能
|
||||
- 优化音源解析功能，添加音源配置，添加GD音乐台解析支持 ([ed9cf9c](https://github.com/algerkong/AlgerMusicPlayer/commit/ed9cf9c))
|
||||
- 添加迷你播放器模式 （[0f55795](https://github.com/algerkong/AlgerMusicPlayer/commit/0f55795))
|
||||
- 更新网易云音乐API版本，添加B站视频搜索功能和播放器组件 ([280fec1](https://github.com/algerkong/AlgerMusicPlayer/commit/280fec1))
|
||||
- mac端添加状态栏 显示当前播放歌曲和操作按钮 ([374a7a8](https://github.com/algerkong/AlgerMusicPlayer/commit/374a7a8))
|
||||
- 添加音频URL过期事件监听，自动重新获取B站和网易云音乐音频URL并恢复播放 ([ee6e9d4](https://github.com/algerkong/AlgerMusicPlayer/commit/ee6e9d4))
|
||||
- 优化搜索功能，改进搜索历史管理和路由处理逻辑 ([477f8bb](https://github.com/algerkong/AlgerMusicPlayer/commit/477f8bb))
|
||||
- 在播放列表中添加歌曲删除功能，优化播放列表管理逻辑 ([a5f694e](https://github.com/algerkong/AlgerMusicPlayer/commit/a5f694e)) (#94)
|
||||
- 优化歌词窗口字体控制按钮样式 ([c5e50c9](https://github.com/algerkong/AlgerMusicPlayer/commit/c5e50c9))
|
||||
- 优化首页banner加载逻辑 ([01ccad4](https://github.com/algerkong/AlgerMusicPlayer/commit/01ccad4))
|
||||
- 优化歌手详情页面 由抽屉改为页面 ([dfb8f55](https://github.com/algerkong/AlgerMusicPlayer/commit/dfb8f55))
|
||||
- 增加用户关注列表和关注用户详情页 可查看听歌排行和用户歌单 ([2924ad6](https://github.com/algerkong/AlgerMusicPlayer/commit/2924ad6))
|
||||
- 优化进度条 鼠标悬停直接显示进度信息 ([9ce872e](https://github.com/algerkong/AlgerMusicPlayer/commit/9ce872e))
|
||||
- 优化应用更新下载功能 可后台下载 弹出下载完成提示 不再自动关闭应用 ([23b2340](https://github.com/algerkong/AlgerMusicPlayer/commit/23b2340))
|
||||
|
||||
### 🐛 Bug 修复
|
||||
- 修复下载管理切换 tab 程序卡死问题 ([27d5bd8](https://github.com/algerkong/AlgerMusicPlayer/commit/27d5bd8)) (#153)
|
||||
- 修复歌曲播放地址缓存导致播放失败问题，添加过期时间 ([76e55d4](https://github.com/algerkong/AlgerMusicPlayer/commit/76e55d4))
|
||||
- 修复 Electron 版本更新导致的桌面歌词窗口出现边框的问题 ([a676136](https://github.com/algerkong/AlgerMusicPlayer/commit/a676136))
|
||||
- 优化底部菜单位置和间距 修复移动端菜单不显示问题 ([25b90fa](https://github.com/algerkong/AlgerMusicPlayer/commit/25b90fa))
|
||||
|
||||
### 🔧 其他变更
|
||||
- 更新项目依赖 ([35b9cbf](https://github.com/algerkong/AlgerMusicPlayer/commit/35b9cbf))([7624a1a](https://github.com/algerkong/AlgerMusicPlayer/commit/7624a1a))
|
||||
- 修复进度条多次拖动和多次暂停播放引发的歌曲重复播放bug ([cfe197c](https://github.com/algerkong/AlgerMusicPlayer/commit/cfe197c)) (#104)
|
||||
- 修复关闭按钮最小化 还在任务栏显示的bug ([e0d1305](https://github.com/algerkong/AlgerMusicPlayer/commit/e0d1305))
|
||||
- 修复播放列表中歌曲删除时类型不匹配的问题 ([8d6d052](https://github.com/algerkong/AlgerMusicPlayer/commit/8d6d052))
|
||||
101
android/.gitignore
vendored
101
android/.gitignore
vendored
@@ -1,101 +0,0 @@
|
||||
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
|
||||
|
||||
# Built application files
|
||||
*.apk
|
||||
*.aar
|
||||
*.ap_
|
||||
*.aab
|
||||
|
||||
# Files for the ART/Dalvik VM
|
||||
*.dex
|
||||
|
||||
# Java class files
|
||||
*.class
|
||||
|
||||
# Generated files
|
||||
bin/
|
||||
gen/
|
||||
out/
|
||||
# Uncomment the following line in case you need and you don't have the release build type files in your app
|
||||
# release/
|
||||
|
||||
# Gradle files
|
||||
.gradle/
|
||||
build/
|
||||
|
||||
# Local configuration file (sdk path, etc)
|
||||
local.properties
|
||||
|
||||
# Proguard folder generated by Eclipse
|
||||
proguard/
|
||||
|
||||
# Log Files
|
||||
*.log
|
||||
|
||||
# Android Studio Navigation editor temp files
|
||||
.navigation/
|
||||
|
||||
# Android Studio captures folder
|
||||
captures/
|
||||
|
||||
# IntelliJ
|
||||
*.iml
|
||||
.idea/workspace.xml
|
||||
.idea/tasks.xml
|
||||
.idea/gradle.xml
|
||||
.idea/assetWizardSettings.xml
|
||||
.idea/dictionaries
|
||||
.idea/libraries
|
||||
# Android Studio 3 in .gitignore file.
|
||||
.idea/caches
|
||||
.idea/modules.xml
|
||||
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
|
||||
.idea/navEditor.xml
|
||||
|
||||
# Keystore files
|
||||
# Uncomment the following lines if you do not want to check your keystore files in.
|
||||
#*.jks
|
||||
#*.keystore
|
||||
|
||||
# External native build folder generated in Android Studio 2.2 and later
|
||||
.externalNativeBuild
|
||||
.cxx/
|
||||
|
||||
# Google Services (e.g. APIs or Firebase)
|
||||
# google-services.json
|
||||
|
||||
# Freeline
|
||||
freeline.py
|
||||
freeline/
|
||||
freeline_project_description.json
|
||||
|
||||
# fastlane
|
||||
fastlane/report.xml
|
||||
fastlane/Preview.html
|
||||
fastlane/screenshots
|
||||
fastlane/test_output
|
||||
fastlane/readme.md
|
||||
|
||||
# Version control
|
||||
vcs.xml
|
||||
|
||||
# lint
|
||||
lint/intermediates/
|
||||
lint/generated/
|
||||
lint/outputs/
|
||||
lint/tmp/
|
||||
# lint/reports/
|
||||
|
||||
# Android Profiling
|
||||
*.hprof
|
||||
|
||||
# Cordova plugins for Capacitor
|
||||
capacitor-cordova-android-plugins
|
||||
|
||||
# Copied web assets
|
||||
app/src/main/assets/public
|
||||
|
||||
# Generated Config files
|
||||
app/src/main/assets/capacitor.config.json
|
||||
app/src/main/assets/capacitor.plugins.json
|
||||
app/src/main/res/xml/config.xml
|
||||
42
package.json
42
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "AlgerMusicPlayer",
|
||||
"version": "4.4.0",
|
||||
"version": "4.2.0",
|
||||
"description": "Alger Music Player",
|
||||
"author": "Alger <algerkc@qq.com>",
|
||||
"main": "./out/main/index.js",
|
||||
@@ -21,55 +21,53 @@
|
||||
"build:linux": "npm run build && electron-builder --linux"
|
||||
},
|
||||
"dependencies": {
|
||||
"@electron-toolkit/preload": "^3.0.1",
|
||||
"@electron-toolkit/utils": "^4.0.0",
|
||||
"@electron-toolkit/preload": "^3.0.0",
|
||||
"@electron-toolkit/utils": "^3.0.0",
|
||||
"@unblockneteasemusic/server": "^0.27.8-patch.1",
|
||||
"electron-store": "^8.1.0",
|
||||
"electron-updater": "^6.6.2",
|
||||
"electron-updater": "^6.1.7",
|
||||
"font-list": "^1.5.1",
|
||||
"netease-cloud-music-api-alger": "^4.26.1",
|
||||
"node-id3": "^0.2.9",
|
||||
"node-machine-id": "^1.1.12",
|
||||
"vue-i18n": "^11.1.3"
|
||||
"vue-i18n": "9"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron-toolkit/eslint-config": "^2.1.0",
|
||||
"@electron-toolkit/eslint-config-ts": "^3.1.0",
|
||||
"@electron-toolkit/eslint-config": "^1.0.2",
|
||||
"@electron-toolkit/eslint-config-ts": "^2.0.0",
|
||||
"@electron-toolkit/tsconfig": "^1.0.1",
|
||||
"@rushstack/eslint-patch": "^1.10.3",
|
||||
"@tailwindcss/postcss7-compat": "^2.2.4",
|
||||
"@types/howler": "^2.2.12",
|
||||
"@types/node": "^20.14.8",
|
||||
"@types/tinycolor2": "^1.4.6",
|
||||
"@typescript-eslint/eslint-plugin": "^8.30.1",
|
||||
"@typescript-eslint/parser": "^8.30.1",
|
||||
"@typescript-eslint/eslint-plugin": "^7.0.0",
|
||||
"@typescript-eslint/parser": "^7.0.0",
|
||||
"@vitejs/plugin-vue": "^5.0.5",
|
||||
"@vue/compiler-sfc": "^3.5.0",
|
||||
"@vue/eslint-config-prettier": "^10.2.0",
|
||||
"@vue/eslint-config-typescript": "^14.5.0",
|
||||
"@vue/eslint-config-prettier": "^9.0.0",
|
||||
"@vue/eslint-config-typescript": "^13.0.0",
|
||||
"@vue/runtime-core": "^3.5.0",
|
||||
"@vueuse/core": "^11.3.0",
|
||||
"@vueuse/electron": "^11.3.0",
|
||||
"@vueuse/core": "^11.0.3",
|
||||
"@vueuse/electron": "^11.0.3",
|
||||
"animate.css": "^4.1.1",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"axios": "^1.7.7",
|
||||
"cross-env": "^7.0.3",
|
||||
"electron": "^35.2.0",
|
||||
"electron": "^35.0.2",
|
||||
"electron-builder": "^25.1.8",
|
||||
"electron-vite": "^3.1.0",
|
||||
"eslint": "^9.0.0",
|
||||
"eslint-config-prettier": "^10.1.2",
|
||||
"electron-vite": "^3.0.0",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-config-prettier": "^9.0.0",
|
||||
"eslint-plugin-import": "^2.29.1",
|
||||
"eslint-plugin-prettier": "^5.1.3",
|
||||
"eslint-plugin-simple-import-sort": "^12.0.0",
|
||||
"eslint-plugin-vue": "^10.0.0",
|
||||
"eslint-plugin-vue-scoped-css": "^2.9.0",
|
||||
"eslint-plugin-vue": "^9.26.0",
|
||||
"eslint-plugin-vue-scoped-css": "^2.7.2",
|
||||
"howler": "^2.2.4",
|
||||
"lodash": "^4.17.21",
|
||||
"marked": "^15.0.4",
|
||||
"naive-ui": "^2.41.0",
|
||||
"pinia": "^3.0.1",
|
||||
"pinyin-match": "^1.2.6",
|
||||
"postcss": "^8.5.3",
|
||||
"prettier": "^3.3.2",
|
||||
"remixicon": "^4.6.0",
|
||||
|
||||
@@ -101,9 +101,5 @@ export default {
|
||||
},
|
||||
userPlayList: {
|
||||
title: "{name}'s Playlist"
|
||||
},
|
||||
musicList: {
|
||||
searchSongs: 'Search Songs',
|
||||
noSearchResults: 'No search results'
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
export default {
|
||||
title: 'Download Manager',
|
||||
localMusic: 'Local Music',
|
||||
count: '{count} songs in total',
|
||||
clearAll: 'Clear All',
|
||||
tabs: {
|
||||
downloading: 'Downloading',
|
||||
downloaded: 'Downloaded'
|
||||
@@ -29,21 +27,10 @@ export default {
|
||||
confirm: 'Delete',
|
||||
cancel: 'Cancel',
|
||||
success: 'Successfully deleted',
|
||||
failed: 'Failed to delete',
|
||||
fileNotFound: 'File not found or moved, removed from records',
|
||||
recordRemoved: 'Failed to delete file, but removed from records'
|
||||
},
|
||||
clear: {
|
||||
title: 'Clear Download Records',
|
||||
message:
|
||||
'Are you sure you want to clear all download records? This will not delete the actual music files, but will clear all records.',
|
||||
confirm: 'Clear',
|
||||
cancel: 'Cancel',
|
||||
success: 'Download records cleared'
|
||||
failed: 'Failed to delete'
|
||||
},
|
||||
message: {
|
||||
downloadComplete: '{filename} download completed',
|
||||
downloadFailed: '{filename} download failed: {error}'
|
||||
},
|
||||
loading: 'Loading...'
|
||||
}
|
||||
};
|
||||
|
||||
@@ -56,15 +56,6 @@ export default {
|
||||
dolby: 'Dolby Atmos',
|
||||
jymaster: 'Master'
|
||||
},
|
||||
musicSources: 'Music Sources',
|
||||
musicSourcesDesc: 'Select music sources for song resolution',
|
||||
musicSourcesWarning: 'At least one music source must be selected',
|
||||
musicUnblockEnable: 'Enable Music Unblocking',
|
||||
musicUnblockEnableDesc: 'When enabled, attempts to resolve unplayable songs',
|
||||
configureMusicSources: 'Configure Sources',
|
||||
selectedMusicSources: 'Selected sources:',
|
||||
noMusicSources: 'No sources selected',
|
||||
gdmusicInfo: 'GD Music Station intelligently resolves music from multiple platforms automatically',
|
||||
autoPlay: 'Auto Play',
|
||||
autoPlayDesc: 'Auto resume playback when reopening the app'
|
||||
},
|
||||
@@ -80,8 +71,6 @@ export default {
|
||||
shortcutDesc: 'Customize global shortcuts',
|
||||
download: 'Download Management',
|
||||
downloadDesc: 'Always show download list button',
|
||||
unlimitedDownload: 'Unlimited Download',
|
||||
unlimitedDownloadDesc: 'Enable unlimited download mode for music , default limit 300 songs',
|
||||
downloadPath: 'Download Directory',
|
||||
downloadPathDesc: 'Choose download location for music files'
|
||||
},
|
||||
@@ -194,12 +183,7 @@ export default {
|
||||
dark: 'Dark'
|
||||
},
|
||||
hideMiniPlayBar: 'Hide Mini Play Bar',
|
||||
hideLyrics: 'Hide Lyrics',
|
||||
tabs: {
|
||||
interface: 'Interface',
|
||||
display: 'Display',
|
||||
typography: 'Typography'
|
||||
}
|
||||
hideLyrics: 'Hide Lyrics'
|
||||
},
|
||||
shortcutSettings: {
|
||||
title: 'Shortcut Settings',
|
||||
@@ -208,8 +192,6 @@ export default {
|
||||
shortcutConflict: 'Shortcut Conflict',
|
||||
inputPlaceholder: 'Click to input shortcut',
|
||||
resetShortcuts: 'Reset',
|
||||
disableAll: 'Disable All',
|
||||
enableAll: 'Enable All',
|
||||
togglePlay: 'Play/Pause',
|
||||
prevPlay: 'Previous',
|
||||
nextPlay: 'Next',
|
||||
@@ -217,18 +199,12 @@ export default {
|
||||
volumeDown: 'Volume Down',
|
||||
toggleFavorite: 'Favorite/Unfavorite',
|
||||
toggleWindow: 'Show/Hide Window',
|
||||
scopeGlobal: 'Global',
|
||||
scopeApp: 'App Only',
|
||||
enabled: 'Enabled',
|
||||
disabled: 'Disabled',
|
||||
messages: {
|
||||
resetSuccess: 'Shortcuts reset successfully, please save',
|
||||
conflict: 'Shortcut conflict, please reset',
|
||||
saveSuccess: 'Shortcuts saved successfully',
|
||||
saveError: 'Failed to save shortcuts',
|
||||
cancelEdit: 'Edit cancelled',
|
||||
disableAll: 'All shortcuts disabled, please save to apply',
|
||||
enableAll: 'All shortcuts enabled, please save to apply'
|
||||
cancelEdit: 'Edit cancelled'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,6 +13,6 @@ export default {
|
||||
downloadFailed: 'Download failed',
|
||||
downloadQueued: 'Added to download queue',
|
||||
addedToNextPlay: 'Added to play next',
|
||||
getUrlFailed: 'Failed to get music download URL, please check if logged in'
|
||||
getUrlFailed: 'Failed to get music download URL'
|
||||
}
|
||||
};
|
||||
|
||||
@@ -99,9 +99,5 @@ export default {
|
||||
},
|
||||
userPlayList: {
|
||||
title: '{name}的常听'
|
||||
},
|
||||
musicList: {
|
||||
searchSongs: '搜索歌曲',
|
||||
noSearchResults: '没有找到相关歌曲'
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
export default {
|
||||
title: '下载管理',
|
||||
localMusic: '本地音乐',
|
||||
count: '共 {count} 首歌曲',
|
||||
clearAll: '清空记录',
|
||||
tabs: {
|
||||
downloading: '下载中',
|
||||
downloaded: '已下载'
|
||||
@@ -29,20 +27,10 @@ export default {
|
||||
confirm: '确定删除',
|
||||
cancel: '取消',
|
||||
success: '删除成功',
|
||||
failed: '删除失败',
|
||||
fileNotFound: '文件不存在或已被移动，已从记录中移除',
|
||||
recordRemoved: '文件删除失败，但已从记录中移除'
|
||||
},
|
||||
clear: {
|
||||
title: '清空下载记录',
|
||||
message: '确定要清空所有下载记录吗？此操作不会删除已下载的音乐文件，但将清空所有记录。',
|
||||
confirm: '确定清空',
|
||||
cancel: '取消',
|
||||
success: '下载记录已清空'
|
||||
failed: '删除失败'
|
||||
},
|
||||
message: {
|
||||
downloadComplete: '{filename} 下载完成',
|
||||
downloadFailed: '{filename} 下载失败: {error}'
|
||||
},
|
||||
loading: '加载中...'
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
"playback": {
|
||||
"musicSources": "音源设置",
|
||||
"musicSourcesDesc": "选择音乐解析使用的音源平台",
|
||||
"musicSourcesWarning": "至少需要选择一个音源平台"
|
||||
}
|
||||
@@ -56,15 +56,6 @@ export default {
|
||||
dolby: '杜比全景声',
|
||||
jymaster: '超清母带'
|
||||
},
|
||||
musicSources: '音源设置',
|
||||
musicSourcesDesc: '选择音乐解析使用的音源平台',
|
||||
musicSourcesWarning: '至少需要选择一个音源平台',
|
||||
musicUnblockEnable: '启用音乐解析',
|
||||
musicUnblockEnableDesc: '开启后将尝试解析无法播放的音乐',
|
||||
configureMusicSources: '配置音源',
|
||||
selectedMusicSources: '已选音源：',
|
||||
noMusicSources: '未选择音源',
|
||||
gdmusicInfo: 'GD音乐台可自动解析多个平台音源，自动选择最佳结果',
|
||||
autoPlay: '自动播放',
|
||||
autoPlayDesc: '重新打开应用时是否自动继续播放'
|
||||
},
|
||||
@@ -80,8 +71,6 @@ export default {
|
||||
shortcutDesc: '自定义全局快捷键',
|
||||
download: '下载管理',
|
||||
downloadDesc: '是否始终显示下载列表按钮',
|
||||
unlimitedDownload: '无限制下载',
|
||||
unlimitedDownloadDesc: '开启后将无限制下载音乐（可能出现下载失败的情况）, 默认限制 300 首',
|
||||
downloadPath: '下载目录',
|
||||
downloadPathDesc: '选择音乐文件的下载位置'
|
||||
},
|
||||
@@ -194,12 +183,7 @@ export default {
|
||||
dark: '暗色'
|
||||
},
|
||||
hideMiniPlayBar: '隐藏迷你播放栏',
|
||||
hideLyrics: '隐藏歌词',
|
||||
tabs: {
|
||||
interface: '界面',
|
||||
typography: '文字',
|
||||
display: '显示'
|
||||
}
|
||||
hideLyrics: '隐藏歌词'
|
||||
},
|
||||
shortcutSettings: {
|
||||
title: '快捷键设置',
|
||||
@@ -208,8 +192,6 @@ export default {
|
||||
shortcutConflict: '快捷键冲突',
|
||||
inputPlaceholder: '点击输入快捷键',
|
||||
resetShortcuts: '恢复默认',
|
||||
disableAll: '全部禁用',
|
||||
enableAll: '全部启用',
|
||||
togglePlay: '播放/暂停',
|
||||
prevPlay: '上一首',
|
||||
nextPlay: '下一首',
|
||||
@@ -217,18 +199,12 @@ export default {
|
||||
volumeDown: '音量减少',
|
||||
toggleFavorite: '收藏/取消收藏',
|
||||
toggleWindow: '显示/隐藏窗口',
|
||||
scopeGlobal: '全局',
|
||||
scopeApp: '应用内',
|
||||
enabled: '启用',
|
||||
disabled: '禁用',
|
||||
messages: {
|
||||
resetSuccess: '已恢复默认快捷键，请记得保存',
|
||||
conflict: '存在冲突的快捷键，请重新设置',
|
||||
saveSuccess: '快捷键设置已保存',
|
||||
saveError: '保存快捷键失败，请重试',
|
||||
cancelEdit: '已取消修改',
|
||||
disableAll: '已禁用所有快捷键，请记得保存',
|
||||
enableAll: '已启用所有快捷键，请记得保存'
|
||||
cancelEdit: '已取消修改'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -13,6 +13,6 @@ export default {
|
||||
downloadFailed: '下载失败',
|
||||
downloadQueued: '已加入下载队列',
|
||||
addedToNextPlay: '已添加到下一首播放',
|
||||
getUrlFailed: '获取音乐下载地址失败，请检查是否登录'
|
||||
getUrlFailed: '获取音乐下载地址失败'
|
||||
}
|
||||
};
|
||||
|
||||
@@ -9,7 +9,6 @@ import { initializeConfig } from './modules/config';
|
||||
import { initializeFileManager } from './modules/fileManager';
|
||||
import { initializeFonts } from './modules/fonts';
|
||||
import { initializeShortcuts, registerShortcuts } from './modules/shortcuts';
|
||||
import { initializeStats, setupStatsHandlers } from './modules/statsService';
|
||||
import { initializeTray, updateCurrentSong, updatePlayState, updateTrayMenu } from './modules/tray';
|
||||
import { setupUpdateHandlers } from './modules/update';
|
||||
import { createMainWindow, initializeWindowManager } from './modules/window';
|
||||
@@ -51,12 +50,6 @@ function initialize() {
|
||||
// 初始化托盘
|
||||
initializeTray(iconPath, mainWindow);
|
||||
|
||||
// 初始化统计服务
|
||||
initializeStats();
|
||||
|
||||
// 设置统计相关的IPC处理程序
|
||||
setupStatsHandlers(ipcMain);
|
||||
|
||||
// 启动音乐API
|
||||
startMusicApi();
|
||||
|
||||
|
||||
@@ -84,18 +84,15 @@ const createWin = () => {
|
||||
frame: false,
|
||||
show: false,
|
||||
transparent: true,
|
||||
opacity: 1,
|
||||
hasShadow: false,
|
||||
alwaysOnTop: true,
|
||||
resizable: true,
|
||||
roundedCorners: false,
|
||||
// 添加跨屏幕支持选项
|
||||
webPreferences: {
|
||||
preload: join(__dirname, '../preload/index.js'),
|
||||
sandbox: false,
|
||||
contextIsolation: true
|
||||
},
|
||||
backgroundColor: '#00000000'
|
||||
}
|
||||
});
|
||||
|
||||
// 监听窗口关闭事件
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
import { app } from 'electron';
|
||||
import Store from 'electron-store';
|
||||
import { machineIdSync } from 'node-machine-id';
|
||||
import os from 'os';
|
||||
|
||||
const store = new Store();
|
||||
|
||||
/**
|
||||
* 获取设备唯一标识符
|
||||
* 优先使用存储的ID，如果没有则获取机器ID并存储
|
||||
*/
|
||||
export function getDeviceId(): string {
|
||||
let deviceId = store.get('deviceId') as string | undefined;
|
||||
|
||||
if (!deviceId) {
|
||||
try {
|
||||
// 使用node-machine-id获取设备唯一标识
|
||||
deviceId = machineIdSync(true);
|
||||
} catch (error) {
|
||||
console.error('获取机器ID失败:', error);
|
||||
// 如果获取失败，使用主机名和MAC地址组合作为备选方案
|
||||
const networkInterfaces = os.networkInterfaces();
|
||||
let macAddress = '';
|
||||
|
||||
// 尝试获取第一个非内部网络接口的MAC地址
|
||||
Object.values(networkInterfaces).forEach((interfaces) => {
|
||||
if (interfaces) {
|
||||
interfaces.forEach((iface) => {
|
||||
if (!iface.internal && !macAddress && iface.mac !== '00:00:00:00:00:00') {
|
||||
macAddress = iface.mac;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
deviceId = `${os.hostname()}-${macAddress}`.replace(/:/g, '');
|
||||
}
|
||||
|
||||
// 存储设备ID
|
||||
if (deviceId) {
|
||||
store.set('deviceId', deviceId);
|
||||
} else {
|
||||
// 如果所有方法都失败，使用随机ID
|
||||
deviceId = Math.random().toString(36).substring(2, 15);
|
||||
store.set('deviceId', deviceId);
|
||||
}
|
||||
}
|
||||
|
||||
return deviceId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取系统信息
|
||||
*/
|
||||
export function getSystemInfo() {
|
||||
return {
|
||||
osType: os.type(),
|
||||
osVersion: os.release(),
|
||||
osArch: os.arch(),
|
||||
platform: process.platform,
|
||||
appVersion: app.getVersion()
|
||||
};
|
||||
}
|
||||
@@ -1,14 +1,9 @@
|
||||
import axios from 'axios';
|
||||
import { app, dialog, ipcMain, Notification, protocol, shell } from 'electron';
|
||||
import { app, dialog, ipcMain, protocol, shell } from 'electron';
|
||||
import Store from 'electron-store';
|
||||
import * as fs from 'fs';
|
||||
import * as http from 'http';
|
||||
import * as https from 'https';
|
||||
import * as NodeID3 from 'node-id3';
|
||||
import * as path from 'path';
|
||||
|
||||
import { getStore } from './config';
|
||||
|
||||
const MAX_CONCURRENT_DOWNLOADS = 3;
|
||||
const downloadQueue: { url: string; filename: string; songInfo: any; type?: string }[] = [];
|
||||
let activeDownloads = 0;
|
||||
@@ -122,37 +117,20 @@ export function initializeFileManager() {
|
||||
});
|
||||
|
||||
// 获取已下载音乐列表
|
||||
ipcMain.handle('get-downloaded-music', async () => {
|
||||
ipcMain.handle('get-downloaded-music', () => {
|
||||
try {
|
||||
const store = new Store();
|
||||
const songInfos = store.get('downloadedSongs', {}) as Record<string, any>;
|
||||
|
||||
// 异步处理文件存在性检查
|
||||
const entriesArray = Object.entries(songInfos);
|
||||
const validEntriesPromises = await Promise.all(
|
||||
entriesArray.map(async ([path, info]) => {
|
||||
try {
|
||||
const exists = await fs.promises.access(path)
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
return exists ? info : null;
|
||||
} catch (error) {
|
||||
console.error('Error checking file existence:', error);
|
||||
return null;
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
// 过滤有效的歌曲并排序
|
||||
const validSongs = validEntriesPromises
|
||||
.filter(song => song !== null)
|
||||
// 过滤出实际存在的文件
|
||||
const validSongs = Object.entries(songInfos)
|
||||
.filter(([path]) => fs.existsSync(path))
|
||||
.map(([_, info]) => info)
|
||||
.sort((a, b) => (b.downloadTime || 0) - (a.downloadTime || 0));
|
||||
|
||||
// 更新存储，移除不存在的文件记录
|
||||
const newSongInfos = validSongs.reduce((acc, song) => {
|
||||
if (song && song.path) {
|
||||
acc[song.path] = song;
|
||||
}
|
||||
acc[song.path] = song;
|
||||
return acc;
|
||||
}, {});
|
||||
store.set('downloadedSongs', newSongInfos);
|
||||
@@ -192,13 +170,6 @@ export function initializeFileManager() {
|
||||
downloadStore.set('history', []);
|
||||
});
|
||||
|
||||
// 添加清除已下载音乐记录的处理函数
|
||||
ipcMain.handle('clear-downloaded-music', () => {
|
||||
const store = new Store();
|
||||
store.set('downloadedSongs', {});
|
||||
return true;
|
||||
});
|
||||
|
||||
// 添加清除音频缓存的处理函数
|
||||
ipcMain.on('clear-audio-cache', () => {
|
||||
audioCacheStore.set('cache', {});
|
||||
@@ -298,7 +269,7 @@ function sanitizeFilename(filename: string): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* 下载音乐和歌词
|
||||
* 下载音乐功能
|
||||
*/
|
||||
async function downloadMusic(
|
||||
event: Electron.IpcMainEvent,
|
||||
@@ -313,11 +284,8 @@ async function downloadMusic(
|
||||
let writer: fs.WriteStream | null = null;
|
||||
|
||||
try {
|
||||
// 使用配置Store来获取设置
|
||||
const configStore = getStore();
|
||||
const downloadPath =
|
||||
(configStore.get('set.downloadPath') as string) || app.getPath('downloads');
|
||||
const apiPort = configStore.get('set.musicApiPort') || 30488;
|
||||
const store = new Store();
|
||||
const downloadPath = (store.get('set.downloadPath') as string) || app.getPath('downloads');
|
||||
|
||||
// 清理文件名中的非法字符
|
||||
const sanitizedFilename = sanitizeFilename(filename);
|
||||
@@ -345,9 +313,7 @@ async function downloadMusic(
|
||||
url,
|
||||
method: 'GET',
|
||||
responseType: 'stream',
|
||||
timeout: 30000, // 30秒超时
|
||||
httpAgent: new http.Agent({ keepAlive: true }),
|
||||
httpsAgent: new https.Agent({ keepAlive: true })
|
||||
timeout: 30000 // 30秒超时
|
||||
});
|
||||
|
||||
writer = fs.createWriteStream(finalFilePath);
|
||||
@@ -385,121 +351,9 @@ async function downloadMusic(
|
||||
throw new Error('文件下载不完整');
|
||||
}
|
||||
|
||||
// 下载歌词
|
||||
let lyricData = null;
|
||||
let lyricsContent = '';
|
||||
try {
|
||||
if (songInfo?.id) {
|
||||
// 下载歌词，使用配置的端口
|
||||
const lyricsResponse = await axios.get(
|
||||
`http://localhost:${apiPort}/lyric?id=${songInfo.id}`
|
||||
);
|
||||
if (lyricsResponse.data && (lyricsResponse.data.lrc || lyricsResponse.data.tlyric)) {
|
||||
lyricData = lyricsResponse.data;
|
||||
|
||||
// 处理歌词内容
|
||||
if (lyricsResponse.data.lrc && lyricsResponse.data.lrc.lyric) {
|
||||
lyricsContent = lyricsResponse.data.lrc.lyric;
|
||||
|
||||
// 如果有翻译歌词，合并到主歌词中
|
||||
if (lyricsResponse.data.tlyric && lyricsResponse.data.tlyric.lyric) {
|
||||
// 解析原歌词和翻译
|
||||
const originalLyrics = parseLyrics(lyricsResponse.data.lrc.lyric);
|
||||
const translatedLyrics = parseLyrics(lyricsResponse.data.tlyric.lyric);
|
||||
|
||||
// 合并歌词
|
||||
const mergedLyrics = mergeLyrics(originalLyrics, translatedLyrics);
|
||||
lyricsContent = mergedLyrics;
|
||||
}
|
||||
}
|
||||
|
||||
// 不再单独写入歌词文件，只保存在ID3标签中
|
||||
console.log('歌词已准备好，将写入ID3标签');
|
||||
}
|
||||
}
|
||||
} catch (lyricError) {
|
||||
console.error('下载歌词失败:', lyricError);
|
||||
// 继续处理，不影响音乐下载
|
||||
}
|
||||
|
||||
// 下载封面
|
||||
let coverImageBuffer: Buffer | null = null;
|
||||
try {
|
||||
if (songInfo?.picUrl || songInfo?.al?.picUrl) {
|
||||
const picUrl = songInfo.picUrl || songInfo.al?.picUrl;
|
||||
if (picUrl && picUrl !== '/images/default_cover.png') {
|
||||
const coverResponse = await axios({
|
||||
url: picUrl.replace('http://', 'https://'),
|
||||
method: 'GET',
|
||||
responseType: 'arraybuffer',
|
||||
timeout: 10000
|
||||
});
|
||||
|
||||
// 获取封面图片的buffer
|
||||
coverImageBuffer = Buffer.from(coverResponse.data);
|
||||
|
||||
// 不再单独保存封面文件，只保存在ID3标签中
|
||||
console.log('封面已准备好，将写入ID3标签');
|
||||
}
|
||||
}
|
||||
} catch (coverError) {
|
||||
console.error('下载封面失败:', coverError);
|
||||
// 继续处理，不影响音乐下载
|
||||
}
|
||||
|
||||
// 在写入ID3标签前，先移除可能存在的旧标签
|
||||
try {
|
||||
NodeID3.removeTags(finalFilePath);
|
||||
} catch (err) {
|
||||
console.error('Error removing existing ID3 tags:', err);
|
||||
}
|
||||
|
||||
// 强化ID3标签的写入格式
|
||||
|
||||
const artistNames =
|
||||
(songInfo?.ar || songInfo?.song?.artists)?.map((a: any) => a.name).join('/ ') || '未知艺术家';
|
||||
const tags = {
|
||||
title: filename,
|
||||
artist: artistNames,
|
||||
TPE1: artistNames,
|
||||
TPE2: artistNames,
|
||||
album: songInfo?.al?.name || songInfo?.song?.album?.name || songInfo?.name || filename,
|
||||
APIC: {
|
||||
// 专辑封面
|
||||
imageBuffer: coverImageBuffer,
|
||||
type: {
|
||||
id: 3,
|
||||
name: 'front cover'
|
||||
},
|
||||
description: 'Album cover',
|
||||
mime: 'image/jpeg'
|
||||
},
|
||||
USLT: {
|
||||
// 歌词
|
||||
language: 'chi',
|
||||
description: 'Lyrics',
|
||||
text: lyricsContent || ''
|
||||
},
|
||||
trackNumber: songInfo?.no || undefined,
|
||||
year: songInfo?.publishTime
|
||||
? new Date(songInfo.publishTime).getFullYear().toString()
|
||||
: undefined
|
||||
};
|
||||
|
||||
try {
|
||||
const success = NodeID3.write(tags, finalFilePath);
|
||||
if (!success) {
|
||||
console.error('Failed to write ID3 tags');
|
||||
} else {
|
||||
console.log('ID3 tags written successfully');
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error writing ID3 tags:', err);
|
||||
}
|
||||
|
||||
// 保存下载信息
|
||||
try {
|
||||
const songInfos = configStore.get('downloadedSongs', {}) as Record<string, any>;
|
||||
const songInfos = store.get('downloadedSongs', {}) as Record<string, any>;
|
||||
const defaultInfo = {
|
||||
name: filename,
|
||||
ar: [{ name: '本地音乐' }],
|
||||
@@ -510,48 +364,24 @@ async function downloadMusic(
|
||||
id: songInfo?.id || 0,
|
||||
name: songInfo?.name || filename,
|
||||
filename,
|
||||
picUrl: songInfo?.picUrl || songInfo?.al?.picUrl || defaultInfo.picUrl,
|
||||
picUrl: songInfo?.picUrl || defaultInfo.picUrl,
|
||||
ar: songInfo?.ar || defaultInfo.ar,
|
||||
al: songInfo?.al || {
|
||||
picUrl: songInfo?.picUrl || defaultInfo.picUrl,
|
||||
name: songInfo?.name || filename
|
||||
},
|
||||
size: totalSize,
|
||||
path: finalFilePath,
|
||||
downloadTime: Date.now(),
|
||||
type: type || 'mp3',
|
||||
lyric: lyricData
|
||||
al: songInfo?.al || { picUrl: songInfo?.picUrl || defaultInfo.picUrl },
|
||||
type: type || 'mp3'
|
||||
};
|
||||
|
||||
// 保存到下载记录
|
||||
songInfos[finalFilePath] = newSongInfo;
|
||||
configStore.set('downloadedSongs', songInfos);
|
||||
store.set('downloadedSongs', songInfos);
|
||||
|
||||
// 添加到下载历史
|
||||
const history = downloadStore.get('history', []) as any[];
|
||||
history.unshift(newSongInfo);
|
||||
downloadStore.set('history', history);
|
||||
|
||||
// 发送桌面通知
|
||||
try {
|
||||
const artistNames =
|
||||
(songInfo?.ar || songInfo?.song?.artists)?.map((a: any) => a.name).join('/') ||
|
||||
'未知艺术家';
|
||||
const notification = new Notification({
|
||||
title: '下载完成',
|
||||
body: `${songInfo?.name || filename} - ${artistNames}`,
|
||||
silent: false
|
||||
});
|
||||
|
||||
notification.on('click', () => {
|
||||
shell.showItemInFolder(finalFilePath);
|
||||
});
|
||||
|
||||
notification.show();
|
||||
} catch (notifyError) {
|
||||
console.error('发送通知失败:', notifyError);
|
||||
}
|
||||
|
||||
// 发送下载完成事件
|
||||
event.reply('music-download-complete', {
|
||||
success: true,
|
||||
@@ -586,56 +416,3 @@ async function downloadMusic(
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 辅助函数 - 解析歌词文本成时间戳和内容的映射
|
||||
function parseLyrics(lyricsText: string): Map<string, string> {
|
||||
const lyricMap = new Map<string, string>();
|
||||
const lines = lyricsText.split('\n');
|
||||
|
||||
for (const line of lines) {
|
||||
// 匹配时间标签，形如 [00:00.000]
|
||||
const timeTagMatches = line.match(/\[\d{2}:\d{2}(\.\d{1,3})?\]/g);
|
||||
if (!timeTagMatches) continue;
|
||||
|
||||
// 提取歌词内容（去除时间标签）
|
||||
const content = line.replace(/\[\d{2}:\d{2}(\.\d{1,3})?\]/g, '').trim();
|
||||
if (!content) continue;
|
||||
|
||||
// 将每个时间标签与歌词内容关联
|
||||
for (const timeTag of timeTagMatches) {
|
||||
lyricMap.set(timeTag, content);
|
||||
}
|
||||
}
|
||||
|
||||
return lyricMap;
|
||||
}
|
||||
|
||||
// 辅助函数 - 合并原文歌词和翻译歌词
|
||||
function mergeLyrics(
|
||||
originalLyrics: Map<string, string>,
|
||||
translatedLyrics: Map<string, string>
|
||||
): string {
|
||||
const mergedLines: string[] = [];
|
||||
|
||||
// 对每个时间戳，组合原始歌词和翻译
|
||||
for (const [timeTag, originalContent] of originalLyrics.entries()) {
|
||||
const translatedContent = translatedLyrics.get(timeTag);
|
||||
|
||||
// 添加原始歌词行
|
||||
mergedLines.push(`${timeTag}${originalContent}`);
|
||||
|
||||
// 如果有翻译，添加翻译行（时间戳相同，这样可以和原歌词同步显示）
|
||||
if (translatedContent) {
|
||||
mergedLines.push(`${timeTag}${translatedContent}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 按时间顺序排序
|
||||
mergedLines.sort((a, b) => {
|
||||
const timeA = a.match(/\[\d{2}:\d{2}(\.\d{1,3})?\]/)?.[0] || '';
|
||||
const timeB = b.match(/\[\d{2}:\d{2}(\.\d{1,3})?\]/)?.[0] || '';
|
||||
return timeA.localeCompare(timeB);
|
||||
});
|
||||
|
||||
return mergedLines.join('\n');
|
||||
}
|
||||
|
||||
@@ -7,93 +7,66 @@ ipcMain.on('get-platform', (event) => {
|
||||
event.returnValue = process.platform;
|
||||
});
|
||||
|
||||
// 定义快捷键配置接口
|
||||
export interface ShortcutConfig {
|
||||
key: string;
|
||||
enabled: boolean;
|
||||
scope: 'global' | 'app';
|
||||
}
|
||||
|
||||
export interface ShortcutsConfig {
|
||||
[key: string]: ShortcutConfig;
|
||||
}
|
||||
|
||||
// 定义默认快捷键
|
||||
export const defaultShortcuts: ShortcutsConfig = {
|
||||
togglePlay: { key: 'CommandOrControl+Alt+P', enabled: true, scope: 'global' },
|
||||
prevPlay: { key: 'Alt+Left', enabled: true, scope: 'global' },
|
||||
nextPlay: { key: 'Alt+Right', enabled: true, scope: 'global' },
|
||||
volumeUp: { key: 'Alt+Up', enabled: true, scope: 'app' },
|
||||
volumeDown: { key: 'Alt+Down', enabled: true, scope: 'app' },
|
||||
toggleFavorite: { key: 'CommandOrControl+Alt+L', enabled: true, scope: 'app' },
|
||||
toggleWindow: { key: 'CommandOrControl+Alt+Shift+M', enabled: true, scope: 'global' }
|
||||
export const defaultShortcuts = {
|
||||
togglePlay: 'CommandOrControl+Alt+P',
|
||||
prevPlay: 'CommandOrControl+Alt+Left',
|
||||
nextPlay: 'CommandOrControl+Alt+Right',
|
||||
volumeUp: 'CommandOrControl+Alt+Up',
|
||||
volumeDown: 'CommandOrControl+Alt+Down',
|
||||
toggleFavorite: 'CommandOrControl+Alt+L',
|
||||
toggleWindow: 'CommandOrControl+Alt+Shift+M'
|
||||
};
|
||||
|
||||
let mainWindowRef: Electron.BrowserWindow | null = null;
|
||||
|
||||
// 注册快捷键
|
||||
export function registerShortcuts(
|
||||
mainWindow: Electron.BrowserWindow,
|
||||
shortcutsConfig?: ShortcutsConfig
|
||||
) {
|
||||
export function registerShortcuts(mainWindow: Electron.BrowserWindow) {
|
||||
mainWindowRef = mainWindow;
|
||||
const store = getStore();
|
||||
const shortcuts =
|
||||
shortcutsConfig || (store.get('shortcuts') as ShortcutsConfig) || defaultShortcuts;
|
||||
const shortcuts = store.get('shortcuts');
|
||||
|
||||
// 注销所有已注册的快捷键
|
||||
globalShortcut.unregisterAll();
|
||||
|
||||
// 对旧格式数据进行兼容处理
|
||||
if (shortcuts && typeof shortcuts.togglePlay === 'string') {
|
||||
// 将 shortcuts 强制转换为 unknown，再转为 Record<string, string>
|
||||
const oldShortcuts = { ...shortcuts } as unknown as Record<string, string>;
|
||||
const newShortcuts: ShortcutsConfig = {};
|
||||
|
||||
Object.entries(oldShortcuts).forEach(([key, value]) => {
|
||||
newShortcuts[key] = {
|
||||
key: value,
|
||||
enabled: true,
|
||||
scope: ['volumeUp', 'volumeDown', 'toggleFavorite'].includes(key) ? 'app' : 'global'
|
||||
};
|
||||
});
|
||||
|
||||
store.set('shortcuts', newShortcuts);
|
||||
registerShortcuts(mainWindow, newShortcuts);
|
||||
return;
|
||||
}
|
||||
|
||||
// 注册全局快捷键
|
||||
Object.entries(shortcuts).forEach(([action, config]) => {
|
||||
const { key, enabled, scope } = config as ShortcutConfig;
|
||||
|
||||
// 只注册启用且作用域为全局的快捷键
|
||||
if (!enabled || scope !== 'global') return;
|
||||
|
||||
try {
|
||||
switch (action) {
|
||||
case 'toggleWindow':
|
||||
globalShortcut.register(key, () => {
|
||||
if (mainWindow.isVisible()) {
|
||||
mainWindow.hide();
|
||||
} else {
|
||||
mainWindow.show();
|
||||
}
|
||||
});
|
||||
break;
|
||||
default:
|
||||
globalShortcut.register(key, () => {
|
||||
mainWindow.webContents.send('global-shortcut', action);
|
||||
});
|
||||
break;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`注册快捷键 ${key} 失败:`, error);
|
||||
// 显示/隐藏主窗口
|
||||
globalShortcut.register(shortcuts.toggleWindow, () => {
|
||||
if (mainWindow.isVisible()) {
|
||||
mainWindow.hide();
|
||||
} else {
|
||||
mainWindow.show();
|
||||
}
|
||||
});
|
||||
|
||||
// 通知渲染进程更新应用内快捷键
|
||||
mainWindow.webContents.send('update-app-shortcuts', shortcuts);
|
||||
// 播放/暂停
|
||||
globalShortcut.register(shortcuts.togglePlay, () => {
|
||||
mainWindow.webContents.send('global-shortcut', 'togglePlay');
|
||||
});
|
||||
|
||||
// 上一首
|
||||
globalShortcut.register(shortcuts.prevPlay, () => {
|
||||
mainWindow.webContents.send('global-shortcut', 'prevPlay');
|
||||
});
|
||||
|
||||
// 下一首
|
||||
globalShortcut.register(shortcuts.nextPlay, () => {
|
||||
mainWindow.webContents.send('global-shortcut', 'nextPlay');
|
||||
});
|
||||
|
||||
// 音量增加
|
||||
globalShortcut.register(shortcuts.volumeUp, () => {
|
||||
mainWindow.webContents.send('global-shortcut', 'volumeUp');
|
||||
});
|
||||
|
||||
// 音量减少
|
||||
globalShortcut.register(shortcuts.volumeDown, () => {
|
||||
mainWindow.webContents.send('global-shortcut', 'volumeDown');
|
||||
});
|
||||
|
||||
// 收藏当前歌曲
|
||||
globalShortcut.register(shortcuts.toggleFavorite, () => {
|
||||
mainWindow.webContents.send('global-shortcut', 'toggleFavorite');
|
||||
});
|
||||
}
|
||||
|
||||
// 初始化快捷键
|
||||
@@ -112,11 +85,4 @@ export function initializeShortcuts(mainWindow: Electron.BrowserWindow) {
|
||||
registerShortcuts(mainWindowRef);
|
||||
}
|
||||
});
|
||||
|
||||
// 监听快捷键更新事件
|
||||
ipcMain.on('update-shortcuts', (_, shortcutsConfig: ShortcutsConfig) => {
|
||||
if (mainWindowRef) {
|
||||
registerShortcuts(mainWindowRef, shortcutsConfig);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
import axios from 'axios';
|
||||
import { app } from 'electron';
|
||||
import Store from 'electron-store';
|
||||
|
||||
import { getDeviceId, getSystemInfo } from './deviceInfo';
|
||||
|
||||
const store = new Store();
|
||||
|
||||
// 统计服务配置
|
||||
const STATS_API_URL = 'http://donate.alger.fun/state/api/stats';
|
||||
|
||||
/**
|
||||
* 记录应用安装/启动
|
||||
*/
|
||||
export async function recordInstallation(): Promise<void> {
|
||||
try {
|
||||
const deviceId = getDeviceId();
|
||||
const systemInfo = getSystemInfo();
|
||||
|
||||
// 发送请求到统计服务器
|
||||
await axios.post(`${STATS_API_URL}/installation`, {
|
||||
deviceId,
|
||||
osType: systemInfo.osType,
|
||||
osVersion: systemInfo.osVersion,
|
||||
appVersion: systemInfo.appVersion
|
||||
});
|
||||
|
||||
console.log('应用启动统计已记录');
|
||||
|
||||
// 记录最后一次启动时间
|
||||
store.set('lastStartTime', new Date().toISOString());
|
||||
} catch (error) {
|
||||
console.error('记录应用启动统计失败:', error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置 IPC 处理程序以接收渲染进程的统计请求
|
||||
* @param ipcMain Electron IPC主对象
|
||||
*/
|
||||
export function setupStatsHandlers(ipcMain: Electron.IpcMain): void {
|
||||
// 处理页面访问统计
|
||||
ipcMain.handle('record-visit', async (_, page: string, userId?: string) => {
|
||||
try {
|
||||
const deviceId = getDeviceId();
|
||||
|
||||
await axios.post(`${STATS_API_URL}/visit`, {
|
||||
deviceId,
|
||||
userId,
|
||||
page
|
||||
});
|
||||
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('记录页面访问统计失败:', error);
|
||||
return { success: false, error: (error as Error).message };
|
||||
}
|
||||
});
|
||||
|
||||
// 处理播放统计
|
||||
ipcMain.handle(
|
||||
'record-play',
|
||||
async (
|
||||
_,
|
||||
songData: {
|
||||
userId: string | null;
|
||||
songId: string | number;
|
||||
songName: string;
|
||||
artistName: string;
|
||||
duration?: number;
|
||||
completedPlay?: boolean;
|
||||
}
|
||||
) => {
|
||||
try {
|
||||
const { songId, songName, artistName, duration = 0, completedPlay = false } = songData;
|
||||
const deviceId = getDeviceId();
|
||||
|
||||
await axios.post(`${STATS_API_URL}/play`, {
|
||||
deviceId,
|
||||
userId: songData.userId,
|
||||
songId: songId.toString(),
|
||||
songName,
|
||||
artistName,
|
||||
duration,
|
||||
completedPlay
|
||||
});
|
||||
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('记录播放统计失败:', error);
|
||||
return { success: false, error: (error as Error).message };
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// 处理获取统计摘要
|
||||
ipcMain.handle('get-stats-summary', async () => {
|
||||
try {
|
||||
const response = await axios.get(`${STATS_API_URL}/summary`);
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
console.error('获取统计摘要失败:', error);
|
||||
throw error;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 应用启动时初始化统计服务
|
||||
*/
|
||||
export function initializeStats(): void {
|
||||
// 记录应用启动统计
|
||||
recordInstallation().catch((error) => {
|
||||
console.error('初始化统计服务失败:', error);
|
||||
});
|
||||
|
||||
// 注册应用退出时的回调
|
||||
app.on('will-quit', () => {
|
||||
// 可以在这里添加应用退出时的统计逻辑
|
||||
console.log('应用退出');
|
||||
});
|
||||
}
|
||||
@@ -5,22 +5,16 @@ import server from 'netease-cloud-music-api-alger/server';
|
||||
import os from 'os';
|
||||
import path from 'path';
|
||||
|
||||
import { unblockMusic, type Platform } from './unblockMusic';
|
||||
import { unblockMusic } from './unblockMusic';
|
||||
|
||||
const store = new Store();
|
||||
if (!fs.existsSync(path.resolve(os.tmpdir(), 'anonymous_token'))) {
|
||||
fs.writeFileSync(path.resolve(os.tmpdir(), 'anonymous_token'), '', 'utf-8');
|
||||
}
|
||||
|
||||
// 设置音乐解析的处理程序
|
||||
ipcMain.handle('unblock-music', async (_event, id, songData, enabledSources) => {
|
||||
try {
|
||||
const result = await unblockMusic(id, songData, 1, enabledSources as Platform[]);
|
||||
return result;
|
||||
} catch (error) {
|
||||
console.error('音乐解析失败:', error);
|
||||
return { error: (error as Error).message || '未知错误' };
|
||||
}
|
||||
// 处理解锁音乐请求
|
||||
ipcMain.handle('unblock-music', async (_, id, data) => {
|
||||
return unblockMusic(id, data);
|
||||
});
|
||||
|
||||
async function startMusicApi(): Promise<void> {
|
||||
|
||||
@@ -20,8 +20,5 @@
|
||||
"autoPlay": false,
|
||||
"downloadPath": "",
|
||||
"language": "zh-CN",
|
||||
"alwaysShowDownloadButton": false,
|
||||
"unlimitedDownload": false,
|
||||
"enableMusicUnblock": true,
|
||||
"enabledMusicSources": ["migu", "kugou", "pyncmd", "bilibili", "youtube"]
|
||||
"alwaysShowDownloadButton": false
|
||||
}
|
||||
|
||||
@@ -6,8 +6,6 @@ interface SongData {
|
||||
name: string;
|
||||
artists: Array<{ name: string }>;
|
||||
album?: { name: string };
|
||||
ar?: Array<{ name: string }>;
|
||||
al?: { name: string };
|
||||
}
|
||||
|
||||
interface ResponseData {
|
||||
@@ -29,29 +27,24 @@ interface UnblockResult {
|
||||
};
|
||||
}
|
||||
|
||||
// 所有可用平台
|
||||
export const ALL_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'kuwo', 'bilibili', 'youtube'];
|
||||
|
||||
/**
|
||||
* 音乐解析函数
|
||||
* @param id 歌曲ID
|
||||
* @param songData 歌曲信息
|
||||
* @param retryCount 重试次数
|
||||
* @param enabledPlatforms 启用的平台列表，默认为所有平台
|
||||
* @returns Promise<UnblockResult>
|
||||
*/
|
||||
const unblockMusic = async (
|
||||
id: number | string,
|
||||
songData: SongData,
|
||||
retryCount = 1,
|
||||
enabledPlatforms?: Platform[]
|
||||
retryCount = 3
|
||||
): Promise<UnblockResult> => {
|
||||
const platforms = enabledPlatforms || ALL_PLATFORMS;
|
||||
songData.album = songData.album || songData.al;
|
||||
songData.artists = songData.artists || songData.ar;
|
||||
// 所有可用平台
|
||||
const platforms: Platform[] = ['migu', 'kugou', 'pyncmd', 'joox', 'kuwo', 'bilibili', 'youtube'];
|
||||
|
||||
const retry = async (attempt: number): Promise<UnblockResult> => {
|
||||
try {
|
||||
const data = await match(parseInt(String(id), 10), platforms,songData);
|
||||
const data = await match(parseInt(String(id), 10), platforms, songData);
|
||||
const result: UnblockResult = {
|
||||
data: {
|
||||
data,
|
||||
@@ -65,7 +58,7 @@ const unblockMusic = async (
|
||||
} catch (err) {
|
||||
if (attempt < retryCount) {
|
||||
// 延迟重试，每次重试增加延迟时间
|
||||
await new Promise((resolve) => setTimeout(resolve, 100 * attempt));
|
||||
await new Promise((resolve) => setTimeout(resolve, 1000 * attempt));
|
||||
return retry(attempt + 1);
|
||||
}
|
||||
|
||||
|
||||
57
src/preload/index.d.ts
vendored
57
src/preload/index.d.ts
vendored
@@ -1,42 +1,31 @@
|
||||
import { ElectronAPI } from '@electron-toolkit/preload';
|
||||
|
||||
interface API {
|
||||
minimize: () => void;
|
||||
maximize: () => void;
|
||||
close: () => void;
|
||||
dragStart: (data: any) => void;
|
||||
miniTray: () => void;
|
||||
miniWindow: () => void;
|
||||
restore: () => void;
|
||||
restart: () => void;
|
||||
resizeWindow: (width: number, height: number) => void;
|
||||
resizeMiniWindow: (showPlaylist: boolean) => void;
|
||||
openLyric: () => void;
|
||||
sendLyric: (data: any) => void;
|
||||
sendSong: (data: any) => void;
|
||||
unblockMusic: (id: number, data: any, enabledSources?: string[]) => Promise<any>;
|
||||
onLyricWindowClosed: (callback: () => void) => void;
|
||||
startDownload: (url: string) => void;
|
||||
onDownloadProgress: (callback: (progress: number, status: string) => void) => void;
|
||||
onDownloadComplete: (callback: (success: boolean, filePath: string) => void) => void;
|
||||
onLanguageChanged: (callback: (locale: string) => void) => void;
|
||||
removeDownloadListeners: () => void;
|
||||
invoke: (channel: string, ...args: any[]) => Promise<any>;
|
||||
}
|
||||
|
||||
// 自定义IPC渲染进程通信接口
|
||||
interface IpcRenderer {
|
||||
send: (channel: string, ...args: any[]) => void;
|
||||
invoke: (channel: string, ...args: any[]) => Promise<any>;
|
||||
on: (channel: string, listener: (...args: any[]) => void) => () => void;
|
||||
removeAllListeners: (channel: string) => void;
|
||||
}
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
electron: ElectronAPI;
|
||||
api: API;
|
||||
ipcRenderer: IpcRenderer;
|
||||
api: {
|
||||
sendLyric: (data: string) => void;
|
||||
openLyric: () => void;
|
||||
minimize: () => void;
|
||||
maximize: () => void;
|
||||
close: () => void;
|
||||
dragStart: (data: string) => void;
|
||||
miniTray: () => void;
|
||||
miniWindow: () => void;
|
||||
restore: () => void;
|
||||
restart: () => void;
|
||||
resizeWindow: (width: number, height: number) => void;
|
||||
resizeMiniWindow: (showPlaylist: boolean) => void;
|
||||
unblockMusic: (id: number, data: any) => Promise<any>;
|
||||
onLyricWindowClosed: (callback: () => void) => void;
|
||||
startDownload: (url: string) => void;
|
||||
onDownloadProgress: (callback: (progress: number, status: string) => void) => void;
|
||||
onDownloadComplete: (callback: (success: boolean, filePath: string) => void) => void;
|
||||
removeDownloadListeners: () => void;
|
||||
onLanguageChanged: (callback: (locale: string) => void) => void;
|
||||
invoke: (channel: string, ...args: any[]) => Promise<any>;
|
||||
sendSong: (data: any) => void;
|
||||
};
|
||||
$message: any;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ const api = {
|
||||
openLyric: () => ipcRenderer.send('open-lyric'),
|
||||
sendLyric: (data) => ipcRenderer.send('send-lyric', data),
|
||||
sendSong: (data) => ipcRenderer.send('update-current-song', data),
|
||||
unblockMusic: (id, data, enabledSources) => ipcRenderer.invoke('unblock-music', id, data, enabledSources),
|
||||
unblockMusic: (id) => ipcRenderer.invoke('unblock-music', id),
|
||||
// 歌词窗口关闭事件
|
||||
onLyricWindowClosed: (callback: () => void) => {
|
||||
ipcRenderer.on('lyric-window-closed', () => callback());
|
||||
@@ -47,11 +47,7 @@ const api = {
|
||||
'get-system-fonts',
|
||||
'get-cached-lyric',
|
||||
'cache-lyric',
|
||||
'clear-lyric-cache',
|
||||
// 统计相关
|
||||
'record-visit',
|
||||
'record-play',
|
||||
'get-stats-summary'
|
||||
'clear-lyric-cache'
|
||||
];
|
||||
if (validChannels.includes(channel)) {
|
||||
return ipcRenderer.invoke(channel, ...args);
|
||||
@@ -60,29 +56,6 @@ const api = {
|
||||
}
|
||||
};
|
||||
|
||||
// 创建带类型的ipcRenderer对象，暴露给渲染进程
|
||||
const ipc = {
|
||||
// 发送消息到主进程（无返回值）
|
||||
send: (channel: string, ...args: any[]) => {
|
||||
ipcRenderer.send(channel, ...args);
|
||||
},
|
||||
// 调用主进程方法（有返回值）
|
||||
invoke: (channel: string, ...args: any[]) => {
|
||||
return ipcRenderer.invoke(channel, ...args);
|
||||
},
|
||||
// 监听主进程消息
|
||||
on: (channel: string, listener: (...args: any[]) => void) => {
|
||||
ipcRenderer.on(channel, (_, ...args) => listener(...args));
|
||||
return () => {
|
||||
ipcRenderer.removeListener(channel, listener);
|
||||
};
|
||||
},
|
||||
// 移除所有监听器
|
||||
removeAllListeners: (channel: string) => {
|
||||
ipcRenderer.removeAllListeners(channel);
|
||||
}
|
||||
};
|
||||
|
||||
// Use `contextBridge` APIs to expose Electron APIs to
|
||||
// renderer only if context isolation is enabled, otherwise
|
||||
// just add to the DOM global.
|
||||
@@ -90,7 +63,6 @@ if (process.contextIsolated) {
|
||||
try {
|
||||
contextBridge.exposeInMainWorld('electron', electronAPI);
|
||||
contextBridge.exposeInMainWorld('api', api);
|
||||
contextBridge.exposeInMainWorld('ipcRenderer', ipc);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
@@ -99,6 +71,4 @@ if (process.contextIsolated) {
|
||||
window.electron = electronAPI;
|
||||
// @ts-ignore (define in dts)
|
||||
window.api = api;
|
||||
// @ts-ignore (define in dts)
|
||||
window.ipcRenderer = ipc;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import { isElectron, isLyricWindow } from '@/utils';
|
||||
|
||||
import { initAudioListeners } from './hooks/MusicHook';
|
||||
import { isMobile } from './utils';
|
||||
import { useAppShortcuts } from './utils/appShortcuts';
|
||||
import { initShortcut } from './utils/shortcut';
|
||||
|
||||
const { locale } = useI18n();
|
||||
const settingsStore = useSettingsStore();
|
||||
@@ -101,9 +101,6 @@ if (isElectron) {
|
||||
});
|
||||
}
|
||||
|
||||
// 使用应用内快捷键
|
||||
useAppShortcuts();
|
||||
|
||||
onMounted(async () => {
|
||||
if (isLyricWindow.value) {
|
||||
return;
|
||||
@@ -115,10 +112,10 @@ onMounted(async () => {
|
||||
// 使用 nextTick 确保 DOM 更新后再初始化
|
||||
await nextTick();
|
||||
initAudioListeners();
|
||||
if (isElectron) {
|
||||
window.api.sendSong(cloneDeep(playerStore.playMusic));
|
||||
}
|
||||
window.api.sendSong(cloneDeep(playerStore.playMusic));
|
||||
}
|
||||
// 初始化快捷键
|
||||
initShortcut();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -15,6 +15,6 @@ export interface Donor {
|
||||
* 获取捐赠列表
|
||||
*/
|
||||
export const getDonationList = async (): Promise<Donor[]> => {
|
||||
const { data } = await axios.get('http://donate.alger.fun/api/donations');
|
||||
const { data } = await axios.get('http://110.42.251.190:8766/api/donations');
|
||||
return data;
|
||||
};
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
import axios from 'axios';
|
||||
import type { MusicSourceType } from '@/type/music';
|
||||
|
||||
/**
|
||||
* GD音乐台解析服务
|
||||
*/
|
||||
export interface GDMusicResponse {
|
||||
url: string;
|
||||
br: number;
|
||||
size: number;
|
||||
md5: string;
|
||||
platform: string;
|
||||
gain: number;
|
||||
}
|
||||
|
||||
export interface ParsedMusicResult {
|
||||
data: {
|
||||
data: GDMusicResponse;
|
||||
params: {
|
||||
id: number;
|
||||
type: string;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 从GD音乐台解析音乐URL
|
||||
* @param id 音乐ID
|
||||
* @param data 音乐数据，包含名称和艺术家信息
|
||||
* @param quality 音质设置
|
||||
* @returns 解析后的音乐URL及相关信息
|
||||
*/
|
||||
export const parseFromGDMusic = async (
|
||||
id: number,
|
||||
data: any,
|
||||
quality: string = '320'
|
||||
): Promise<ParsedMusicResult | null> => {
|
||||
try {
|
||||
// 处理不同数据结构
|
||||
if (!data) {
|
||||
console.error('GD音乐台解析：歌曲数据为空');
|
||||
throw new Error('歌曲数据为空');
|
||||
}
|
||||
|
||||
const songName = data.name || '';
|
||||
let artistNames = '';
|
||||
|
||||
// 处理不同的艺术家字段结构
|
||||
if (data.artists && Array.isArray(data.artists)) {
|
||||
artistNames = data.artists.map(artist => artist.name).join(' ');
|
||||
} else if (data.ar && Array.isArray(data.ar)) {
|
||||
artistNames = data.ar.map(artist => artist.name).join(' ');
|
||||
} else if (data.artist) {
|
||||
artistNames = typeof data.artist === 'string' ? data.artist : '';
|
||||
}
|
||||
|
||||
const searchQuery = `${songName} ${artistNames}`.trim();
|
||||
|
||||
if (!searchQuery || searchQuery.length < 2) {
|
||||
console.error('GD音乐台解析：搜索查询过短', { name: songName, artists: artistNames });
|
||||
throw new Error('搜索查询过短');
|
||||
}
|
||||
|
||||
// 所有可用的音乐源
|
||||
const allSources = [
|
||||
'tencent', 'kugou', 'kuwo', 'migu', 'netease',
|
||||
'joox', 'ytmusic', 'spotify', 'qobuz', 'deezer'
|
||||
] as MusicSourceType[];
|
||||
|
||||
console.log('GD音乐台开始搜索:', searchQuery);
|
||||
|
||||
// 依次尝试所有音源
|
||||
for (const source of allSources) {
|
||||
try {
|
||||
const result = await searchAndGetUrl(source, searchQuery, quality);
|
||||
if (result) {
|
||||
console.log(`GD音乐台成功通过 ${result.source} 解析音乐!`);
|
||||
// 返回符合原API格式的数据
|
||||
return {
|
||||
data: {
|
||||
data: {
|
||||
url: result.url.replace(/\\/g, ''),
|
||||
br: parseInt(result.br, 10) * 1000 || 320000,
|
||||
size: result.size || 0,
|
||||
md5: '',
|
||||
platform: 'gdmusic',
|
||||
gain: 0
|
||||
},
|
||||
params: {
|
||||
id: parseInt(String(id), 10),
|
||||
type: 'song'
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`GD音乐台 ${source} 音源解析失败:`, error);
|
||||
// 该音源失败，继续尝试下一个音源
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
console.log('GD音乐台所有音源均解析失败');
|
||||
return null;
|
||||
} catch (error) {
|
||||
console.error('GD音乐台解析完全失败:', error);
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取音质映射
|
||||
* @param qualitySetting 设置中的音质选项
|
||||
* @returns 映射到GD音乐台的音质参数
|
||||
*/
|
||||
export const getQualityMapping = (qualitySetting: string): string => {
|
||||
const qualityMap: Record<string, string> = {
|
||||
standard: '128',
|
||||
higher: '320',
|
||||
exhigh: '320',
|
||||
lossless: '740',
|
||||
hires: '999',
|
||||
jyeffect: '999',
|
||||
sky: '999',
|
||||
dolby: '999',
|
||||
jymaster: '999'
|
||||
};
|
||||
return qualityMap[qualitySetting] || '320';
|
||||
};
|
||||
|
||||
interface GDMusicUrlResult {
|
||||
url: string;
|
||||
br: string;
|
||||
size: number;
|
||||
source: string;
|
||||
}
|
||||
|
||||
const baseUrl = 'https://music-api.gdstudio.xyz/api.php';
|
||||
|
||||
/**
|
||||
* 在指定音源搜索歌曲并获取URL
|
||||
* @param source 音源
|
||||
* @param searchQuery 搜索关键词
|
||||
* @param quality 音质
|
||||
* @returns 音乐URL结果
|
||||
*/
|
||||
async function searchAndGetUrl(
|
||||
source: MusicSourceType,
|
||||
searchQuery: string,
|
||||
quality: string
|
||||
): Promise<GDMusicUrlResult | null> {
|
||||
// 1. 搜索歌曲
|
||||
const searchUrl = `${baseUrl}?types=search&source=${source}&name=${encodeURIComponent(searchQuery)}&count=1&pages=1`;
|
||||
console.log(`GD音乐台尝试音源 ${source} 搜索:`, searchUrl);
|
||||
|
||||
const searchResponse = await axios.get(searchUrl, { timeout: 5000 });
|
||||
|
||||
if (searchResponse.data && Array.isArray(searchResponse.data) && searchResponse.data.length > 0) {
|
||||
const firstResult = searchResponse.data[0];
|
||||
if (!firstResult || !firstResult.id) {
|
||||
console.log(`GD音乐台 ${source} 搜索结果无效`);
|
||||
return null;
|
||||
}
|
||||
|
||||
const trackId = firstResult.id;
|
||||
const trackSource = firstResult.source || source;
|
||||
|
||||
// 2. 获取歌曲URL
|
||||
const songUrl = `${baseUrl}?types=url&source=${trackSource}&id=${trackId}&br=${quality}`;
|
||||
console.log(`GD音乐台尝试获取 ${trackSource} 歌曲URL:`, songUrl);
|
||||
|
||||
const songResponse = await axios.get(songUrl, { timeout: 5000 });
|
||||
|
||||
if (songResponse.data && songResponse.data.url) {
|
||||
return {
|
||||
url: songResponse.data.url,
|
||||
br: songResponse.data.br,
|
||||
size: songResponse.data.size || 0,
|
||||
source: trackSource
|
||||
};
|
||||
} else {
|
||||
console.log(`GD音乐台 ${trackSource} 未返回有效URL`);
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
console.log(`GD音乐台 ${source} 搜索结果为空`);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,6 @@ import type { ILyric } from '@/type/lyric';
|
||||
import { isElectron } from '@/utils';
|
||||
import request from '@/utils/request';
|
||||
import requestMusic from '@/utils/request_music';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { parseFromGDMusic, getQualityMapping } from './gdmusic';
|
||||
|
||||
const { addData, getData, deleteData } = musicDB;
|
||||
|
||||
@@ -80,39 +78,10 @@ export const getMusicLrc = async (id: number) => {
|
||||
}
|
||||
};
|
||||
|
||||
export const getParsingMusicUrl = async (id: number, data: any) => {
|
||||
const settingStore = useSettingsStore();
|
||||
|
||||
// 如果禁用了音乐解析功能，则直接返回空结果
|
||||
if (!settingStore.setData.enableMusicUnblock) {
|
||||
return Promise.resolve({ data: { code: 404, message: '音乐解析功能已禁用' } });
|
||||
}
|
||||
|
||||
// 检查是否选择了GD音乐台解析
|
||||
const enabledSources = settingStore.setData.enabledMusicSources || [];
|
||||
if (enabledSources.includes('gdmusic')) {
|
||||
// 获取音质设置并转换为GD音乐台格式
|
||||
try {
|
||||
const quality = getQualityMapping(settingStore.setData.musicQuality || 'higher');
|
||||
|
||||
// 调用封装的GD音乐台解析服务
|
||||
const gdResult = await parseFromGDMusic(id, data, quality);
|
||||
if (gdResult) {
|
||||
return gdResult;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('GD音乐台解析失败:', error);
|
||||
}
|
||||
|
||||
console.log('GD音乐台所有音源均解析失败，尝试使用unblockMusic');
|
||||
}
|
||||
|
||||
// 如果GD音乐台解析失败或者未启用，尝试使用unblockMusic
|
||||
export const getParsingMusicUrl = (id: number, data: any) => {
|
||||
if (isElectron) {
|
||||
const filteredSources = enabledSources.filter(source => source !== 'gdmusic');
|
||||
return window.api.unblockMusic(id, cloneDeep(data), cloneDeep(filteredSources));
|
||||
return window.api.unblockMusic(id, data);
|
||||
}
|
||||
|
||||
return requestMusic.get<any>('/music', { params: { id } });
|
||||
};
|
||||
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
import { isElectron } from '@/utils';
|
||||
|
||||
import { useUserStore } from '../store/modules/user';
|
||||
|
||||
/**
|
||||
* 获取用户ID
|
||||
* @returns 用户ID或null
|
||||
*/
|
||||
function getUserId(): string | null {
|
||||
const userStore = useUserStore();
|
||||
return userStore.user?.userId?.toString() || null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录页面访问
|
||||
* @param page 页面名称或路径
|
||||
*/
|
||||
export async function recordVisit(page: string): Promise<void> {
|
||||
if (!isElectron) return;
|
||||
try {
|
||||
const userId = getUserId();
|
||||
await window.api.invoke('record-visit', page, userId);
|
||||
console.log(`页面访问已记录: ${page}`);
|
||||
} catch (error) {
|
||||
console.error('记录页面访问失败:', error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录歌曲播放
|
||||
* @param songId 歌曲ID
|
||||
* @param songName 歌曲名称
|
||||
* @param artistName 艺术家名称
|
||||
* @param duration 时长（秒）
|
||||
* @param completedPlay 是否完整播放
|
||||
*/
|
||||
export async function recordPlay(
|
||||
songId: string | number,
|
||||
songName: string,
|
||||
artistName: string,
|
||||
duration: number = 0,
|
||||
completedPlay: boolean = false
|
||||
): Promise<void> {
|
||||
if (!isElectron) return;
|
||||
try {
|
||||
const userId = getUserId();
|
||||
|
||||
await window.api.invoke('record-play', {
|
||||
userId,
|
||||
songId,
|
||||
songName,
|
||||
artistName,
|
||||
duration,
|
||||
completedPlay
|
||||
});
|
||||
|
||||
console.log(`歌曲播放已记录: ${songName}`);
|
||||
} catch (error) {
|
||||
console.error('记录歌曲播放失败:', error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取统计摘要
|
||||
* @returns 统计数据摘要
|
||||
*/
|
||||
export async function getStatsSummary(): Promise<any> {
|
||||
if (!isElectron) return null;
|
||||
try {
|
||||
return await window.api.invoke('get-stats-summary');
|
||||
} catch (error) {
|
||||
console.error('获取统计摘要失败:', error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
4
src/renderer/components.d.ts
vendored
4
src/renderer/components.d.ts
vendored
@@ -17,8 +17,6 @@ declare module 'vue' {
|
||||
NCarouselItem: typeof import('naive-ui')['NCarouselItem']
|
||||
NCheckbox: typeof import('naive-ui')['NCheckbox']
|
||||
NCheckboxGroup: typeof import('naive-ui')['NCheckboxGroup']
|
||||
NCollapse: typeof import('naive-ui')['NCollapse']
|
||||
NCollapseItem: typeof import('naive-ui')['NCollapseItem']
|
||||
NConfigProvider: typeof import('naive-ui')['NConfigProvider']
|
||||
NDialogProvider: typeof import('naive-ui')['NDialogProvider']
|
||||
NDrawer: typeof import('naive-ui')['NDrawer']
|
||||
@@ -28,8 +26,6 @@ declare module 'vue' {
|
||||
NEmpty: typeof import('naive-ui')['NEmpty']
|
||||
NForm: typeof import('naive-ui')['NForm']
|
||||
NFormItem: typeof import('naive-ui')['NFormItem']
|
||||
NGrid: typeof import('naive-ui')['NGrid']
|
||||
NGridItem: typeof import('naive-ui')['NGridItem']
|
||||
NIcon: typeof import('naive-ui')['NIcon']
|
||||
NImage: typeof import('naive-ui')['NImage']
|
||||
NInput: typeof import('naive-ui')['NInput']
|
||||
|
||||
@@ -12,39 +12,21 @@
|
||||
>
|
||||
<div class="music-page">
|
||||
<div class="music-header h-12 flex items-center justify-between">
|
||||
<n-ellipsis :line-clamp="1" class="flex-shrink-0 mr-3">
|
||||
<n-ellipsis :line-clamp="1">
|
||||
<div class="music-title">
|
||||
{{ name }}
|
||||
</div>
|
||||
</n-ellipsis>
|
||||
|
||||
<!-- 搜索框 -->
|
||||
<div class="flex-grow flex-1 flex items-center justify-end">
|
||||
<div class="search-container">
|
||||
<n-input
|
||||
v-model:value="searchKeyword"
|
||||
:placeholder="t('comp.musicList.searchSongs')"
|
||||
clearable
|
||||
round
|
||||
size="small"
|
||||
>
|
||||
<template #prefix>
|
||||
<i class="icon iconfont ri-search-line text-sm"></i>
|
||||
</template>
|
||||
</n-input>
|
||||
</div>
|
||||
</div>
|
||||
<div class="music-close flex-shrink-0 ml-3">
|
||||
<div class="music-close">
|
||||
<i class="icon iconfont ri-close-line" @click="close"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="music-content">
|
||||
<!-- 左侧歌单信息 -->
|
||||
<div class="music-info">
|
||||
<div class="music-cover">
|
||||
<n-image
|
||||
:src="getCoverImgUrl"
|
||||
:src="getImgUrl(cover ? listInfo?.coverImgUrl : displayedSongs[0]?.picUrl, '500y500')"
|
||||
class="cover-img"
|
||||
preview-disabled
|
||||
:class="setAnimationClass('animate__fadeIn')"
|
||||
@@ -67,36 +49,33 @@
|
||||
<!-- 右侧歌曲列表 -->
|
||||
<div class="music-list-container">
|
||||
<div class="music-list">
|
||||
<n-spin :show="loadingList || loading">
|
||||
<div class="music-list-content">
|
||||
<div v-if="filteredSongs.length === 0 && searchKeyword" class="no-result">
|
||||
{{ t('comp.musicList.noSearchResults') }}
|
||||
<n-scrollbar @scroll="handleScroll">
|
||||
<n-spin :show="loadingList || loading">
|
||||
<div class="music-list-content">
|
||||
<div
|
||||
v-for="(item, index) in displayedSongs"
|
||||
:key="item.id"
|
||||
class="double-item"
|
||||
:class="setAnimationClass('animate__bounceInUp')"
|
||||
:style="getItemAnimationDelay(index)"
|
||||
>
|
||||
<song-item
|
||||
:item="formatSong(item)"
|
||||
:can-remove="canRemove"
|
||||
@play="handlePlay"
|
||||
@remove-song="(id) => emit('remove-song', id)"
|
||||
/>
|
||||
</div>
|
||||
<div v-if="isLoadingMore" class="loading-more">
|
||||
{{ t('common.loadingMore') }}
|
||||
</div>
|
||||
<div v-if="!hasMore" class="loading-more">
|
||||
{{ t('common.noMore') }}
|
||||
</div>
|
||||
<play-bottom />
|
||||
</div>
|
||||
|
||||
<!-- 虚拟列表，设置正确的固定高度 -->
|
||||
<n-virtual-list
|
||||
ref="songListRef"
|
||||
class="song-virtual-list"
|
||||
style="height: calc(70vh - 60px)"
|
||||
:items="filteredSongs"
|
||||
:item-size="70"
|
||||
item-resizable
|
||||
key-field="id"
|
||||
@scroll="handleVirtualScroll"
|
||||
>
|
||||
<template #default="{ item }">
|
||||
<div class="double-item">
|
||||
<song-item
|
||||
:item="formatSong(item)"
|
||||
:can-remove="canRemove"
|
||||
@play="handlePlay"
|
||||
@remove-song="(id) => emit('remove-song', id)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
</n-virtual-list>
|
||||
</div>
|
||||
</n-spin>
|
||||
</n-spin>
|
||||
</n-scrollbar>
|
||||
</div>
|
||||
<play-bottom />
|
||||
</div>
|
||||
@@ -106,20 +85,19 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import PinyinMatch from 'pinyin-match';
|
||||
import { computed, onUnmounted, ref, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import { getMusicDetail } from '@/api/music';
|
||||
import SongItem from '@/components/common/SongItem.vue';
|
||||
import { usePlayerStore } from '@/store/modules/player';
|
||||
import { SongResult } from '@/type/music';
|
||||
import { getImgUrl, isMobile, setAnimationClass } from '@/utils';
|
||||
import { getImgUrl, isMobile, setAnimationClass, setAnimationDelay } from '@/utils';
|
||||
|
||||
import PlayBottom from './common/PlayBottom.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const playerStore = usePlayerStore();
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
show: boolean;
|
||||
@@ -147,14 +125,12 @@ const emit = defineEmits(['update:show', 'update:loading', 'remove-song']);
|
||||
const page = ref(0);
|
||||
const pageSize = 40;
|
||||
const isLoadingMore = ref(false);
|
||||
const displayedSongs = ref<SongResult[]>([]);
|
||||
const displayedSongs = ref<any[]>([]);
|
||||
const loadingList = ref(false);
|
||||
const loadedIds = ref(new Set<number>()); // 用于追踪已加载的歌曲ID
|
||||
const isPlaylistLoading = ref(false); // 标记是否正在加载播放列表
|
||||
const completePlaylist = ref<SongResult[]>([]); // 存储完整的播放列表
|
||||
const completePlaylist = ref<any[]>([]); // 存储完整的播放列表
|
||||
const hasMore = ref(true); // 标记是否还有更多数据可加载
|
||||
const searchKeyword = ref(''); // 搜索关键词
|
||||
const isFullPlaylistLoaded = ref(false); // 标记完整播放列表是否已加载完成
|
||||
|
||||
// 计算总数
|
||||
const total = computed(() => {
|
||||
@@ -164,66 +140,8 @@ const total = computed(() => {
|
||||
return props.songList.length;
|
||||
});
|
||||
|
||||
const getCoverImgUrl = computed(() => {
|
||||
if (props.listInfo?.coverImgUrl) {
|
||||
return props.listInfo.coverImgUrl;
|
||||
}
|
||||
|
||||
const song = props.songList[0];
|
||||
if (song?.picUrl) {
|
||||
return song.picUrl;
|
||||
}
|
||||
if (song?.al?.picUrl) {
|
||||
return song.al.picUrl;
|
||||
}
|
||||
if (song?.album?.picUrl) {
|
||||
return song.album.picUrl;
|
||||
}
|
||||
return '';
|
||||
});
|
||||
|
||||
// 过滤歌曲列表
|
||||
const filteredSongs = computed(() => {
|
||||
if (!searchKeyword.value) {
|
||||
return displayedSongs.value;
|
||||
}
|
||||
|
||||
const keyword = searchKeyword.value.toLowerCase().trim();
|
||||
return displayedSongs.value.filter((song) => {
|
||||
const songName = song.name?.toLowerCase() || '';
|
||||
const albumName = song.al?.name?.toLowerCase() || '';
|
||||
const artists = song.ar || song.artists || [];
|
||||
|
||||
// 原始文本匹配
|
||||
const nameMatch = songName.includes(keyword);
|
||||
const albumMatch = albumName.includes(keyword);
|
||||
const artistsMatch = artists.some((artist: any) => {
|
||||
return artist.name?.toLowerCase().includes(keyword);
|
||||
});
|
||||
|
||||
// 拼音匹配
|
||||
const namePinyinMatch = song.name && PinyinMatch.match(song.name, keyword);
|
||||
const albumPinyinMatch = song.al?.name && PinyinMatch.match(song.al.name, keyword);
|
||||
const artistsPinyinMatch = artists.some((artist: any) => {
|
||||
return artist.name && PinyinMatch.match(artist.name, keyword);
|
||||
});
|
||||
|
||||
return (
|
||||
nameMatch ||
|
||||
albumMatch ||
|
||||
artistsMatch ||
|
||||
namePinyinMatch ||
|
||||
albumPinyinMatch ||
|
||||
artistsPinyinMatch
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// 格式化歌曲数据
|
||||
const formatSong = (item: any) => {
|
||||
if (!item) {
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
...item,
|
||||
picUrl: item.al?.picUrl || item.picUrl,
|
||||
@@ -245,44 +163,25 @@ const loadSongs = async (ids: number[], appendToList = true, updateComplete = fa
|
||||
if (ids.length === 0) return [];
|
||||
|
||||
try {
|
||||
console.log(`请求歌曲详情，ID数量: ${ids.length}`);
|
||||
const { data } = await getMusicDetail(ids);
|
||||
|
||||
if (data?.songs) {
|
||||
console.log(`API返回歌曲数量: ${data.songs.length}`);
|
||||
|
||||
// 直接使用API返回的所有歌曲，不再过滤已加载的歌曲
|
||||
// 因为当需要完整加载列表时，我们希望获取所有歌曲，即使ID可能重复
|
||||
const { songs } = data;
|
||||
|
||||
// 只在非更新完整列表时执行过滤
|
||||
let newSongs = songs;
|
||||
if (!updateComplete) {
|
||||
// 在普通加载模式下继续过滤已加载的歌曲，避免重复
|
||||
newSongs = songs.filter((song: any) => !loadedIds.value.has(song.id));
|
||||
console.log(`过滤已加载ID后剩余歌曲数量: ${newSongs.length}`);
|
||||
}
|
||||
|
||||
// 更新已加载ID集合
|
||||
songs.forEach((song: any) => {
|
||||
const newSongs = data.songs.filter((song: any) => !loadedIds.value.has(song.id));
|
||||
|
||||
newSongs.forEach((song: any) => {
|
||||
loadedIds.value.add(song.id);
|
||||
});
|
||||
|
||||
// 追加到显示列表 - 仅当appendToList=true时添加到displayedSongs
|
||||
if (appendToList) {
|
||||
displayedSongs.value.push(...newSongs);
|
||||
}
|
||||
|
||||
// 更新完整播放列表 - 仅当updateComplete=true时添加到completePlaylist
|
||||
if (updateComplete) {
|
||||
completePlaylist.value.push(...songs);
|
||||
console.log(`已添加到完整播放列表，当前完整列表长度: ${completePlaylist.value.length}`);
|
||||
completePlaylist.value.push(...newSongs);
|
||||
}
|
||||
|
||||
return updateComplete ? songs : newSongs;
|
||||
return newSongs;
|
||||
}
|
||||
console.log('API返回无歌曲数据');
|
||||
return [];
|
||||
} catch (error) {
|
||||
console.error('加载歌曲失败:', error);
|
||||
}
|
||||
@@ -292,127 +191,41 @@ const loadSongs = async (ids: number[], appendToList = true, updateComplete = fa
|
||||
|
||||
// 加载完整播放列表
|
||||
const loadFullPlaylist = async () => {
|
||||
if (isPlaylistLoading.value || isFullPlaylistLoaded.value) return;
|
||||
|
||||
if (isPlaylistLoading.value) return;
|
||||
isPlaylistLoading.value = true;
|
||||
// 记录开始时间
|
||||
const startTime = Date.now();
|
||||
console.log(`开始加载完整播放列表，当前显示列表长度: ${displayedSongs.value.length}`);
|
||||
completePlaylist.value = [...displayedSongs.value]; // 先用当前已加载的歌曲初始化
|
||||
|
||||
try {
|
||||
// 如果没有trackIds，直接使用当前歌曲列表并标记为已完成
|
||||
// 如果没有trackIds，直接使用当前歌曲列表
|
||||
if (!props.listInfo?.trackIds) {
|
||||
isFullPlaylistLoaded.value = true;
|
||||
console.log('无trackIds信息，使用当前列表作为完整列表');
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取所有trackIds
|
||||
// 获取所有未加载的歌曲ID
|
||||
const allIds = props.listInfo.trackIds.map((item) => item.id);
|
||||
console.log(`歌单共有歌曲ID: ${allIds.length}首`);
|
||||
|
||||
// 重置completePlaylist和当前显示歌曲ID集合，保证不会重复添加歌曲
|
||||
completePlaylist.value = [];
|
||||
|
||||
// 使用Set记录所有已加载的歌曲ID
|
||||
const loadedSongIds = new Set<number>();
|
||||
|
||||
// 将当前显示列表中的歌曲和ID添加到集合中
|
||||
displayedSongs.value.forEach((song) => {
|
||||
loadedSongIds.add(song.id as number);
|
||||
// 将已有歌曲添加到completePlaylist
|
||||
completePlaylist.value.push(song);
|
||||
});
|
||||
|
||||
console.log(
|
||||
`已有显示歌曲: ${displayedSongs.value.length}首，已有ID数量: ${loadedSongIds.size}`
|
||||
);
|
||||
|
||||
// 过滤出尚未加载的歌曲ID
|
||||
const unloadedIds = allIds.filter((id) => !loadedSongIds.has(id));
|
||||
console.log(`还需要加载的歌曲ID数量: ${unloadedIds.length}`);
|
||||
const unloadedIds = allIds.filter((id) => !loadedIds.value.has(id));
|
||||
|
||||
// 如果所有歌曲都已加载，直接返回
|
||||
if (unloadedIds.length === 0) {
|
||||
console.log('所有歌曲已加载，无需再次加载');
|
||||
isFullPlaylistLoaded.value = true;
|
||||
hasMore.value = false;
|
||||
return;
|
||||
}
|
||||
|
||||
// 分批加载所有未加载的歌曲
|
||||
// 分批加载未加载的歌曲
|
||||
const batchSize = 500; // 每批加载的歌曲数量
|
||||
|
||||
for (let i = 0; i < unloadedIds.length; i += batchSize) {
|
||||
const batchIds = unloadedIds.slice(i, i + batchSize);
|
||||
if (batchIds.length === 0) continue;
|
||||
|
||||
console.log(`请求第${Math.floor(i / batchSize) + 1}批歌曲，数量: ${batchIds.length}`);
|
||||
// 关键修改: 设置appendToList为false，避免loadSongs直接添加到displayedSongs
|
||||
const loadedBatch = await loadSongs(batchIds, false, false);
|
||||
|
||||
// 添加新加载的歌曲到displayedSongs
|
||||
if (loadedBatch.length > 0) {
|
||||
// 过滤掉已有的歌曲，确保不会重复添加
|
||||
const newSongs = loadedBatch.filter((song) => !loadedSongIds.has(song.id as number));
|
||||
|
||||
// 更新已加载ID集合
|
||||
newSongs.forEach((song) => {
|
||||
loadedSongIds.add(song.id as number);
|
||||
});
|
||||
|
||||
console.log(`新增${newSongs.length}首歌曲到显示列表`);
|
||||
|
||||
// 更新显示列表和完整播放列表
|
||||
if (newSongs.length > 0) {
|
||||
// 添加到显示列表
|
||||
displayedSongs.value = [...displayedSongs.value, ...newSongs];
|
||||
|
||||
// 添加到完整播放列表
|
||||
completePlaylist.value.push(...newSongs);
|
||||
|
||||
// 如果当前正在播放的列表与这个列表匹配，实时更新播放列表
|
||||
const currentPlaylist = playerStore.playList;
|
||||
if (currentPlaylist.length > 0 && currentPlaylist[0].id === displayedSongs.value[0]?.id) {
|
||||
console.log('实时更新当前播放列表');
|
||||
playerStore.setPlayList(displayedSongs.value.map(formatSong));
|
||||
}
|
||||
}
|
||||
}
|
||||
await loadSongs(batchIds, false, true);
|
||||
|
||||
// 添加小延迟避免请求过于密集
|
||||
if (i + batchSize < unloadedIds.length) {
|
||||
// 使用 setTimeout 直接延迟，避免 Promise 相关的 linter 错误
|
||||
await new Promise<void>((resolve) => {
|
||||
setTimeout(() => resolve(), 100);
|
||||
setTimeout(() => resolve(), 300);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 加载完成，更新状态
|
||||
isFullPlaylistLoaded.value = true;
|
||||
hasMore.value = false;
|
||||
|
||||
// 计算加载耗时
|
||||
const endTime = Date.now();
|
||||
const timeUsed = Math.round(((endTime - startTime) / 1000) * 100) / 100;
|
||||
|
||||
console.log(
|
||||
`完整播放列表加载完成，共加载${displayedSongs.value.length}首歌曲，耗时${timeUsed}秒`
|
||||
);
|
||||
console.log(`歌单应有${allIds.length}首歌，实际加载${displayedSongs.value.length}首`);
|
||||
|
||||
// 检查加载的歌曲数量是否与预期相符
|
||||
if (displayedSongs.value.length !== allIds.length) {
|
||||
console.warn(
|
||||
`警告: 加载的歌曲数量(${displayedSongs.value.length})与歌单应有数量(${allIds.length})不符`
|
||||
);
|
||||
|
||||
// 如果数量不符，可能是API未返回所有歌曲，打印缺失的歌曲ID
|
||||
if (displayedSongs.value.length < allIds.length) {
|
||||
const loadedIds = new Set(displayedSongs.value.map((song) => song.id));
|
||||
const missingIds = allIds.filter((id) => !loadedIds.has(id));
|
||||
console.warn(`缺失的歌曲ID: ${missingIds.join(', ')}`);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('加载完整播放列表失败:', error);
|
||||
} finally {
|
||||
@@ -422,31 +235,16 @@ const loadFullPlaylist = async () => {
|
||||
|
||||
// 处理播放
|
||||
const handlePlay = async () => {
|
||||
// 当搜索状态下播放时，只播放过滤后的歌曲
|
||||
if (searchKeyword.value) {
|
||||
playerStore.setPlayList(filteredSongs.value.map(formatSong));
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果完整播放列表已加载完成
|
||||
if (isFullPlaylistLoaded.value && completePlaylist.value.length > 0) {
|
||||
playerStore.setPlayList(completePlaylist.value.map(formatSong));
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果完整播放列表未加载完成，先使用当前已加载的歌曲开始播放
|
||||
// 先使用当前已加载的歌曲开始播放
|
||||
playerStore.setPlayList(displayedSongs.value.map(formatSong));
|
||||
|
||||
// 如果完整播放列表正在加载中，不需要重新触发加载
|
||||
if (isPlaylistLoading.value) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 在后台继续加载完整播放列表（如果未加载完成）
|
||||
if (!isFullPlaylistLoaded.value) {
|
||||
console.log('播放时继续在后台加载完整列表');
|
||||
loadFullPlaylist();
|
||||
}
|
||||
// 在后台加载完整播放列表
|
||||
loadFullPlaylist().then(() => {
|
||||
// 加载完成后，更新播放列表为完整列表
|
||||
if (completePlaylist.value.length > 0) {
|
||||
playerStore.setPlayList(completePlaylist.value.map(formatSong));
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const close = () => {
|
||||
@@ -455,27 +253,19 @@ const close = () => {
|
||||
|
||||
// 加载更多歌曲
|
||||
const loadMoreSongs = async () => {
|
||||
if (isFullPlaylistLoaded.value) {
|
||||
hasMore.value = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (searchKeyword.value) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查是否正在加载或已经加载完成
|
||||
if (isLoadingMore.value || displayedSongs.value.length >= total.value) {
|
||||
hasMore.value = false;
|
||||
return;
|
||||
}
|
||||
|
||||
isLoadingMore.value = true;
|
||||
|
||||
try {
|
||||
const start = displayedSongs.value.length;
|
||||
const end = Math.min(start + pageSize, total.value);
|
||||
|
||||
if (props.listInfo?.trackIds) {
|
||||
// 获取这一批次需要加载的所有ID
|
||||
const trackIdsToLoad = props.listInfo.trackIds
|
||||
.slice(start, end)
|
||||
.map((item) => item.id)
|
||||
@@ -485,6 +275,7 @@ const loadMoreSongs = async () => {
|
||||
await loadSongs(trackIdsToLoad, true, false);
|
||||
}
|
||||
} else if (start < props.songList.length) {
|
||||
// 直接使用 songList 分页
|
||||
const newSongs = props.songList.slice(start, end);
|
||||
newSongs.forEach((song) => {
|
||||
if (!loadedIds.value.has(song.id)) {
|
||||
@@ -494,6 +285,7 @@ const loadMoreSongs = async () => {
|
||||
});
|
||||
}
|
||||
|
||||
// 更新是否还有更多数据的状态
|
||||
hasMore.value = displayedSongs.value.length < total.value;
|
||||
} catch (error) {
|
||||
console.error('加载更多歌曲失败:', error);
|
||||
@@ -503,23 +295,28 @@ const loadMoreSongs = async () => {
|
||||
}
|
||||
};
|
||||
|
||||
// 处理虚拟列表滚动事件
|
||||
const handleVirtualScroll = (e: any) => {
|
||||
if (!e || !e.target) return;
|
||||
// 修改滚动处理函数
|
||||
const handleScroll = (e: Event) => {
|
||||
const target = e.target as HTMLElement;
|
||||
if (!target) return;
|
||||
|
||||
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
||||
const { scrollTop, scrollHeight, clientHeight } = target;
|
||||
const threshold = 200;
|
||||
|
||||
if (
|
||||
scrollHeight - scrollTop - clientHeight < threshold &&
|
||||
!isLoadingMore.value &&
|
||||
hasMore.value &&
|
||||
!searchKeyword.value // 搜索状态下不触发加载更多
|
||||
hasMore.value
|
||||
) {
|
||||
loadMoreSongs();
|
||||
}
|
||||
};
|
||||
|
||||
const getItemAnimationDelay = (index: number) => {
|
||||
const currentPageIndex = index % pageSize;
|
||||
return setAnimationDelay(currentPageIndex, 20);
|
||||
};
|
||||
|
||||
// 重置列表状态
|
||||
const resetListState = () => {
|
||||
page.value = 0;
|
||||
@@ -528,8 +325,6 @@ const resetListState = () => {
|
||||
completePlaylist.value = [];
|
||||
hasMore.value = true;
|
||||
loadingList.value = false;
|
||||
searchKeyword.value = ''; // 重置搜索关键词
|
||||
isFullPlaylistLoaded.value = false; // 重置完整播放列表状态
|
||||
};
|
||||
|
||||
// 初始化歌曲列表
|
||||
@@ -544,15 +339,6 @@ const initSongList = (songs: any[]) => {
|
||||
hasMore.value = displayedSongs.value.length < total.value;
|
||||
};
|
||||
|
||||
watch(
|
||||
() => props.listInfo,
|
||||
(newListInfo) => {
|
||||
if (newListInfo?.trackIds) {
|
||||
loadFullPlaylist();
|
||||
}
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
// 修改 songList 监听器
|
||||
watch(
|
||||
() => props.songList,
|
||||
@@ -573,14 +359,6 @@ watch(
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
// 监听搜索关键词变化
|
||||
watch(searchKeyword, () => {
|
||||
// 当搜索关键词为空时，考虑加载更多歌曲
|
||||
if (!searchKeyword.value && hasMore.value && displayedSongs.value.length < total.value) {
|
||||
loadMoreSongs();
|
||||
}
|
||||
});
|
||||
|
||||
// 组件卸载时清理状态
|
||||
onUnmounted(() => {
|
||||
isPlaylistLoading.value = false;
|
||||
@@ -644,34 +422,12 @@ onUnmounted(() => {
|
||||
&-content {
|
||||
@apply min-h-[calc(80vh-60px)];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.search-container {
|
||||
@apply max-w-md;
|
||||
|
||||
:deep(.n-input) {
|
||||
@apply bg-light-200 dark:bg-dark-200;
|
||||
}
|
||||
|
||||
.icon {
|
||||
@apply text-gray-500 dark:text-gray-400;
|
||||
}
|
||||
}
|
||||
|
||||
.no-result {
|
||||
@apply text-center py-8 text-gray-500 dark:text-gray-400;
|
||||
}
|
||||
|
||||
/* 虚拟列表样式 */
|
||||
.song-virtual-list {
|
||||
:deep(.n-virtual-list__scroll) {
|
||||
scrollbar-width: thin;
|
||||
&::-webkit-scrollbar {
|
||||
width: 4px;
|
||||
}
|
||||
&::-webkit-scrollbar-thumb {
|
||||
@apply bg-gray-400 dark:bg-gray-600 rounded;
|
||||
:deep(.n-virtual-list__scroll) {
|
||||
scrollbar-width: none;
|
||||
&::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -696,18 +452,6 @@ onUnmounted(() => {
|
||||
@apply flex-1 ml-4;
|
||||
}
|
||||
}
|
||||
|
||||
.music-title {
|
||||
@apply text-base;
|
||||
}
|
||||
|
||||
.search-container {
|
||||
@apply max-w-[50%];
|
||||
}
|
||||
|
||||
.song-virtual-list {
|
||||
height: calc(80vh - 120px) !important;
|
||||
}
|
||||
}
|
||||
|
||||
.loading-more {
|
||||
|
||||
@@ -90,25 +90,10 @@
|
||||
<!-- 已下载列表 -->
|
||||
<n-tab-pane name="downloaded" :tab="t('download.tabs.downloaded')" class="h-full">
|
||||
<div class="downloaded-list">
|
||||
<div v-if="isLoadingDownloaded" class="loading-tip">
|
||||
<n-spin size="medium" />
|
||||
<span class="loading-text">{{ t('download.loading') }}</span>
|
||||
</div>
|
||||
<div v-else-if="downloadedList.length === 0" class="empty-tip">
|
||||
<div v-if="downloadedList.length === 0" class="empty-tip">
|
||||
<n-empty :description="t('download.empty.noDownloaded')" />
|
||||
</div>
|
||||
<div v-else class="downloaded-content">
|
||||
<div class="downloaded-header">
|
||||
<div class="header-title">
|
||||
{{ t('download.count', { count: downloadedList.length }) }}
|
||||
</div>
|
||||
<n-button secondary size="small" @click="showClearConfirm = true">
|
||||
<template #icon>
|
||||
<i class="iconfont ri-delete-bin-line mr-1"></i>
|
||||
</template>
|
||||
{{ t('download.clearAll') }}
|
||||
</n-button>
|
||||
</div>
|
||||
<div class="downloaded-items">
|
||||
<div v-for="item in downList" :key="item.path" class="downloaded-item">
|
||||
<div class="downloaded-item-content">
|
||||
@@ -187,38 +172,12 @@
|
||||
}}</n-button>
|
||||
</template>
|
||||
</n-modal>
|
||||
|
||||
<!-- 清空确认对话框 -->
|
||||
<n-modal
|
||||
v-model:show="showClearConfirm"
|
||||
preset="dialog"
|
||||
type="warning"
|
||||
:title="t('download.clear.title')"
|
||||
>
|
||||
<template #header>
|
||||
<div class="flex items-center">
|
||||
<i class="iconfont ri-delete-bin-line mr-2 text-xl"></i>
|
||||
<span>{{ t('download.clear.title') }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<div class="delete-confirm-content">
|
||||
{{ t('download.clear.message') }}
|
||||
</div>
|
||||
<template #action>
|
||||
<n-button size="small" @click="showClearConfirm = false">{{
|
||||
t('download.clear.cancel')
|
||||
}}</n-button>
|
||||
<n-button size="small" type="warning" @click="clearDownloadRecords">{{
|
||||
t('download.clear.confirm')
|
||||
}}</n-button>
|
||||
</template>
|
||||
</n-modal>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { ProgressStatus } from 'naive-ui';
|
||||
import { useMessage } from 'naive-ui';
|
||||
import { computed, onMounted, ref, watch } from 'vue';
|
||||
import { computed, onMounted, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import { getMusicDetail } from '@/api/music';
|
||||
@@ -266,7 +225,9 @@ const downloadedList = ref<DownloadedItem[]>(
|
||||
JSON.parse(localStorage.getItem('downloadedList') || '[]')
|
||||
);
|
||||
|
||||
const downList = computed(() => downloadedList.value);
|
||||
const downList = computed(() => {
|
||||
return (downloadedList.value as DownloadedItem[]).reverse();
|
||||
});
|
||||
|
||||
// 计算下载中的任务数量
|
||||
const downloadingCount = computed(() => {
|
||||
@@ -352,50 +313,36 @@ const handleDelete = (item: DownloadedItem) => {
|
||||
|
||||
// 确认删除
|
||||
const confirmDelete = async () => {
|
||||
const item = itemToDelete.value;
|
||||
if (!item) return;
|
||||
if (!itemToDelete.value) return;
|
||||
|
||||
try {
|
||||
const success = await window.electron.ipcRenderer.invoke(
|
||||
'delete-downloaded-music',
|
||||
item.path
|
||||
itemToDelete.value.path
|
||||
);
|
||||
|
||||
if (success) {
|
||||
const newList = downloadedList.value.filter(i => i.id !== item.id);
|
||||
downloadedList.value = newList;
|
||||
localStorage.setItem('downloadedList', JSON.stringify(newList));
|
||||
localStorage.setItem(
|
||||
'downloadedList',
|
||||
JSON.stringify(
|
||||
downloadedList.value.filter(
|
||||
(item) => item.id !== (itemToDelete.value as DownloadedItem).id
|
||||
)
|
||||
)
|
||||
);
|
||||
await refreshDownloadedList();
|
||||
message.success(t('download.delete.success'));
|
||||
} else {
|
||||
message.warning(t('download.delete.fileNotFound'));
|
||||
message.error(t('download.delete.failed'));
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to delete music:', error);
|
||||
message.warning(t('download.delete.recordRemoved'));
|
||||
message.error(t('download.delete.failed'));
|
||||
} finally {
|
||||
showDeleteConfirm.value = false;
|
||||
itemToDelete.value = null;
|
||||
}
|
||||
};
|
||||
|
||||
// 清空下载记录相关
|
||||
const showClearConfirm = ref(false);
|
||||
|
||||
// 清空下载记录
|
||||
const clearDownloadRecords = async () => {
|
||||
try {
|
||||
downloadedList.value = [];
|
||||
localStorage.setItem('downloadedList', '[]');
|
||||
await window.electron.ipcRenderer.invoke('clear-downloaded-music');
|
||||
message.success(t('download.clear.success'));
|
||||
} catch (error) {
|
||||
console.error('Failed to clear download records:', error);
|
||||
message.error(t('download.clear.failed'));
|
||||
} finally {
|
||||
showClearConfirm.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
// 播放音乐
|
||||
// const handlePlay = async (musicInfo: SongResult) => {
|
||||
// await playerStore.setPlay(musicInfo);
|
||||
@@ -403,64 +350,65 @@ const clearDownloadRecords = async () => {
|
||||
// playerStore.setIsPlay(true);
|
||||
// };
|
||||
|
||||
// 添加加载状态
|
||||
const isLoadingDownloaded = ref(false);
|
||||
|
||||
// 获取已下载音乐列表
|
||||
const refreshDownloadedList = async () => {
|
||||
if (isLoadingDownloaded.value) return; // 防止重复加载
|
||||
|
||||
try {
|
||||
isLoadingDownloaded.value = true;
|
||||
let saveList: any = [];
|
||||
const list = await window.electron.ipcRenderer.invoke('get-downloaded-music');
|
||||
|
||||
if (!Array.isArray(list) || list.length === 0) {
|
||||
downloadedList.value = [];
|
||||
localStorage.setItem('downloadedList', '[]');
|
||||
saveList = [];
|
||||
return;
|
||||
}
|
||||
|
||||
const songIds = list.filter(item => item.id).map(item => item.id);
|
||||
if (songIds.length === 0) {
|
||||
downloadedList.value = list;
|
||||
localStorage.setItem('downloadedList', JSON.stringify(list));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const detailRes = await getMusicDetail(songIds);
|
||||
const songDetails = detailRes.data.songs.reduce((acc, song) => {
|
||||
acc[song.id] = song;
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
const updatedList = list.map(item => ({
|
||||
...item,
|
||||
picUrl: songDetails[item.id]?.al?.picUrl || item.picUrl || '/images/default_cover.png',
|
||||
ar: songDetails[item.id]?.ar || item.ar || [{ name: t('download.localMusic') }]
|
||||
}));
|
||||
|
||||
downloadedList.value = updatedList;
|
||||
localStorage.setItem('downloadedList', JSON.stringify(updatedList));
|
||||
} catch (error) {
|
||||
console.error('Failed to get music details:', error);
|
||||
downloadedList.value = list;
|
||||
localStorage.setItem('downloadedList', JSON.stringify(list));
|
||||
const songIds = list.filter((item) => item.id).map((item) => item.id);
|
||||
|
||||
// 如果有歌曲ID，获取详细信息
|
||||
if (songIds.length > 0) {
|
||||
try {
|
||||
const detailRes = await getMusicDetail(songIds);
|
||||
const songDetails = detailRes.data.songs.reduce((acc, song) => {
|
||||
acc[song.id] = song;
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
saveList = list.map((item) => {
|
||||
const songDetail = songDetails[item.id];
|
||||
return {
|
||||
...item,
|
||||
picUrl: songDetail?.al?.picUrl || item.picUrl || '/images/default_cover.png',
|
||||
ar: songDetail?.ar || item.ar || [{ name: t('download.localMusic') }]
|
||||
};
|
||||
});
|
||||
} catch (detailError) {
|
||||
console.error('Failed to get music details:', detailError);
|
||||
saveList = list;
|
||||
}
|
||||
} else {
|
||||
saveList = list;
|
||||
}
|
||||
setLocalDownloadedList(saveList);
|
||||
} catch (error) {
|
||||
console.error('Failed to get downloaded music list:', error);
|
||||
downloadedList.value = [];
|
||||
localStorage.setItem('downloadedList', '[]');
|
||||
} finally {
|
||||
isLoadingDownloaded.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const setLocalDownloadedList = (list: DownloadedItem[]) => {
|
||||
const localList = localStorage.getItem('downloadedList');
|
||||
// 合并 去重
|
||||
const saveList = [...(localList ? JSON.parse(localList) : []), ...list];
|
||||
const uniqueList = saveList.filter(
|
||||
(item, index, self) => index === self.findIndex((t) => t.id === item.id)
|
||||
);
|
||||
localStorage.setItem('downloadedList', JSON.stringify(uniqueList));
|
||||
downloadedList.value = uniqueList;
|
||||
};
|
||||
|
||||
// 监听抽屉显示状态
|
||||
watch(
|
||||
() => showDrawer.value,
|
||||
(newVal) => {
|
||||
if (newVal && !isLoadingDownloaded.value) {
|
||||
if (newVal) {
|
||||
refreshDownloadedList();
|
||||
}
|
||||
}
|
||||
@@ -473,12 +421,6 @@ onMounted(() => {
|
||||
// 监听下载进度
|
||||
window.electron.ipcRenderer.on('music-download-progress', (_, data) => {
|
||||
const existingItem = downloadList.value.find((item) => item.filename === data.filename);
|
||||
|
||||
// 如果进度为100%，将状态设置为已完成
|
||||
if (data.progress === 100) {
|
||||
data.status = 'completed';
|
||||
}
|
||||
|
||||
if (existingItem) {
|
||||
Object.assign(existingItem, {
|
||||
...data,
|
||||
@@ -498,14 +440,15 @@ onMounted(() => {
|
||||
});
|
||||
|
||||
// 监听下载完成
|
||||
window.electron.ipcRenderer.on('music-download-complete', async (_, data) => {
|
||||
window.electron.ipcRenderer.on('music-download-complete', (_, data) => {
|
||||
if (data.success) {
|
||||
downloadList.value = downloadList.value.filter(item => item.filename !== data.filename);
|
||||
// 延迟刷新已下载列表，避免文件系统未完全写入
|
||||
setTimeout(() => refreshDownloadedList(), 500);
|
||||
// 从下载列表中移除
|
||||
downloadList.value = downloadList.value.filter((item) => item.filename !== data.filename);
|
||||
// 刷新已下载列表
|
||||
refreshDownloadedList();
|
||||
message.success(t('download.message.downloadComplete', { filename: data.filename }));
|
||||
} else {
|
||||
const existingItem = downloadList.value.find(item => item.filename === data.filename);
|
||||
const existingItem = downloadList.value.find((item) => item.filename === data.filename);
|
||||
if (existingItem) {
|
||||
Object.assign(existingItem, {
|
||||
status: 'error',
|
||||
@@ -513,10 +456,12 @@ onMounted(() => {
|
||||
progress: 0
|
||||
});
|
||||
setTimeout(() => {
|
||||
downloadList.value = downloadList.value.filter(item => item.filename !== data.filename);
|
||||
downloadList.value = downloadList.value.filter((item) => item.filename !== data.filename);
|
||||
}, 3000);
|
||||
}
|
||||
message.error(t('download.message.downloadFailed', { filename: data.filename, error: data.error }));
|
||||
message.error(
|
||||
t('download.message.downloadFailed', { filename: data.filename, error: data.error })
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -578,18 +523,9 @@ const handleDrawerClose = () => {
|
||||
@apply flex-1 overflow-hidden pb-40;
|
||||
}
|
||||
|
||||
.downloaded-header {
|
||||
@apply flex items-center justify-between p-4 bg-light-100 dark:bg-dark-200 sticky top-0 z-10;
|
||||
@apply border-b border-gray-100 dark:border-gray-800;
|
||||
|
||||
.header-title {
|
||||
@apply text-sm font-medium text-gray-600 dark:text-gray-400;
|
||||
}
|
||||
}
|
||||
|
||||
.download-items,
|
||||
.downloaded-items {
|
||||
@apply space-y-3 p-4;
|
||||
@apply space-y-3;
|
||||
}
|
||||
|
||||
.total-progress {
|
||||
|
||||
@@ -293,17 +293,14 @@ const downloadMusic = async () => {
|
||||
// 构建文件名
|
||||
const artistNames = (props.item.ar || props.item.song?.artists)?.map((a) => a.name).join(',');
|
||||
const filename = `${props.item.name} - ${artistNames}`;
|
||||
console.log('props.item', props.item);
|
||||
|
||||
const songData = cloneDeep(props.item);
|
||||
songData.ar = songData.ar || songData.song?.artists;
|
||||
// 发送下载请求
|
||||
window.electron.ipcRenderer.send('download-music', {
|
||||
url: data.url,
|
||||
type: data.type,
|
||||
filename,
|
||||
songInfo: {
|
||||
...songData,
|
||||
...cloneDeep(props.item),
|
||||
downloadTime: Date.now()
|
||||
}
|
||||
});
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
v-model:show="showMusic"
|
||||
:name="albumName"
|
||||
:song-list="songList"
|
||||
:cover="true"
|
||||
:cover="false"
|
||||
:loading="loadingList"
|
||||
:list-info="albumInfo"
|
||||
/>
|
||||
@@ -62,19 +62,17 @@ const handleClick = async (item: any) => {
|
||||
loadingList.value = true;
|
||||
showMusic.value = true;
|
||||
const res = await getAlbum(item.id);
|
||||
const { songs, album } = res.data;
|
||||
songList.value = songs.map((song: any) => {
|
||||
song.al.picUrl = song.al.picUrl || album.picUrl;
|
||||
song.picUrl = song.al.picUrl || album.picUrl || song.picUrl;
|
||||
songList.value = res.data.songs.map((song: any) => {
|
||||
song.al.picUrl = song.al.picUrl || item.picUrl;
|
||||
return song;
|
||||
});
|
||||
albumInfo.value = {
|
||||
...album,
|
||||
...res.data.album,
|
||||
creator: {
|
||||
avatarUrl: album.artist.img1v1Url,
|
||||
nickname: `${album.artist.name} - ${album.company}`
|
||||
avatarUrl: res.data.album.artist.img1v1Url,
|
||||
nickname: `${res.data.album.artist.name} - ${res.data.album.company}`
|
||||
},
|
||||
description: album.description
|
||||
description: res.data.album.description
|
||||
};
|
||||
loadingList.value = false;
|
||||
};
|
||||
|
||||
@@ -61,27 +61,19 @@
|
||||
>
|
||||
<div class="user-play-item-img">
|
||||
<img :src="getImgUrl(item.coverImgUrl, '200y200')" alt="" />
|
||||
<div class="user-play-item-overlay">
|
||||
<div class="user-play-item-play-btn">
|
||||
<i class="iconfont icon-playfill text-3xl text-white"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="user-play-item-title">
|
||||
<div class="user-play-item-title-name">{{ item.name }}</div>
|
||||
|
||||
<div class="user-play-item-list">
|
||||
<div
|
||||
v-for="song in item.tracks"
|
||||
:key="song.id"
|
||||
class="user-play-item-list-name"
|
||||
>
|
||||
{{ song.name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="user-play-item-count">
|
||||
<div class="user-play-item-count-tag">
|
||||
{{ t('common.songCount', { count: item.trackCount }) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="user-play-item-direct-play" @click.stop="handlePlayPlaylist(item.id)">
|
||||
<i class="iconfont icon-playfill text-xl text-white"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -150,15 +142,13 @@ import { useI18n } from 'vue-i18n';
|
||||
|
||||
import { getDayRecommend, getHotSinger } from '@/api/home';
|
||||
import { getListDetail } from '@/api/list';
|
||||
import { getMusicDetail } from '@/api/music';
|
||||
import { getUserPlaylist } from '@/api/user';
|
||||
import MusicList from '@/components/MusicList.vue';
|
||||
import { useArtist } from '@/hooks/useArtist';
|
||||
import { usePlayerStore, useUserStore } from '@/store';
|
||||
import { useUserStore } from '@/store';
|
||||
import { IDayRecommend } from '@/type/day_recommend';
|
||||
import { Playlist } from '@/type/list';
|
||||
import type { IListDetail } from '@/type/listDetail';
|
||||
import { SongResult } from '@/type/music';
|
||||
import type { IHotSinger } from '@/type/singer';
|
||||
import {
|
||||
getImgUrl,
|
||||
@@ -169,7 +159,6 @@ import {
|
||||
} from '@/utils';
|
||||
|
||||
const userStore = useUserStore();
|
||||
const playerStore = usePlayerStore();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -304,93 +293,6 @@ const toPlaylist = async (id: number) => {
|
||||
}
|
||||
};
|
||||
|
||||
// 添加直接播放歌单的方法
|
||||
const handlePlayPlaylist = async (id: number) => {
|
||||
try {
|
||||
// 先显示加载状态
|
||||
playlistLoading.value = true;
|
||||
|
||||
// 获取歌单详情
|
||||
const { data } = await getListDetail(id);
|
||||
|
||||
if (data?.playlist) {
|
||||
// 先使用已有的tracks开始播放（这些是已经在歌单详情中返回的前几首歌曲）
|
||||
if (data.playlist.tracks?.length > 0) {
|
||||
// 格式化歌曲列表
|
||||
const initialSongs = data.playlist.tracks.map((track) => ({
|
||||
...track,
|
||||
source: 'netease',
|
||||
picUrl: track.al.picUrl
|
||||
})) as unknown as SongResult[];
|
||||
|
||||
// 设置播放列表
|
||||
playerStore.setPlayList(initialSongs);
|
||||
|
||||
// 开始播放第一首
|
||||
await playerStore.setPlay(initialSongs[0]);
|
||||
|
||||
// 如果有trackIds，异步加载完整歌单
|
||||
if (data.playlist.trackIds?.length > initialSongs.length) {
|
||||
loadFullPlaylist(data.playlist.trackIds, initialSongs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 关闭加载状态
|
||||
playlistLoading.value = false;
|
||||
} catch (error) {
|
||||
console.error('播放歌单失败:', error);
|
||||
playlistLoading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
// 异步加载完整歌单
|
||||
const loadFullPlaylist = async (trackIds: { id: number }[], initialSongs: SongResult[]) => {
|
||||
try {
|
||||
// 获取已加载歌曲的ID集合，避免重复加载
|
||||
const loadedIds = new Set(initialSongs.map((song) => song.id));
|
||||
|
||||
// 筛选出未加载的ID
|
||||
const unloadedTrackIds = trackIds
|
||||
.filter((item) => !loadedIds.has(item.id as number))
|
||||
.map((item) => item.id);
|
||||
|
||||
if (unloadedTrackIds.length === 0) return;
|
||||
|
||||
// 分批获取歌曲详情，每批最多获取500首
|
||||
const batchSize = 500;
|
||||
const allSongs = [...initialSongs];
|
||||
|
||||
for (let i = 0; i < unloadedTrackIds.length; i += batchSize) {
|
||||
const batchIds = unloadedTrackIds.slice(i, i + batchSize);
|
||||
if (batchIds.length > 0) {
|
||||
try {
|
||||
const { data: songsData } = await getMusicDetail(batchIds);
|
||||
if (songsData?.songs?.length) {
|
||||
const formattedSongs = songsData.songs.map((item) => ({
|
||||
...item,
|
||||
source: 'netease',
|
||||
picUrl: item.al.picUrl
|
||||
})) as unknown as SongResult[];
|
||||
|
||||
allSongs.push(...formattedSongs);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取批次歌曲详情失败:', error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 更新完整的播放列表但保持当前播放的歌曲不变
|
||||
if (allSongs.length > initialSongs.length) {
|
||||
console.log('更新播放列表，总歌曲数:', allSongs.length);
|
||||
playerStore.setPlayList(allSongs);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('加载完整歌单失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// 监听登录状态
|
||||
watchEffect(() => {
|
||||
if (userStore.user) {
|
||||
@@ -514,12 +416,18 @@ const getPlaylistGridClass = (length: number) => {
|
||||
&:hover {
|
||||
transform: translateY(-5px);
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.15);
|
||||
.user-play-item-overlay {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
img {
|
||||
@apply absolute inset-0 w-full h-full object-cover;
|
||||
}
|
||||
}
|
||||
&-overlay {
|
||||
@apply absolute inset-0 bg-black bg-opacity-30 flex items-center justify-center opacity-0 transition-opacity duration-300;
|
||||
}
|
||||
&-title {
|
||||
@apply absolute top-0 left-0 right-0 p-2 bg-gradient-to-b from-black/70 to-transparent z-10;
|
||||
&-name {
|
||||
@@ -527,17 +435,11 @@ const getPlaylistGridClass = (length: number) => {
|
||||
}
|
||||
}
|
||||
&-count {
|
||||
@apply absolute bottom-2 left-2 z-10;
|
||||
@apply absolute bottom-2 right-2 z-10;
|
||||
&-tag {
|
||||
@apply px-2 py-0.5 text-xs text-white bg-black/50 backdrop-blur-sm rounded-full;
|
||||
}
|
||||
}
|
||||
&-direct-play {
|
||||
@apply absolute bottom-2 right-2 z-20 w-10 h-10 rounded-full bg-green-600 hover:bg-green-700 flex items-center justify-center cursor-pointer transform scale-90 hover:scale-100 transition-all;
|
||||
&:hover {
|
||||
@apply shadow-lg;
|
||||
}
|
||||
}
|
||||
&-play-btn {
|
||||
@apply flex items-center justify-center;
|
||||
transform: scale(0.8);
|
||||
|
||||
@@ -2,119 +2,94 @@
|
||||
<div class="settings-panel transparent-popover">
|
||||
<div class="settings-title">{{ t('settings.lyricSettings.title') }}</div>
|
||||
<div class="settings-content">
|
||||
<n-tabs type="line" animated size="small">
|
||||
<!-- 显示设置 -->
|
||||
<n-tab-pane :name="'display'" :tab="t('settings.lyricSettings.tabs.display')">
|
||||
<div class="tab-content">
|
||||
<div class="settings-grid">
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.pureMode') }}</span>
|
||||
<n-switch v-model:value="config.pureModeEnabled" />
|
||||
</div>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hideCover') }}</span>
|
||||
<n-switch v-model:value="config.hideCover" />
|
||||
</div>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.centerDisplay') }}</span>
|
||||
<n-switch v-model:value="config.centerLyrics" />
|
||||
</div>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.showTranslation') }}</span>
|
||||
<n-switch v-model:value="config.showTranslation" />
|
||||
</div>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hideLyrics') }}</span>
|
||||
<n-switch v-model:value="config.hideLyrics" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</n-tab-pane>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.pureMode') }}</span>
|
||||
<n-switch v-model:value="config.pureModeEnabled" />
|
||||
</div>
|
||||
|
||||
<!-- 界面设置 -->
|
||||
<n-tab-pane :name="'interface'" :tab="t('settings.lyricSettings.tabs.interface')">
|
||||
<div class="tab-content">
|
||||
<div class="settings-grid">
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hidePlayBar') }}</span>
|
||||
<n-switch v-model:value="config.hidePlayBar" />
|
||||
</div>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hideMiniPlayBar') }}</span>
|
||||
<n-switch v-model:value="config.hideMiniPlayBar" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="theme-section">
|
||||
<div class="section-title">{{ t('settings.lyricSettings.backgroundTheme') }}</div>
|
||||
<n-radio-group v-model:value="config.theme" name="theme" class="theme-radio-group">
|
||||
<n-space>
|
||||
<n-radio value="default">{{
|
||||
t('settings.lyricSettings.themeOptions.default')
|
||||
}}</n-radio>
|
||||
<n-radio value="light">{{
|
||||
t('settings.lyricSettings.themeOptions.light')
|
||||
}}</n-radio>
|
||||
<n-radio value="dark">{{
|
||||
t('settings.lyricSettings.themeOptions.dark')
|
||||
}}</n-radio>
|
||||
</n-space>
|
||||
</n-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
</n-tab-pane>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hideCover') }}</span>
|
||||
<n-switch v-model:value="config.hideCover" />
|
||||
</div>
|
||||
|
||||
<!-- 文字设置 -->
|
||||
<n-tab-pane :name="'typography'" :tab="t('settings.lyricSettings.tabs.typography')">
|
||||
<div class="tab-content">
|
||||
<div class="slider-section">
|
||||
<div class="slider-item">
|
||||
<span>{{ t('settings.lyricSettings.fontSize') }}</span>
|
||||
<n-slider
|
||||
v-model:value="config.fontSize"
|
||||
:step="1"
|
||||
:min="12"
|
||||
:max="32"
|
||||
:marks="{
|
||||
12: t('settings.lyricSettings.fontSizeMarks.small'),
|
||||
22: t('settings.lyricSettings.fontSizeMarks.medium'),
|
||||
32: t('settings.lyricSettings.fontSizeMarks.large')
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.centerDisplay') }}</span>
|
||||
<n-switch v-model:value="config.centerLyrics" />
|
||||
</div>
|
||||
|
||||
<div class="slider-item">
|
||||
<span>{{ t('settings.lyricSettings.letterSpacing') }}</span>
|
||||
<n-slider
|
||||
v-model:value="config.letterSpacing"
|
||||
:step="0.2"
|
||||
:min="-2"
|
||||
:max="10"
|
||||
:marks="{
|
||||
'-2': t('settings.lyricSettings.letterSpacingMarks.compact'),
|
||||
0: t('settings.lyricSettings.letterSpacingMarks.default'),
|
||||
10: t('settings.lyricSettings.letterSpacingMarks.loose')
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.showTranslation') }}</span>
|
||||
<n-switch v-model:value="config.showTranslation" />
|
||||
</div>
|
||||
|
||||
<div class="slider-item">
|
||||
<span>{{ t('settings.lyricSettings.lineHeight') }}</span>
|
||||
<n-slider
|
||||
v-model:value="config.lineHeight"
|
||||
:step="0.1"
|
||||
:min="1"
|
||||
:max="3"
|
||||
:marks="{
|
||||
1: t('settings.lyricSettings.lineHeightMarks.compact'),
|
||||
1.5: t('settings.lyricSettings.lineHeightMarks.default'),
|
||||
3: t('settings.lyricSettings.lineHeightMarks.loose')
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</n-tab-pane>
|
||||
</n-tabs>
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hidePlayBar') }}</span>
|
||||
<n-switch v-model:value="config.hidePlayBar" />
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hideMiniPlayBar') }}</span>
|
||||
<n-switch v-model:value="config.hideMiniPlayBar" />
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.hideLyrics') }}</span>
|
||||
<n-switch v-model:value="config.hideLyrics" />
|
||||
</div>
|
||||
|
||||
<div class="settings-slider">
|
||||
<span>{{ t('settings.lyricSettings.fontSize') }}</span>
|
||||
<n-slider
|
||||
v-model:value="config.fontSize"
|
||||
:step="1"
|
||||
:min="12"
|
||||
:max="32"
|
||||
:marks="{
|
||||
12: t('settings.lyricSettings.fontSizeMarks.small'),
|
||||
22: t('settings.lyricSettings.fontSizeMarks.medium'),
|
||||
32: t('settings.lyricSettings.fontSizeMarks.large')
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="settings-slider">
|
||||
<span>{{ t('settings.lyricSettings.letterSpacing') }}</span>
|
||||
<n-slider
|
||||
v-model:value="config.letterSpacing"
|
||||
:step="0.2"
|
||||
:min="-2"
|
||||
:max="10"
|
||||
:marks="{
|
||||
'-2': t('settings.lyricSettings.letterSpacingMarks.compact'),
|
||||
0: t('settings.lyricSettings.letterSpacingMarks.default'),
|
||||
10: t('settings.lyricSettings.letterSpacingMarks.loose')
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="settings-slider">
|
||||
<span>{{ t('settings.lyricSettings.lineHeight') }}</span>
|
||||
<n-slider
|
||||
v-model:value="config.lineHeight"
|
||||
:step="0.1"
|
||||
:min="1"
|
||||
:max="3"
|
||||
:marks="{
|
||||
1: t('settings.lyricSettings.lineHeightMarks.compact'),
|
||||
1.5: t('settings.lyricSettings.lineHeightMarks.default'),
|
||||
3: t('settings.lyricSettings.lineHeightMarks.loose')
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>{{ t('settings.lyricSettings.backgroundTheme') }}</span>
|
||||
<n-radio-group v-model:value="config.theme" name="theme">
|
||||
<n-radio value="default">{{ t('settings.lyricSettings.themeOptions.default') }}</n-radio>
|
||||
<n-radio value="light">{{ t('settings.lyricSettings.themeOptions.light') }}</n-radio>
|
||||
<n-radio value="dark">{{ t('settings.lyricSettings.themeOptions.dark') }}</n-radio>
|
||||
</n-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -123,12 +98,39 @@
|
||||
import { onMounted, ref, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import { DEFAULT_LYRIC_CONFIG, LyricConfig } from '@/types/lyric';
|
||||
|
||||
const { t } = useI18n();
|
||||
const config = ref<LyricConfig>({ ...DEFAULT_LYRIC_CONFIG });
|
||||
|
||||
interface LyricConfig {
|
||||
hideCover: boolean;
|
||||
centerLyrics: boolean;
|
||||
fontSize: number;
|
||||
letterSpacing: number;
|
||||
lineHeight: number;
|
||||
showTranslation: boolean;
|
||||
theme: 'default' | 'light' | 'dark';
|
||||
hidePlayBar: boolean;
|
||||
hideMiniPlayBar: boolean;
|
||||
pureModeEnabled: boolean;
|
||||
hideLyrics: boolean;
|
||||
}
|
||||
|
||||
const config = ref<LyricConfig>({
|
||||
hideCover: false,
|
||||
centerLyrics: false,
|
||||
fontSize: 22,
|
||||
letterSpacing: 0,
|
||||
lineHeight: 2,
|
||||
showTranslation: true,
|
||||
theme: 'default',
|
||||
hidePlayBar: false,
|
||||
hideMiniPlayBar: false,
|
||||
pureModeEnabled: false,
|
||||
hideLyrics: false
|
||||
});
|
||||
|
||||
const emit = defineEmits(['themeChange']);
|
||||
|
||||
// 监听配置变化并保存到本地存储
|
||||
watch(
|
||||
() => config.value,
|
||||
(newConfig) => {
|
||||
@@ -137,6 +139,7 @@ watch(
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
// 监听主题变化
|
||||
watch(
|
||||
() => config.value.theme,
|
||||
(newTheme) => {
|
||||
@@ -144,12 +147,14 @@ watch(
|
||||
}
|
||||
);
|
||||
|
||||
// 更新 CSS 变量
|
||||
const updateCSSVariables = (config: LyricConfig) => {
|
||||
document.documentElement.style.setProperty('--lyric-font-size', `${config.fontSize}px`);
|
||||
document.documentElement.style.setProperty('--lyric-letter-spacing', `${config.letterSpacing}px`);
|
||||
document.documentElement.style.setProperty('--lyric-line-height', config.lineHeight.toString());
|
||||
};
|
||||
|
||||
// 加载保存的配置
|
||||
onMounted(() => {
|
||||
const savedConfig = localStorage.getItem('music-full-config');
|
||||
if (savedConfig) {
|
||||
@@ -165,50 +170,14 @@ defineExpose({
|
||||
|
||||
<style scoped lang="scss">
|
||||
.settings-panel {
|
||||
@apply p-4 w-80 rounded-lg relative overflow-hidden backdrop-blur-lg bg-black/10;
|
||||
|
||||
@apply p-4 w-72 rounded-lg relative overflow-hidden backdrop-blur-lg bg-black/10;
|
||||
.settings-title {
|
||||
@apply text-base font-bold mb-4;
|
||||
color: var(--text-color-active);
|
||||
}
|
||||
|
||||
.settings-content {
|
||||
:deep(.n-tabs-nav) {
|
||||
@apply mb-3;
|
||||
}
|
||||
|
||||
:deep(.n-tab-pane) {
|
||||
@apply p-0;
|
||||
}
|
||||
|
||||
:deep(.n-tabs-tab) {
|
||||
@apply text-xs;
|
||||
color: var(--text-color-primary);
|
||||
|
||||
&.n-tabs-tab--active {
|
||||
color: var(--text-color-active);
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.n-tabs-tab-wrapper) {
|
||||
@apply pb-0;
|
||||
}
|
||||
|
||||
:deep(.n-tabs-pane-wrapper) {
|
||||
@apply px-2;
|
||||
}
|
||||
|
||||
:deep(.n-tabs-bar) {
|
||||
background-color: var(--text-color-active);
|
||||
}
|
||||
}
|
||||
|
||||
.tab-content {
|
||||
@apply py-2;
|
||||
}
|
||||
|
||||
.settings-grid {
|
||||
@apply grid grid-cols-1 gap-3;
|
||||
@apply space-y-4;
|
||||
}
|
||||
|
||||
.settings-item {
|
||||
@@ -219,38 +188,22 @@ defineExpose({
|
||||
}
|
||||
}
|
||||
|
||||
.section-title {
|
||||
@apply text-sm font-medium mb-2;
|
||||
color: var(--text-color-primary);
|
||||
}
|
||||
|
||||
.theme-section {
|
||||
@apply mt-4;
|
||||
}
|
||||
|
||||
.slider-section {
|
||||
@apply space-y-6;
|
||||
}
|
||||
|
||||
.slider-item {
|
||||
@apply space-y-2 mb-10 !important;
|
||||
.settings-slider {
|
||||
@apply space-y-2;
|
||||
@apply mb-10 !important;
|
||||
span {
|
||||
@apply text-sm;
|
||||
color: var(--text-color-primary);
|
||||
}
|
||||
}
|
||||
|
||||
.theme-radio-group {
|
||||
@apply flex;
|
||||
}
|
||||
}
|
||||
|
||||
// 修改 slider 字体颜色
|
||||
:deep(.n-slider-mark) {
|
||||
color: var(--text-color-primary) !important;
|
||||
}
|
||||
|
||||
// 修改 radio 字体颜色
|
||||
:deep(.n-radio__label) {
|
||||
color: var(--text-color-active) !important;
|
||||
@apply text-xs;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -253,7 +253,7 @@ const togglePlaylist = () => {
|
||||
const scrollToPlayList = () => {
|
||||
setTimeout(() => {
|
||||
const currentIndex = playerStore.playListIndex;
|
||||
const itemHeight = 69; // 每个列表项的高度
|
||||
const itemHeight = 52; // 每个列表项的高度
|
||||
palyListRef.value?.scrollTo({
|
||||
top: currentIndex * itemHeight,
|
||||
behavior: 'smooth'
|
||||
@@ -585,16 +585,4 @@ const setMusicFull = () => {
|
||||
.playlist-items {
|
||||
padding: 4px 0;
|
||||
}
|
||||
|
||||
.dark {
|
||||
.song-info {
|
||||
.song-title {
|
||||
color: var(--text-color-1, #fff);
|
||||
}
|
||||
|
||||
.song-artist {
|
||||
color: var(--text-color-2, #fff);
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -16,54 +16,24 @@
|
||||
<div class="shortcut-info">
|
||||
<span class="shortcut-label">{{ getShortcutLabel(key) }}</span>
|
||||
</div>
|
||||
<div class="shortcut-controls">
|
||||
<div class="shortcut-input">
|
||||
<n-input
|
||||
:value="formatShortcut(shortcut.key)"
|
||||
:status="duplicateKeys[key] ? 'error' : undefined"
|
||||
:placeholder="t('settings.shortcutSettings.inputPlaceholder')"
|
||||
:disabled="!shortcut.enabled"
|
||||
readonly
|
||||
@keydown="(e) => handleKeyDown(e, key)"
|
||||
@focus="() => startRecording(key)"
|
||||
@blur="stopRecording"
|
||||
/>
|
||||
<n-tooltip v-if="duplicateKeys[key]" trigger="hover">
|
||||
<template #trigger>
|
||||
<n-icon class="error-icon" size="18">
|
||||
<i class="ri-error-warning-line"></i>
|
||||
</n-icon>
|
||||
</template>
|
||||
{{ t('settings.shortcutSettings.shortcutConflict') }}
|
||||
</n-tooltip>
|
||||
</div>
|
||||
<div class="shortcut-options">
|
||||
<n-tooltip trigger="hover">
|
||||
<template #trigger>
|
||||
<n-switch v-model:value="shortcut.enabled" size="small" />
|
||||
</template>
|
||||
{{
|
||||
shortcut.enabled
|
||||
? t('settings.shortcutSettings.enabled')
|
||||
: t('settings.shortcutSettings.disabled')
|
||||
}}
|
||||
</n-tooltip>
|
||||
<n-tooltip v-if="shortcut.enabled" trigger="hover">
|
||||
<template #trigger>
|
||||
<n-select
|
||||
v-model:value="shortcut.scope"
|
||||
:options="scopeOptions"
|
||||
size="small"
|
||||
style="width: 100px"
|
||||
/>
|
||||
</template>
|
||||
{{
|
||||
shortcut.scope === 'global'
|
||||
? t('settings.shortcutSettings.scopeGlobal')
|
||||
: t('settings.shortcutSettings.scopeApp')
|
||||
}}
|
||||
</n-tooltip>
|
||||
</div>
|
||||
<div class="shortcut-input">
|
||||
<n-input
|
||||
:value="formatShortcut(shortcut)"
|
||||
:status="duplicateKeys[key] ? 'error' : undefined"
|
||||
:placeholder="t('settings.shortcutSettings.inputPlaceholder')"
|
||||
readonly
|
||||
@keydown="(e) => handleKeyDown(e, key)"
|
||||
@focus="() => startRecording(key)"
|
||||
@blur="stopRecording"
|
||||
/>
|
||||
<n-tooltip v-if="duplicateKeys[key]" trigger="hover">
|
||||
<template #trigger>
|
||||
<n-icon class="error-icon" size="18">
|
||||
<i class="ri-error-warning-line"></i>
|
||||
</n-icon>
|
||||
</template>
|
||||
{{ t('settings.shortcutSettings.shortcutConflict') }}
|
||||
</n-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
</n-space>
|
||||
@@ -76,12 +46,6 @@
|
||||
<n-button size="small" @click="resetShortcuts">{{
|
||||
t('settings.shortcutSettings.resetShortcuts')
|
||||
}}</n-button>
|
||||
<n-button size="small" type="warning" @click="disableAllShortcuts">{{
|
||||
t('settings.shortcutSettings.disableAll')
|
||||
}}</n-button>
|
||||
<n-button size="small" type="success" @click="enableAllShortcuts">{{
|
||||
t('settings.shortcutSettings.enableAll')
|
||||
}}</n-button>
|
||||
<n-button type="primary" size="small" :disabled="hasConflict" @click="handleSave">
|
||||
{{ t('common.save') }}
|
||||
</n-button>
|
||||
@@ -102,37 +66,26 @@ import { isElectron } from '@/utils';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
interface ShortcutConfig {
|
||||
key: string;
|
||||
enabled: boolean;
|
||||
scope: 'global' | 'app';
|
||||
}
|
||||
|
||||
interface Shortcuts {
|
||||
togglePlay: ShortcutConfig;
|
||||
prevPlay: ShortcutConfig;
|
||||
nextPlay: ShortcutConfig;
|
||||
volumeUp: ShortcutConfig;
|
||||
volumeDown: ShortcutConfig;
|
||||
toggleFavorite: ShortcutConfig;
|
||||
toggleWindow: ShortcutConfig;
|
||||
togglePlay: string;
|
||||
prevPlay: string;
|
||||
nextPlay: string;
|
||||
volumeUp: string;
|
||||
volumeDown: string;
|
||||
toggleFavorite: string;
|
||||
toggleWindow: string;
|
||||
}
|
||||
|
||||
const defaultShortcuts: Shortcuts = {
|
||||
togglePlay: { key: 'CommandOrControl+Alt+P', enabled: true, scope: 'global' },
|
||||
prevPlay: { key: 'Alt+Left', enabled: true, scope: 'global' },
|
||||
nextPlay: { key: 'Alt+Right', enabled: true, scope: 'global' },
|
||||
volumeUp: { key: 'Alt+Up', enabled: true, scope: 'app' },
|
||||
volumeDown: { key: 'Alt+Down', enabled: true, scope: 'app' },
|
||||
toggleFavorite: { key: 'CommandOrControl+Alt+L', enabled: true, scope: 'app' },
|
||||
toggleWindow: { key: 'CommandOrControl+Alt+Shift+M', enabled: true, scope: 'global' }
|
||||
togglePlay: 'CommandOrControl+Alt+P',
|
||||
prevPlay: 'Alt+Left',
|
||||
nextPlay: 'Alt+Right',
|
||||
volumeUp: 'Alt+Up',
|
||||
volumeDown: 'Alt+Down',
|
||||
toggleFavorite: 'CommandOrControl+Alt+L',
|
||||
toggleWindow: 'CommandOrControl+Alt+Shift+M'
|
||||
};
|
||||
|
||||
const scopeOptions = [
|
||||
{ label: t('settings.shortcutSettings.scopeGlobal'), value: 'global' },
|
||||
{ label: t('settings.shortcutSettings.scopeApp'), value: 'app' }
|
||||
];
|
||||
|
||||
const shortcuts = ref<Shortcuts>(
|
||||
isElectron
|
||||
? window.electron.ipcRenderer.sendSync('get-store-value', 'shortcuts') || defaultShortcuts
|
||||
@@ -140,7 +93,7 @@ const shortcuts = ref<Shortcuts>(
|
||||
);
|
||||
|
||||
// 临时存储编辑中的快捷键
|
||||
const tempShortcuts = ref<Shortcuts>(cloneDeep(shortcuts.value));
|
||||
const tempShortcuts = ref<Shortcuts>({ ...shortcuts.value });
|
||||
|
||||
// 监听快捷键更新
|
||||
if (isElectron) {
|
||||
@@ -148,7 +101,7 @@ if (isElectron) {
|
||||
const newShortcuts = window.electron.ipcRenderer.sendSync('get-store-value', 'shortcuts');
|
||||
if (newShortcuts) {
|
||||
shortcuts.value = newShortcuts;
|
||||
tempShortcuts.value = cloneDeep(newShortcuts);
|
||||
tempShortcuts.value = { ...newShortcuts };
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -163,27 +116,12 @@ onMounted(() => {
|
||||
console.log('storedShortcuts', storedShortcuts);
|
||||
if (storedShortcuts) {
|
||||
shortcuts.value = storedShortcuts;
|
||||
tempShortcuts.value = cloneDeep(storedShortcuts);
|
||||
tempShortcuts.value = { ...storedShortcuts };
|
||||
} else {
|
||||
shortcuts.value = { ...defaultShortcuts };
|
||||
tempShortcuts.value = cloneDeep(defaultShortcuts);
|
||||
tempShortcuts.value = { ...defaultShortcuts };
|
||||
window.electron.ipcRenderer.send('set-store-value', 'shortcuts', defaultShortcuts);
|
||||
}
|
||||
|
||||
// 转换旧格式的快捷键数据到新格式
|
||||
if (storedShortcuts && typeof storedShortcuts.togglePlay === 'string') {
|
||||
const convertedShortcuts = {} as Shortcuts;
|
||||
Object.entries(storedShortcuts).forEach(([key, value]) => {
|
||||
convertedShortcuts[key as keyof Shortcuts] = {
|
||||
key: value as string,
|
||||
enabled: true,
|
||||
scope: ['volumeUp', 'volumeDown', 'toggleFavorite'].includes(key) ? 'app' : 'global'
|
||||
};
|
||||
});
|
||||
shortcuts.value = convertedShortcuts;
|
||||
tempShortcuts.value = cloneDeep(convertedShortcuts);
|
||||
window.electron.ipcRenderer.send('set-store-value', 'shortcuts', convertedShortcuts);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -206,21 +144,13 @@ const message = useMessage();
|
||||
// 检查快捷键冲突
|
||||
const duplicateKeys = computed(() => {
|
||||
const result: Record<string, boolean> = {};
|
||||
const usedShortcuts = new Map<string, string>();
|
||||
const usedShortcuts = new Set<string>();
|
||||
|
||||
Object.entries(tempShortcuts.value).forEach(([key, shortcut]) => {
|
||||
// 只检查启用的快捷键
|
||||
if (!shortcut.enabled) return;
|
||||
|
||||
const conflictKey = usedShortcuts.get(shortcut.key);
|
||||
if (conflictKey) {
|
||||
// 只有相同作用域的快捷键才会被认为冲突
|
||||
const conflictScope = tempShortcuts.value[conflictKey as keyof Shortcuts].scope;
|
||||
if (shortcut.scope === conflictScope) {
|
||||
result[key] = true;
|
||||
}
|
||||
if (usedShortcuts.has(shortcut)) {
|
||||
result[key] = true;
|
||||
} else {
|
||||
usedShortcuts.set(shortcut.key, key);
|
||||
usedShortcuts.add(shortcut);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -231,8 +161,6 @@ const duplicateKeys = computed(() => {
|
||||
const hasConflict = computed(() => Object.keys(duplicateKeys.value).length > 0);
|
||||
|
||||
const startRecording = (key: keyof Shortcuts) => {
|
||||
if (!tempShortcuts.value[key].enabled) return;
|
||||
|
||||
isRecording.value = true;
|
||||
currentKey.value = key;
|
||||
// 禁用全局快捷键
|
||||
@@ -292,12 +220,12 @@ const handleKeyDown = (e: KeyboardEvent, key: keyof Shortcuts) => {
|
||||
}
|
||||
|
||||
if (!['Control', 'Alt', 'Shift', 'Meta', 'Command'].includes(keyName)) {
|
||||
tempShortcuts.value[key].key = [...modifiers, keyName].join('+');
|
||||
tempShortcuts.value[key] = [...modifiers, keyName].join('+');
|
||||
}
|
||||
};
|
||||
|
||||
const resetShortcuts = () => {
|
||||
tempShortcuts.value = cloneDeep(defaultShortcuts);
|
||||
tempShortcuts.value = { ...defaultShortcuts };
|
||||
message.success(t('settings.shortcutSettings.messages.resetSuccess'));
|
||||
};
|
||||
|
||||
@@ -317,7 +245,7 @@ const saveShortcuts = () => {
|
||||
// 先保存到 store
|
||||
window.electron.ipcRenderer.send('set-store-value', 'shortcuts', shortcutsToSave);
|
||||
// 然后更新快捷键
|
||||
window.electron.ipcRenderer.send('update-shortcuts', shortcutsToSave);
|
||||
window.electron.ipcRenderer.send('update-shortcuts');
|
||||
message.success(t('settings.shortcutSettings.messages.saveSuccess'));
|
||||
} catch (error) {
|
||||
console.error('保存快捷键失败:', error);
|
||||
@@ -327,7 +255,7 @@ const saveShortcuts = () => {
|
||||
};
|
||||
|
||||
const cancelEdit = () => {
|
||||
tempShortcuts.value = cloneDeep(shortcuts.value);
|
||||
tempShortcuts.value = { ...shortcuts.value };
|
||||
message.info(t('settings.shortcutSettings.messages.cancelEdit'));
|
||||
emit('update:show', false);
|
||||
};
|
||||
@@ -381,7 +309,7 @@ watch(visible, (newVal) => {
|
||||
// 处理弹窗关闭后的事件
|
||||
const handleAfterLeave = () => {
|
||||
// 重置临时数据
|
||||
tempShortcuts.value = cloneDeep(shortcuts.value);
|
||||
tempShortcuts.value = { ...shortcuts.value };
|
||||
};
|
||||
|
||||
// 处理取消按钮点击
|
||||
@@ -396,22 +324,6 @@ const handleSave = () => {
|
||||
visible.value = false;
|
||||
emit('change', shortcuts.value);
|
||||
};
|
||||
|
||||
// 全部禁用快捷键
|
||||
const disableAllShortcuts = () => {
|
||||
Object.keys(tempShortcuts.value).forEach((key) => {
|
||||
tempShortcuts.value[key as keyof Shortcuts].enabled = false;
|
||||
});
|
||||
message.info(t('settings.shortcutSettings.messages.disableAll'));
|
||||
};
|
||||
|
||||
// 全部启用快捷键
|
||||
const enableAllShortcuts = () => {
|
||||
Object.keys(tempShortcuts.value).forEach((key) => {
|
||||
tempShortcuts.value[key as keyof Shortcuts].enabled = true;
|
||||
});
|
||||
message.info(t('settings.shortcutSettings.messages.enableAll'));
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -447,32 +359,25 @@ const enableAllShortcuts = () => {
|
||||
}
|
||||
|
||||
.shortcut-info {
|
||||
@apply flex flex-col min-w-[150px];
|
||||
@apply flex flex-col;
|
||||
|
||||
.shortcut-label {
|
||||
@apply text-base font-medium;
|
||||
}
|
||||
}
|
||||
|
||||
.shortcut-controls {
|
||||
@apply flex items-center gap-3 flex-1;
|
||||
.shortcut-input {
|
||||
@apply flex items-center gap-2;
|
||||
min-width: 200px;
|
||||
|
||||
.shortcut-input {
|
||||
@apply flex items-center gap-2 flex-1;
|
||||
|
||||
:deep(.n-input) {
|
||||
.n-input__input-el {
|
||||
@apply text-center font-mono;
|
||||
}
|
||||
}
|
||||
|
||||
.error-icon {
|
||||
@apply text-red-500;
|
||||
:deep(.n-input) {
|
||||
.n-input__input-el {
|
||||
@apply text-center font-mono;
|
||||
}
|
||||
}
|
||||
|
||||
.shortcut-options {
|
||||
@apply flex items-center gap-2;
|
||||
.error-icon {
|
||||
@apply text-red-500;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
// musicHistoryHooks
|
||||
import { useLocalStorage } from '@vueuse/core';
|
||||
|
||||
import { recordPlay } from '@/api/stats';
|
||||
import type { SongResult } from '@/type/music';
|
||||
|
||||
export const useMusicHistory = () => {
|
||||
@@ -15,25 +14,6 @@ export const useMusicHistory = () => {
|
||||
} else {
|
||||
musicHistory.value.unshift({ ...music, count: 1 });
|
||||
}
|
||||
|
||||
// 记录播放统计
|
||||
if (music?.id && music?.name) {
|
||||
// 获取艺术家名称
|
||||
let artistName = '未知艺术家';
|
||||
|
||||
if (music.ar) {
|
||||
artistName = music.ar.map((artist) => artist.name).join('/');
|
||||
} else if (music.song?.artists && music.song.artists.length > 0) {
|
||||
artistName = music.song.artists.map((artist) => artist.name).join('/');
|
||||
} else if (music.artists) {
|
||||
artistName = music.artists.map((artist) => artist.name).join('/');
|
||||
}
|
||||
|
||||
// 发送播放统计
|
||||
recordPlay(music.id, music.name, artistName).catch((error) =>
|
||||
console.error('记录播放统计失败:', error)
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const delMusic = (music: SongResult) => {
|
||||
|
||||
@@ -395,9 +395,7 @@ const setupAudioListeners = () => {
|
||||
// 监听播放
|
||||
audioService.on('play', () => {
|
||||
playerStore.setPlayMusic(true);
|
||||
if (isElectron) {
|
||||
window.api.sendSong(cloneDeep(playerStore.playMusic));
|
||||
}
|
||||
window.api.sendSong(cloneDeep(playerStore.playMusic));
|
||||
clearInterval();
|
||||
interval = window.setInterval(() => {
|
||||
try {
|
||||
|
||||
@@ -5,7 +5,6 @@ import { ref } from 'vue';
|
||||
import { getMusicLrc, getMusicUrl, getParsingMusicUrl } from '@/api/music';
|
||||
import { useMusicHistory } from '@/hooks/MusicHistoryHook';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import { useSettingsStore } from '@/store';
|
||||
import type { ILyric, ILyricText, SongResult } from '@/type/music';
|
||||
import { getImgUrl } from '@/utils';
|
||||
import { getImageLinearBackground } from '@/utils/linearColor';
|
||||
@@ -14,16 +13,12 @@ const musicHistory = useMusicHistory();
|
||||
|
||||
// 获取歌曲url
|
||||
export const getSongUrl = async (id: any, songData: any, isDownloaded: boolean = false) => {
|
||||
const settingsStore = useSettingsStore();
|
||||
const { unlimitedDownload } = settingsStore.setData;
|
||||
|
||||
const { data } = await getMusicUrl(id, !unlimitedDownload);
|
||||
const { data } = await getMusicUrl(id, isDownloaded);
|
||||
let url = '';
|
||||
let songDetail = null;
|
||||
|
||||
try {
|
||||
if (data.data[0].freeTrialInfo || !data.data[0].url) {
|
||||
const res = await getParsingMusicUrl(id, cloneDeep(songData));
|
||||
const res = await getParsingMusicUrl(id, songData);
|
||||
url = res.data.data.url;
|
||||
songDetail = res.data.data;
|
||||
} else {
|
||||
|
||||
@@ -146,7 +146,6 @@ provide('openPlaylistDrawer', openPlaylistDrawer);
|
||||
overflow: auto;
|
||||
display: block;
|
||||
flex: none;
|
||||
padding-bottom: 70px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -113,10 +113,8 @@ const isText = ref(false);
|
||||
.app-menu {
|
||||
max-width: 100%;
|
||||
width: 100vw;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 99999;
|
||||
position: relative;
|
||||
z-index: 999999;
|
||||
@apply bg-light dark:bg-black border-t border-gray-200 dark:border-gray-700;
|
||||
|
||||
&-header {
|
||||
@@ -124,7 +122,7 @@ const isText = ref(false);
|
||||
}
|
||||
|
||||
&-list {
|
||||
@apply flex justify-between px-4;
|
||||
@apply flex justify-between;
|
||||
}
|
||||
|
||||
&-item {
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
</n-popover>
|
||||
|
||||
<div
|
||||
v-if="!config.hideCover"
|
||||
class="music-img"
|
||||
:class="{ 'only-cover': config.hideLyrics }"
|
||||
:style="{ color: textColors.theme === 'dark' ? '#000000' : '#ffffff' }"
|
||||
@@ -75,7 +74,7 @@
|
||||
<div
|
||||
class="music-content"
|
||||
:class="{
|
||||
center: config.centerLyrics,
|
||||
center: config.centerLyrics && config.hideCover,
|
||||
hide: config.hideLyrics
|
||||
}"
|
||||
>
|
||||
@@ -160,7 +159,6 @@ import {
|
||||
import { useArtist } from '@/hooks/useArtist';
|
||||
import { usePlayerStore } from '@/store/modules/player';
|
||||
import { useSettingsStore } from '@/store/modules/settings';
|
||||
import { DEFAULT_LYRIC_CONFIG, LyricConfig } from '@/types/lyric';
|
||||
import { getImgUrl, isMobile } from '@/utils';
|
||||
import { animateGradient, getHoverBackgroundColor, getTextColors } from '@/utils/linearColor';
|
||||
|
||||
@@ -175,8 +173,34 @@ const isDark = ref(false);
|
||||
const showStickyHeader = ref(false);
|
||||
const lyricSettingsRef = ref<InstanceType<typeof LyricSettings>>();
|
||||
|
||||
interface LyricConfig {
|
||||
hideCover: boolean;
|
||||
centerLyrics: boolean;
|
||||
fontSize: number;
|
||||
letterSpacing: number;
|
||||
lineHeight: number;
|
||||
showTranslation: boolean;
|
||||
theme: 'default' | 'light' | 'dark';
|
||||
hidePlayBar: boolean;
|
||||
pureModeEnabled: boolean;
|
||||
hideMiniPlayBar: boolean;
|
||||
hideLyrics: boolean;
|
||||
}
|
||||
|
||||
// 移除 computed 配置
|
||||
const config = ref<LyricConfig>({ ...DEFAULT_LYRIC_CONFIG });
|
||||
const config = ref<LyricConfig>({
|
||||
hideCover: false,
|
||||
centerLyrics: false,
|
||||
fontSize: 22,
|
||||
letterSpacing: 0,
|
||||
lineHeight: 1.5,
|
||||
showTranslation: true,
|
||||
theme: 'default',
|
||||
hidePlayBar: false,
|
||||
pureModeEnabled: false,
|
||||
hideMiniPlayBar: false,
|
||||
hideLyrics: false
|
||||
});
|
||||
|
||||
// 监听设置组件的配置变化
|
||||
watch(
|
||||
@@ -593,7 +617,7 @@ defineExpose({
|
||||
transition: all 0.3s ease;
|
||||
|
||||
&.center {
|
||||
@apply w-auto;
|
||||
@apply w-full;
|
||||
.music-lrc {
|
||||
@apply w-full max-w-3xl mx-auto;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ import pinia from '@/store';
|
||||
|
||||
import App from './App.vue';
|
||||
import directives from './directive';
|
||||
import { initAppShortcuts } from './utils/appShortcuts';
|
||||
|
||||
const app = createApp(App);
|
||||
|
||||
@@ -22,6 +21,3 @@ app.use(pinia);
|
||||
app.use(router);
|
||||
app.use(i18n);
|
||||
app.mount('#app');
|
||||
|
||||
// 初始化应用内快捷键
|
||||
initAppShortcuts();
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { createRouter, createWebHashHistory } from 'vue-router';
|
||||
|
||||
import { recordVisit } from '@/api/stats';
|
||||
import AppLayout from '@/layout/AppLayout.vue';
|
||||
import MiniLayout from '@/layout/MiniLayout.vue';
|
||||
import homeRouter from '@/router/home';
|
||||
@@ -81,13 +80,4 @@ router.beforeEach((to, _, next) => {
|
||||
}
|
||||
});
|
||||
|
||||
// 添加全局后置钩子，记录页面访问
|
||||
router.afterEach((to) => {
|
||||
const pageName = to.name?.toString() || to.path;
|
||||
// 使用setTimeout避免阻塞路由导航
|
||||
setTimeout(() => {
|
||||
recordVisit(pageName).catch((error) => console.error('记录页面访问失败:', error));
|
||||
}, 100);
|
||||
});
|
||||
|
||||
export default router;
|
||||
|
||||
@@ -67,7 +67,6 @@ export const getSongUrl = async (
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('error', error);
|
||||
url = data.data[0].url || '';
|
||||
}
|
||||
if (isDownloaded) {
|
||||
return songDetail;
|
||||
@@ -154,15 +153,7 @@ const getSongDetail = async (playMusic: SongResult) => {
|
||||
return { ...playMusic, backgroundColor, primaryColor } as SongResult;
|
||||
}
|
||||
|
||||
if (playMusic.expiredAt && playMusic.expiredAt < Date.now()) {
|
||||
console.info(`歌曲已过期，重新获取: ${playMusic.name}`);
|
||||
playMusic.playMusicUrl = undefined;
|
||||
}
|
||||
|
||||
const playMusicUrl = playMusic.playMusicUrl || (await getSongUrl(playMusic.id, playMusic));
|
||||
playMusic.createdAt = Date.now();
|
||||
// 半小时后过期
|
||||
playMusic.expiredAt = playMusic.createdAt + 1800000;
|
||||
const { backgroundColor, primaryColor } =
|
||||
playMusic.backgroundColor && playMusic.primaryColor
|
||||
? playMusic
|
||||
@@ -345,7 +336,7 @@ export const usePlayerStore = defineStore('player', () => {
|
||||
(item: SongResult) => item.id === music.id && item.source === music.source
|
||||
);
|
||||
|
||||
fetchSongs(playList.value, playListIndex.value + 1, playListIndex.value + 3);
|
||||
fetchSongs(playList.value, playListIndex.value + 1, playListIndex.value + 6);
|
||||
};
|
||||
|
||||
const setPlay = async (song: SongResult) => {
|
||||
@@ -454,7 +445,7 @@ export const usePlayerStore = defineStore('player', () => {
|
||||
}
|
||||
|
||||
await handlePlayMusic(prevSong);
|
||||
await fetchSongs(playList.value, playListIndex.value - 3, nowPlayListIndex);
|
||||
await fetchSongs(playList.value, playListIndex.value - 5, nowPlayListIndex);
|
||||
};
|
||||
|
||||
const togglePlayMode = () => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { cloneDeep, merge } from 'lodash';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { defineStore } from 'pinia';
|
||||
import { ref } from 'vue';
|
||||
|
||||
@@ -7,6 +7,17 @@ import { isElectron } from '@/utils';
|
||||
import { applyTheme, getCurrentTheme, ThemeType } from '@/utils/theme';
|
||||
|
||||
export const useSettingsStore = defineStore('settings', () => {
|
||||
// 初始化时先从存储中读取设置
|
||||
const getInitialSettings = () => {
|
||||
if (isElectron) {
|
||||
const savedSettings = window.electron.ipcRenderer.sendSync('get-store-value', 'set');
|
||||
return savedSettings || setDataDefault;
|
||||
}
|
||||
const savedSettings = localStorage.getItem('appSettings');
|
||||
return savedSettings ? JSON.parse(savedSettings) : setDataDefault;
|
||||
};
|
||||
|
||||
const setData = ref(getInitialSettings());
|
||||
const theme = ref<ThemeType>(getCurrentTheme());
|
||||
const isMobile = ref(false);
|
||||
const isMiniMode = ref(false);
|
||||
@@ -17,11 +28,7 @@ export const useSettingsStore = defineStore('settings', () => {
|
||||
{ label: '系统默认', value: 'system-ui' }
|
||||
]);
|
||||
const showDownloadDrawer = ref(false);
|
||||
|
||||
// 先声明 setData ref 但不初始化
|
||||
const setData = ref<any>({});
|
||||
|
||||
// 先定义 setSetData 函数
|
||||
const setSetData = (data: any) => {
|
||||
// 合并现有设置和新设置
|
||||
const mergedData = {
|
||||
@@ -37,24 +44,6 @@ export const useSettingsStore = defineStore('settings', () => {
|
||||
setData.value = cloneDeep(mergedData);
|
||||
};
|
||||
|
||||
// 初始化时先从存储中读取设置
|
||||
const getInitialSettings = () => {
|
||||
// 从存储中获取保存的设置
|
||||
const savedSettings = isElectron
|
||||
? window.electron.ipcRenderer.sendSync('get-store-value', 'set')
|
||||
: JSON.parse(localStorage.getItem('appSettings') || '{}');
|
||||
|
||||
// 合并默认设置和保存的设置
|
||||
const mergedSettings = merge({}, setDataDefault, savedSettings);
|
||||
|
||||
// 更新设置并返回
|
||||
setSetData(mergedSettings);
|
||||
return mergedSettings;
|
||||
};
|
||||
|
||||
// 初始化 setData
|
||||
setData.value = getInitialSettings();
|
||||
|
||||
const toggleTheme = () => {
|
||||
theme.value = theme.value === 'dark' ? 'light' : 'dark';
|
||||
applyTheme(theme.value);
|
||||
|
||||
@@ -24,9 +24,7 @@ export interface SongResult {
|
||||
program?: any;
|
||||
alg?: string;
|
||||
ar: Artist[];
|
||||
artists?: Artist[];
|
||||
al: Album;
|
||||
album?: Album;
|
||||
count: number;
|
||||
playMusicUrl?: string;
|
||||
playLoading?: boolean;
|
||||
@@ -38,10 +36,6 @@ export interface SongResult {
|
||||
cid: number;
|
||||
};
|
||||
source?: 'netease' | 'bilibili';
|
||||
// 过期时间
|
||||
expiredAt?: number;
|
||||
// 获取时间
|
||||
createdAt?: number;
|
||||
}
|
||||
|
||||
export interface Song {
|
||||
@@ -239,19 +233,3 @@ export interface IArtists {
|
||||
img1v1: number;
|
||||
trans: null;
|
||||
}
|
||||
|
||||
// 音乐源类型定义
|
||||
export type MusicSourceType =
|
||||
| 'tencent'
|
||||
| 'kugou'
|
||||
| 'kuwo'
|
||||
| 'migu'
|
||||
| 'netease'
|
||||
| 'joox'
|
||||
| 'ytmusic'
|
||||
| 'spotify'
|
||||
| 'qobuz'
|
||||
| 'deezer'
|
||||
| 'gdmusic';
|
||||
|
||||
// 更多音乐相关的类型可以在这里定义
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
export interface LyricConfig {
|
||||
hideCover: boolean;
|
||||
centerLyrics: boolean;
|
||||
fontSize: number;
|
||||
letterSpacing: number;
|
||||
lineHeight: number;
|
||||
showTranslation: boolean;
|
||||
theme: 'default' | 'light' | 'dark';
|
||||
hidePlayBar: boolean;
|
||||
pureModeEnabled: boolean;
|
||||
hideMiniPlayBar: boolean;
|
||||
hideLyrics: boolean;
|
||||
}
|
||||
|
||||
export const DEFAULT_LYRIC_CONFIG: LyricConfig = {
|
||||
hideCover: false,
|
||||
centerLyrics: false,
|
||||
fontSize: 22,
|
||||
letterSpacing: 0,
|
||||
lineHeight: 2,
|
||||
showTranslation: true,
|
||||
theme: 'default',
|
||||
hidePlayBar: false,
|
||||
hideMiniPlayBar: true,
|
||||
pureModeEnabled: false,
|
||||
hideLyrics: false
|
||||
};
|
||||
@@ -1,210 +0,0 @@
|
||||
import { onMounted, onUnmounted } from 'vue';
|
||||
|
||||
import i18n from '@/../i18n/renderer';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import { usePlayerStore, useSettingsStore } from '@/store';
|
||||
|
||||
import { isElectron } from '.';
|
||||
import { showShortcutToast } from './shortcutToast';
|
||||
|
||||
interface ShortcutConfig {
|
||||
key: string;
|
||||
enabled: boolean;
|
||||
scope: 'global' | 'app';
|
||||
}
|
||||
|
||||
interface ShortcutsConfig {
|
||||
[key: string]: ShortcutConfig;
|
||||
}
|
||||
|
||||
const { t } = i18n.global;
|
||||
|
||||
// 全局存储快捷键配置
|
||||
let appShortcuts: ShortcutsConfig = {};
|
||||
|
||||
/**
|
||||
* 处理快捷键动作
|
||||
* @param action 快捷键动作
|
||||
*/
|
||||
export async function handleShortcutAction(action: string) {
|
||||
const playerStore = usePlayerStore();
|
||||
const settingsStore = useSettingsStore();
|
||||
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
const showToast = (message: string, iconName: string) => {
|
||||
if (settingsStore.isMiniMode) {
|
||||
return;
|
||||
}
|
||||
showShortcutToast(message, iconName);
|
||||
};
|
||||
|
||||
switch (action) {
|
||||
case 'togglePlay':
|
||||
if (playerStore.play) {
|
||||
await audioService.pause();
|
||||
showToast(t('player.playBar.pause'), 'ri-pause-circle-line');
|
||||
} else {
|
||||
await audioService.play();
|
||||
showToast(t('player.playBar.play'), 'ri-play-circle-line');
|
||||
}
|
||||
break;
|
||||
case 'prevPlay':
|
||||
playerStore.prevPlay();
|
||||
showToast(t('player.playBar.prev'), 'ri-skip-back-line');
|
||||
break;
|
||||
case 'nextPlay':
|
||||
playerStore.nextPlay();
|
||||
showToast(t('player.playBar.next'), 'ri-skip-forward-line');
|
||||
break;
|
||||
case 'volumeUp':
|
||||
if (currentSound && currentSound?.volume() < 1) {
|
||||
currentSound?.volume((currentSound?.volume() || 0) + 0.1);
|
||||
showToast(
|
||||
`${t('player.playBar.volume')}${Math.round((currentSound?.volume() || 0) * 100)}%`,
|
||||
'ri-volume-up-line'
|
||||
);
|
||||
}
|
||||
break;
|
||||
case 'volumeDown':
|
||||
if (currentSound && currentSound?.volume() > 0) {
|
||||
currentSound?.volume((currentSound?.volume() || 0) - 0.1);
|
||||
showToast(
|
||||
`${t('player.playBar.volume')}${Math.round((currentSound?.volume() || 0) * 100)}%`,
|
||||
'ri-volume-down-line'
|
||||
);
|
||||
}
|
||||
break;
|
||||
case 'toggleFavorite': {
|
||||
const isFavorite = playerStore.favoriteList.includes(Number(playerStore.playMusic.id));
|
||||
const numericId = Number(playerStore.playMusic.id);
|
||||
if (isFavorite) {
|
||||
playerStore.removeFromFavorite(numericId);
|
||||
} else {
|
||||
playerStore.addToFavorite(numericId);
|
||||
}
|
||||
showToast(
|
||||
isFavorite
|
||||
? t('player.playBar.favorite', { name: playerStore.playMusic.name })
|
||||
: t('player.playBar.unFavorite', { name: playerStore.playMusic.name }),
|
||||
isFavorite ? 'ri-heart-fill' : 'ri-heart-line'
|
||||
);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
console.log('未知的快捷键动作:', action);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查按键是否匹配快捷键
|
||||
* @param e KeyboardEvent
|
||||
* @param shortcutKey 快捷键字符串
|
||||
* @returns 是否匹配
|
||||
*/
|
||||
function matchShortcut(e: KeyboardEvent, shortcutKey: string): boolean {
|
||||
const keys = shortcutKey.split('+');
|
||||
const pressedKey = e.key.length === 1 ? e.key.toUpperCase() : e.key;
|
||||
|
||||
// 检查修饰键
|
||||
const hasCommandOrControl = keys.includes('CommandOrControl');
|
||||
const hasAlt = keys.includes('Alt');
|
||||
const hasShift = keys.includes('Shift');
|
||||
|
||||
// 检查主键
|
||||
let mainKey = keys.find((k) => !['CommandOrControl', 'Alt', 'Shift'].includes(k));
|
||||
if (!mainKey) return false;
|
||||
|
||||
// 处理特殊键
|
||||
if (mainKey === 'Left' && pressedKey === 'ArrowLeft') mainKey = 'ArrowLeft';
|
||||
if (mainKey === 'Right' && pressedKey === 'ArrowRight') mainKey = 'ArrowRight';
|
||||
if (mainKey === 'Up' && pressedKey === 'ArrowUp') mainKey = 'ArrowUp';
|
||||
if (mainKey === 'Down' && pressedKey === 'ArrowDown') mainKey = 'ArrowDown';
|
||||
|
||||
// 检查是否所有条件都匹配
|
||||
return (
|
||||
hasCommandOrControl === (e.ctrlKey || e.metaKey) &&
|
||||
hasAlt === e.altKey &&
|
||||
hasShift === e.shiftKey &&
|
||||
mainKey === pressedKey
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 全局键盘事件处理函数
|
||||
* @param e KeyboardEvent
|
||||
*/
|
||||
function handleKeyDown(e: KeyboardEvent) {
|
||||
// 如果在输入框中则不处理快捷键
|
||||
if (['INPUT', 'TEXTAREA'].includes((e.target as HTMLElement).tagName)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Object.entries(appShortcuts).forEach(([action, config]) => {
|
||||
if (config.enabled && config.scope === 'app' && matchShortcut(e, config.key)) {
|
||||
e.preventDefault();
|
||||
handleShortcutAction(action);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新应用内快捷键
|
||||
* @param shortcuts 快捷键配置
|
||||
*/
|
||||
export function updateAppShortcuts(shortcuts: ShortcutsConfig) {
|
||||
appShortcuts = shortcuts;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化应用内快捷键
|
||||
*/
|
||||
export function initAppShortcuts() {
|
||||
if (isElectron) {
|
||||
// 监听全局快捷键事件
|
||||
window.electron.ipcRenderer.on('global-shortcut', async (_, action: string) => {
|
||||
handleShortcutAction(action);
|
||||
});
|
||||
|
||||
// 监听应用内快捷键更新
|
||||
window.electron.ipcRenderer.on('update-app-shortcuts', (_, shortcuts: ShortcutsConfig) => {
|
||||
updateAppShortcuts(shortcuts);
|
||||
});
|
||||
|
||||
// 获取初始快捷键配置
|
||||
const storedShortcuts = window.electron.ipcRenderer.sendSync('get-store-value', 'shortcuts');
|
||||
if (storedShortcuts) {
|
||||
updateAppShortcuts(storedShortcuts);
|
||||
}
|
||||
|
||||
// 添加键盘事件监听
|
||||
document.addEventListener('keydown', handleKeyDown);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理应用内快捷键
|
||||
*/
|
||||
export function cleanupAppShortcuts() {
|
||||
if (isElectron) {
|
||||
// 移除全局事件监听
|
||||
window.electron.ipcRenderer.removeAllListeners('global-shortcut');
|
||||
window.electron.ipcRenderer.removeAllListeners('update-app-shortcuts');
|
||||
|
||||
// 移除键盘事件监听
|
||||
document.removeEventListener('keydown', handleKeyDown);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 使用应用内快捷键的组合函数
|
||||
*/
|
||||
export function useAppShortcuts() {
|
||||
onMounted(() => {
|
||||
initAppShortcuts();
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
cleanupAppShortcuts();
|
||||
});
|
||||
}
|
||||
81
src/renderer/utils/shortcut.ts
Normal file
81
src/renderer/utils/shortcut.ts
Normal file
@@ -0,0 +1,81 @@
|
||||
import i18n from '@/../i18n/renderer';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import { usePlayerStore, useSettingsStore } from '@/store';
|
||||
|
||||
import { isElectron } from '.';
|
||||
import { showShortcutToast } from './shortcutToast';
|
||||
|
||||
const { t } = i18n.global;
|
||||
|
||||
export function initShortcut() {
|
||||
if (isElectron) {
|
||||
window.electron.ipcRenderer.on('global-shortcut', async (_, action: string) => {
|
||||
const playerStore = usePlayerStore();
|
||||
const settingsStore = useSettingsStore();
|
||||
|
||||
const currentSound = audioService.getCurrentSound();
|
||||
const showToast = (message: string, iconName: string) => {
|
||||
if (settingsStore.isMiniMode) {
|
||||
return;
|
||||
}
|
||||
showShortcutToast(message, iconName);
|
||||
};
|
||||
switch (action) {
|
||||
case 'togglePlay':
|
||||
if (playerStore.play) {
|
||||
await audioService.pause();
|
||||
showToast(t('player.playBar.pause'), 'ri-pause-circle-line');
|
||||
} else {
|
||||
await audioService.play();
|
||||
showToast(t('player.playBar.play'), 'ri-play-circle-line');
|
||||
}
|
||||
break;
|
||||
case 'prevPlay':
|
||||
playerStore.prevPlay();
|
||||
showToast(t('player.playBar.prev'), 'ri-skip-back-line');
|
||||
break;
|
||||
case 'nextPlay':
|
||||
playerStore.nextPlay();
|
||||
showToast(t('player.playBar.next'), 'ri-skip-forward-line');
|
||||
break;
|
||||
case 'volumeUp':
|
||||
if (currentSound && currentSound?.volume() < 1) {
|
||||
currentSound?.volume((currentSound?.volume() || 0) + 0.1);
|
||||
showToast(
|
||||
`${t('player.playBar.volume')}${Math.round((currentSound?.volume() || 0) * 100)}%`,
|
||||
'ri-volume-up-line'
|
||||
);
|
||||
}
|
||||
break;
|
||||
case 'volumeDown':
|
||||
if (currentSound && currentSound?.volume() > 0) {
|
||||
currentSound?.volume((currentSound?.volume() || 0) - 0.1);
|
||||
showToast(
|
||||
`${t('player.playBar.volume')}${Math.round((currentSound?.volume() || 0) * 100)}%`,
|
||||
'ri-volume-down-line'
|
||||
);
|
||||
}
|
||||
break;
|
||||
case 'toggleFavorite': {
|
||||
const isFavorite = playerStore.favoriteList.includes(Number(playerStore.playMusic.id));
|
||||
const numericId = Number(playerStore.playMusic.id);
|
||||
if (isFavorite) {
|
||||
playerStore.removeFromFavorite(numericId);
|
||||
} else {
|
||||
playerStore.addToFavorite(numericId);
|
||||
}
|
||||
showToast(
|
||||
isFavorite
|
||||
? t('player.playBar.favorite', { name: playerStore.playMusic.name })
|
||||
: t('player.playBar.unFavorite', { name: playerStore.playMusic.name }),
|
||||
isFavorite ? 'ri-heart-fill' : 'ri-heart-line'
|
||||
);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
console.log('未知的快捷键动作:', action);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -193,18 +193,11 @@ const handleBatchDownload = async () => {
|
||||
failCount++;
|
||||
return;
|
||||
}
|
||||
const songData = cloneDeep(song);
|
||||
const songInfo = {
|
||||
...songData,
|
||||
ar: songData.ar || songData.song?.artists,
|
||||
downloadTime: Date.now()
|
||||
};
|
||||
console.log('songInfo', songInfo);
|
||||
console.log('song', song);
|
||||
|
||||
window.electron.ipcRenderer.send('download-music', {
|
||||
url,
|
||||
filename: `${song.name} - ${(song.ar || song.song?.artists)?.map((a) => a.name).join(',')}`,
|
||||
songInfo,
|
||||
songInfo: cloneDeep(song),
|
||||
type
|
||||
});
|
||||
});
|
||||
@@ -217,7 +210,7 @@ const handleBatchDownload = async () => {
|
||||
};
|
||||
|
||||
// 无限滚动相关
|
||||
const pageSize = 100;
|
||||
const pageSize = 16;
|
||||
const currentPage = ref(1);
|
||||
|
||||
const props = defineProps({
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import { getBilibiliProxyUrl, getBilibiliVideoDetail } from '@/api/bilibili';
|
||||
import { getMusicDetail } from '@/api/music';
|
||||
import SongItem from '@/components/common/SongItem.vue';
|
||||
import { useMusicHistory } from '@/hooks/MusicHistoryHook';
|
||||
@@ -56,7 +55,7 @@ const displayList = ref<SongResult[]>([]);
|
||||
const playerStore = usePlayerStore();
|
||||
|
||||
// 无限滚动相关配置
|
||||
const pageSize = 100;
|
||||
const pageSize = 20;
|
||||
const currentPage = ref(1);
|
||||
|
||||
// 获取当前页的音乐详情
|
||||
@@ -72,89 +71,27 @@ const getHistorySongs = async () => {
|
||||
const endIndex = startIndex + pageSize;
|
||||
const currentPageItems = musicList.value.slice(startIndex, endIndex);
|
||||
|
||||
// 分离网易云音乐和B站视频
|
||||
const neteaseItems = currentPageItems.filter((item) => item.source !== 'bilibili');
|
||||
const bilibiliItems = currentPageItems.filter((item) => item.source === 'bilibili');
|
||||
const currentIds = currentPageItems.map((item) => item.id as number);
|
||||
const res = await getMusicDetail(currentIds);
|
||||
|
||||
// 处理网易云音乐
|
||||
let neteaseSongs: SongResult[] = [];
|
||||
if (neteaseItems.length > 0) {
|
||||
const currentIds = neteaseItems.map((item) => item.id as number);
|
||||
const res = await getMusicDetail(currentIds);
|
||||
if (res.data.songs) {
|
||||
neteaseSongs = res.data.songs.map((song: SongResult) => {
|
||||
const historyItem = neteaseItems.find((item) => item.id === song.id);
|
||||
return {
|
||||
...song,
|
||||
picUrl: song.al?.picUrl || '',
|
||||
count: historyItem?.count || 0,
|
||||
source: 'netease'
|
||||
};
|
||||
});
|
||||
if (res.data.songs) {
|
||||
const newSongs = res.data.songs.map((song: SongResult) => {
|
||||
const historyItem = currentPageItems.find((item) => item.id === song.id);
|
||||
return {
|
||||
...song,
|
||||
picUrl: song.al?.picUrl || '',
|
||||
count: historyItem?.count || 0
|
||||
};
|
||||
});
|
||||
|
||||
if (currentPage.value === 1) {
|
||||
displayList.value = newSongs;
|
||||
} else {
|
||||
displayList.value = [...displayList.value, ...newSongs];
|
||||
}
|
||||
|
||||
noMore.value = displayList.value.length >= musicList.value.length;
|
||||
}
|
||||
|
||||
// 处理B站视频
|
||||
const bilibiliSongs: SongResult[] = [];
|
||||
for (const item of bilibiliItems) {
|
||||
try {
|
||||
const bvid = item.bilibiliData?.bvid;
|
||||
if (!bvid) continue;
|
||||
|
||||
const res = await getBilibiliVideoDetail(bvid);
|
||||
const videoDetail = res.data;
|
||||
|
||||
// 找到对应的分P
|
||||
const page = videoDetail.pages.find((p) => p.cid === item.bilibiliData?.cid);
|
||||
if (!page) continue;
|
||||
|
||||
bilibiliSongs.push({
|
||||
id: `${videoDetail.aid}--${page.cid}`,
|
||||
name: `${page.part || ''} - ${videoDetail.title}`,
|
||||
picUrl: getBilibiliProxyUrl(videoDetail.pic),
|
||||
ar: [
|
||||
{
|
||||
name: videoDetail.owner.name,
|
||||
id: videoDetail.owner.mid
|
||||
}
|
||||
],
|
||||
al: {
|
||||
name: videoDetail.title,
|
||||
picUrl: getBilibiliProxyUrl(videoDetail.pic)
|
||||
},
|
||||
source: 'bilibili',
|
||||
count: item.count || 0,
|
||||
bilibiliData: {
|
||||
bvid,
|
||||
cid: page.cid
|
||||
}
|
||||
} as SongResult);
|
||||
} catch (error) {
|
||||
console.error('获取B站视频详情失败:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// 合并两种来源的数据，并保持原有顺序
|
||||
const newSongs = currentPageItems
|
||||
.map((item) => {
|
||||
if (item.source === 'bilibili') {
|
||||
return bilibiliSongs.find(
|
||||
(song) =>
|
||||
song.bilibiliData?.bvid === item.bilibiliData?.bvid &&
|
||||
song.bilibiliData?.cid === item.bilibiliData?.cid
|
||||
);
|
||||
}
|
||||
return neteaseSongs.find((song) => song.id === item.id);
|
||||
})
|
||||
.filter((song): song is SongResult => !!song);
|
||||
|
||||
if (currentPage.value === 1) {
|
||||
displayList.value = newSongs;
|
||||
} else {
|
||||
displayList.value = [...displayList.value, ...newSongs];
|
||||
}
|
||||
|
||||
noMore.value = displayList.value.length >= musicList.value.length;
|
||||
} catch (error) {
|
||||
console.error(t('history.getHistoryFailed'), error);
|
||||
} finally {
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
v-for="(line, index) in staticData.lrcArray"
|
||||
:key="index"
|
||||
class="lyric-line"
|
||||
:style="getDynamicLineStyle(line)"
|
||||
:style="lyricLineStyle"
|
||||
:class="{
|
||||
'lyric-line-current': index === currentIndex,
|
||||
'lyric-line-passed': index < currentIndex,
|
||||
@@ -172,16 +172,6 @@ const handleMouseLeave = () => {
|
||||
if (!lyricSetting.value.isLock) return;
|
||||
isHovering.value = false;
|
||||
windowData.electron.ipcRenderer.send('set-ignore-mouse', false);
|
||||
|
||||
// 强制重置背景色
|
||||
const lyricWindow = document.querySelector('.lyric-window') as HTMLElement;
|
||||
if (lyricWindow) {
|
||||
lyricWindow.style.background = 'transparent';
|
||||
// 使用 requestAnimationFrame 确保在下一帧重置
|
||||
requestAnimationFrame(() => {
|
||||
lyricWindow.style.background = 'transparent';
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 监听锁定状态变化
|
||||
@@ -217,41 +207,16 @@ const wrapperStyle = computed(() => {
|
||||
// 计算容器中心点
|
||||
const containerCenter = containerHeight.value / 2;
|
||||
|
||||
// 计算每行的实际高度
|
||||
const getLineHeight = (line: { text: string; trText: string }) => {
|
||||
const baseHeight = lineHeight.value;
|
||||
if (line.trText) {
|
||||
const extraHeight = Math.round(fontSize.value * 0.6 * 1.4);
|
||||
return baseHeight + extraHeight;
|
||||
}
|
||||
return baseHeight;
|
||||
};
|
||||
|
||||
// 计算当前行之前所有行的累积高度
|
||||
let accumulatedHeight = containerHeight.value * 0.2; // 顶部padding
|
||||
for (let i = 0; i < currentIndex.value; i++) {
|
||||
if (i < staticData.value.lrcArray.length) {
|
||||
accumulatedHeight += getLineHeight(staticData.value.lrcArray[i]);
|
||||
} else {
|
||||
accumulatedHeight += lineHeight.value;
|
||||
}
|
||||
}
|
||||
|
||||
// 加上当前行的一半高度，使其居中
|
||||
const currentLineHeight =
|
||||
currentIndex.value < staticData.value.lrcArray.length
|
||||
? getLineHeight(staticData.value.lrcArray[currentIndex.value])
|
||||
: lineHeight.value;
|
||||
accumulatedHeight += currentLineHeight;
|
||||
// 计算当前行到顶部的距离（包含padding）
|
||||
const currentLineTop =
|
||||
currentIndex.value * lineHeight.value + containerHeight.value * 0.2 + lineHeight.value; // 加上顶部padding
|
||||
|
||||
// 计算偏移量，使当前行居中
|
||||
const targetOffset = containerCenter - accumulatedHeight;
|
||||
const targetOffset = containerCenter - currentLineTop;
|
||||
|
||||
// 计算内容总高度（包含padding）
|
||||
let contentHeight = containerHeight.value * 0.4; // 上下padding总和
|
||||
for (const line of staticData.value.lrcArray) {
|
||||
contentHeight += getLineHeight(line);
|
||||
}
|
||||
const contentHeight =
|
||||
staticData.value.lrcArray.length * lineHeight.value + containerHeight.value * 0.4; // 上下padding各20vh
|
||||
|
||||
// 计算最小和最大偏移量
|
||||
const minOffset = -(contentHeight - containerHeight.value);
|
||||
@@ -266,25 +231,9 @@ const wrapperStyle = computed(() => {
|
||||
};
|
||||
});
|
||||
|
||||
// 新增：根据是否有翻译文本动态计算每行的样式
|
||||
const getDynamicLineStyle = (line: { text: string; trText: string }) => {
|
||||
// 默认行高
|
||||
const defaultHeight = lineHeight.value;
|
||||
|
||||
// 如果有翻译文本，增加额外高度
|
||||
if (line.trText) {
|
||||
// 计算翻译文本的额外高度 (字体大小的0.6倍 * 行高比例1.4)
|
||||
const extraHeight = Math.round(fontSize.value * 0.6 * 1.4);
|
||||
return {
|
||||
height: `${defaultHeight + extraHeight}px`
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
height: `${defaultHeight}px`
|
||||
};
|
||||
};
|
||||
|
||||
const lyricLineStyle = computed(() => ({
|
||||
height: `${lineHeight.value}px`
|
||||
}));
|
||||
// 更新容器高度和行高
|
||||
const updateContainerHeight = () => {
|
||||
if (!containerRef.value) return;
|
||||
@@ -643,12 +592,8 @@ const handleNext = () => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
html,
|
||||
body,
|
||||
#app {
|
||||
body {
|
||||
background-color: transparent !important;
|
||||
box-shadow: none !important;
|
||||
border: none !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -658,13 +603,14 @@ body,
|
||||
height: 100vh;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
background: transparent !important;
|
||||
background: transparent;
|
||||
user-select: none;
|
||||
transition: background-color 0.3s ease;
|
||||
transition: background-color 0.2s ease;
|
||||
cursor: default;
|
||||
border-radius: 14px;
|
||||
|
||||
&:hover {
|
||||
background: rgba(44, 44, 44, 0.466);
|
||||
.control-bar {
|
||||
&-show {
|
||||
opacity: 1;
|
||||
@@ -679,22 +625,16 @@ body,
|
||||
|
||||
&.dark {
|
||||
--text-color: #ffffff;
|
||||
--text-secondary: #ffffffea;
|
||||
--text-secondary: rgba(255, 255, 255, 0.6);
|
||||
--highlight-color: #1db954;
|
||||
--control-bg: rgba(124, 124, 124, 0.3);
|
||||
&:hover {
|
||||
background: rgba(44, 44, 44, 0.466) !important;
|
||||
}
|
||||
}
|
||||
|
||||
&.light {
|
||||
--text-color: #333333;
|
||||
--text-secondary: #39393989;
|
||||
--text-secondary: rgba(51, 51, 51, 0.6);
|
||||
--highlight-color: #1db954;
|
||||
--control-bg: rgba(255, 255, 255, 0.3);
|
||||
&:hover {
|
||||
background: rgba(0, 0, 0, 0.434) !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -150,39 +150,6 @@
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">{{ t('settings.playback.musicSources') }}</div>
|
||||
<div class="set-item-content">
|
||||
<div class="flex items-center gap-2">
|
||||
<n-switch v-model:value="setData.enableMusicUnblock">
|
||||
<template #checked>{{ t('common.on') }}</template>
|
||||
<template #unchecked>{{ t('common.off') }}</template>
|
||||
</n-switch>
|
||||
<span>{{ t('settings.playback.musicUnblockEnableDesc') }}</span>
|
||||
</div>
|
||||
<div v-if="setData.enableMusicUnblock" class="mt-2">
|
||||
<div class="text-sm">
|
||||
<span class="text-gray-500">{{ t('settings.playback.selectedMusicSources') }}</span>
|
||||
<span v-if="musicSources.length > 0" class="text-gray-400">
|
||||
{{ musicSources.map((source) => getSourceLabel(source)).join(', ') }}
|
||||
</span>
|
||||
<span v-else class="text-red-500 text-xs">
|
||||
{{ t('settings.playback.noMusicSources') }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<n-button
|
||||
size="small"
|
||||
:disabled="!setData.enableMusicUnblock"
|
||||
@click="showMusicSourcesModal = true"
|
||||
>
|
||||
{{ t('settings.playback.configureMusicSources') }}
|
||||
</n-button>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">{{ t('settings.playback.autoPlay') }}</div>
|
||||
@@ -244,19 +211,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">{{ t('settings.application.unlimitedDownload') }}</div>
|
||||
<div class="set-item-content">
|
||||
<n-switch v-model:value="setData.unlimitedDownload" class="mr-2">
|
||||
<template #checked>{{ t('common.on') }}</template>
|
||||
<template #unchecked>{{ t('common.off') }}</template>
|
||||
</n-switch>
|
||||
{{ t('settings.application.unlimitedDownloadDesc') }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">{{ t('settings.application.downloadPath') }}</div>
|
||||
@@ -503,51 +457,6 @@
|
||||
</n-checkbox-group>
|
||||
</n-space>
|
||||
</n-modal>
|
||||
|
||||
<!-- 音源设置弹窗 -->
|
||||
<n-modal
|
||||
v-model:show="showMusicSourcesModal"
|
||||
preset="dialog"
|
||||
:title="t('settings.playback.musicSources')"
|
||||
:positive-text="t('common.confirm')"
|
||||
:negative-text="t('common.cancel')"
|
||||
@positive-click="showMusicSourcesModal = false"
|
||||
@negative-click="showMusicSourcesModal = false"
|
||||
>
|
||||
<n-space vertical>
|
||||
<p>{{ t('settings.playback.musicSourcesDesc') }}</p>
|
||||
<n-checkbox-group v-model:value="musicSources">
|
||||
<n-grid :cols="2" :x-gap="12" :y-gap="8">
|
||||
<n-grid-item v-for="source in musicSourceOptions" :key="source.value">
|
||||
<n-checkbox :value="source.value">
|
||||
{{ source.label }}
|
||||
<template v-if="source.value === 'gdmusic'">
|
||||
<n-tooltip>
|
||||
<template #trigger>
|
||||
<n-icon size="16" class="ml-1 text-blue-500 cursor-help">
|
||||
<i class="ri-information-line"></i>
|
||||
</n-icon>
|
||||
</template>
|
||||
{{ t('settings.playback.gdmusicInfo') }}
|
||||
</n-tooltip>
|
||||
</template>
|
||||
</n-checkbox>
|
||||
</n-grid-item>
|
||||
</n-grid>
|
||||
</n-checkbox-group>
|
||||
<div v-if="musicSources.length === 0" class="text-red-500 text-sm">
|
||||
{{ t('settings.playback.musicSourcesWarning') }}
|
||||
</div>
|
||||
|
||||
<!-- GD音乐台设置 -->
|
||||
<div v-if="musicSources.includes('gdmusic')" class="mt-4 border-t pt-4 border-gray-200 dark:border-gray-700">
|
||||
<h3 class="text-base font-medium mb-2">GD音乐台(music.gdstudio.xyz)设置</h3>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mb-2">
|
||||
GD音乐台将自动尝试多个音乐平台进行解析，无需额外配置。优先级高于其他解析方式，但是请求可能较慢。感谢（music.gdstudio.xyz）
|
||||
</p>
|
||||
</div>
|
||||
</n-space>
|
||||
</n-modal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -572,11 +481,6 @@ import { checkUpdate, UpdateResult } from '@/utils/update';
|
||||
|
||||
import config from '../../../../package.json';
|
||||
|
||||
// 手动定义Platform类型，避免从主进程导入的问题
|
||||
type Platform = 'qq' | 'migu' | 'kugou' | 'pyncmd' | 'joox' | 'kuwo' | 'bilibili' | 'youtube' | 'gdmusic';
|
||||
// 所有平台
|
||||
const ALL_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'bilibili', 'youtube'];
|
||||
|
||||
const settingsStore = useSettingsStore();
|
||||
const userStore = useUserStore();
|
||||
|
||||
@@ -1060,42 +964,6 @@ onMounted(() => {
|
||||
handleScroll({ target: { scrollTop: 0 } });
|
||||
});
|
||||
});
|
||||
|
||||
// 音源设置相关
|
||||
const musicSourceOptions = ref([
|
||||
{ label: 'MiGu音乐', value: 'migu' },
|
||||
{ label: '酷狗音乐', value: 'kugou' },
|
||||
{ label: 'pyncmd', value: 'pyncmd' },
|
||||
{ label: '酷我音乐', value: 'kuwo' },
|
||||
{ label: 'Bilibili音乐', value: 'bilibili' },
|
||||
{ label: 'YouTube', value: 'youtube' },
|
||||
{ label: 'GD音乐台', value: 'gdmusic' }
|
||||
]);
|
||||
|
||||
// 已选择的音源列表
|
||||
const musicSources = computed({
|
||||
get: () => {
|
||||
if (!setData.value.enabledMusicSources) {
|
||||
return ALL_PLATFORMS;
|
||||
}
|
||||
return setData.value.enabledMusicSources as Platform[];
|
||||
},
|
||||
set: (newValue: Platform[]) => {
|
||||
// 确保至少选择一个音源
|
||||
const valuesToSet = newValue.length > 0 ? [...new Set(newValue)] : ALL_PLATFORMS;
|
||||
setData.value = {
|
||||
...setData.value,
|
||||
enabledMusicSources: valuesToSet
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
const showMusicSourcesModal = ref(false);
|
||||
|
||||
const getSourceLabel = (source: Platform) => {
|
||||
const sourceLabel = musicSourceOptions.value.find(s => s.value === source)?.label;
|
||||
return sourceLabel || source;
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
/**
|
||||
* 快捷键配置
|
||||
*/
|
||||
export interface ShortcutConfig {
|
||||
/** 快捷键字符串 */
|
||||
key: string;
|
||||
/** 是否启用 */
|
||||
enabled: boolean;
|
||||
/** 作用范围: global(全局) 或 app(仅应用内) */
|
||||
scope: 'global' | 'app';
|
||||
}
|
||||
|
||||
/**
|
||||
* 快捷键配置集合
|
||||
*/
|
||||
export interface ShortcutsConfig {
|
||||
[key: string]: ShortcutConfig;
|
||||
}
|
||||
Reference in New Issue
Block a user