mirror of
https://github.com/algerkong/AlgerMusicPlayer.git
synced 2026-04-07 00:50:50 +08:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f0f35dd51 | ||
|
|
be94d6ff8e | ||
|
|
1bdb8fcb4a | ||
|
|
914e043502 | ||
|
|
dfa175b8b2 | ||
|
|
a94e0efba5 | ||
|
|
573023600a | ||
|
|
041aad31b4 | ||
|
|
f652932d71 | ||
|
|
7efeb9492b | ||
|
|
055536eb5c | ||
|
|
14852fc8d3 | ||
|
|
9866e772df | ||
|
|
87ca0836b1 | ||
|
|
fa07c5a40c | ||
|
|
5dbfea240b | ||
|
|
c1344393c3 | ||
|
|
426888f77c | ||
|
|
45cbc15c0f | ||
|
|
072025a543 |
21
CHANGELOG.md
21
CHANGELOG.md
@@ -1,20 +1,15 @@
|
||||
# 更新日志
|
||||
|
||||
## v3.6.0
|
||||
## v3.8.0
|
||||
### ✨ 新功能
|
||||
- 添加歌手详情功能
|
||||
- 优化音乐解析(添加更多音源 减少歌曲不匹配问题)
|
||||
- 添加搜索记录
|
||||
- 添加关闭动画功能
|
||||
- 添加歌词缓存功能
|
||||
- 优化音乐播放控制和系统控制功能
|
||||
- 添加歌词界面样式配置功能
|
||||
- 添加字体配置功能,支持歌词页面或全局字体配置
|
||||
- 实现应用单例模式,防止重复启动
|
||||
|
||||
### 🐞 Bug修复
|
||||
- 修复下载文件类型问题
|
||||
|
||||
### 🎈 性能优化
|
||||
- 优化页面样式
|
||||
- 优化留言显示
|
||||
### ⚡ 优化
|
||||
- 优化播放体验,去除歌曲地址缓存
|
||||
- 优化播放下一首逻辑
|
||||
- 优化播放控制逻辑
|
||||
|
||||
|
||||
## 咖啡☕️
|
||||
|
||||
32
README.md
32
README.md
@@ -1,17 +1,24 @@
|
||||
# Alger Music Player
|
||||
主要功能如下
|
||||
|
||||
- 音乐推荐
|
||||
- 网易云登录
|
||||
- 播放历史 歌曲收藏
|
||||
- 桌面歌词
|
||||
- 歌单 mv 搜索 专辑等功能
|
||||
- 识别无法播放歌曲 并解析播放
|
||||
- 主题切换 更新检测
|
||||
- 本地服务 不依赖线上服务
|
||||
- 可听周杰伦(搜索专辑)
|
||||
- 支持歌曲下载(歌曲右键)
|
||||
- 支持音质选择(网易云VIP)
|
||||
- 🎵 音乐推荐
|
||||
- 🔐 网易云账号登录与同步
|
||||
- 📝 功能
|
||||
- 播放历史记录
|
||||
- 歌曲收藏管理
|
||||
- 自定义快捷键配置
|
||||
- 🎨 界面与交互
|
||||
- 沉浸式歌词显示(点击左下角封面进入)
|
||||
- 独立桌面歌词窗口
|
||||
- 明暗主题切换
|
||||
- 🎼 音乐功能
|
||||
- 支持歌单、MV、专辑等完整音乐服务
|
||||
- 灰色音乐资源解析(基于 @unblockneteasemusic/server)
|
||||
- 高品质音乐试听(需网易云VIP)
|
||||
- 音乐文件下载(支持右键下载和批量下载)
|
||||
- 🚀 技术特性
|
||||
- 本地化服务,无需依赖在线API (基于 netease-cloud-music-api)
|
||||
- 自动更新检测
|
||||
- 全平台适配(Desktop & Web & Mobile Web)
|
||||
|
||||
## 项目简介
|
||||
一个基于 electron typescript vue3 的桌面音乐播放器 适配 web端 桌面端 web移动端
|
||||
@@ -26,6 +33,7 @@ QQ群:789288579
|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
## 技术栈
|
||||
|
||||
|
||||
BIN
docs/image4.png
Normal file
BIN
docs/image4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 MiB |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "AlgerMusicPlayer",
|
||||
"version": "3.6.0",
|
||||
"version": "3.8.0",
|
||||
"description": "Alger Music Player",
|
||||
"author": "Alger <algerkc@qq.com>",
|
||||
"main": "./out/main/index.js",
|
||||
@@ -26,6 +26,7 @@
|
||||
"@unblockneteasemusic/server": "^0.27.8-patch.1",
|
||||
"electron-store": "^8.1.0",
|
||||
"electron-updater": "^6.1.7",
|
||||
"font-list": "^1.5.1",
|
||||
"netease-cloud-music-api-alger": "^4.25.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
@@ -36,6 +37,7 @@
|
||||
"@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": "^7.0.0",
|
||||
"@typescript-eslint/parser": "^7.0.0",
|
||||
"@vitejs/plugin-vue": "^5.0.5",
|
||||
@@ -45,6 +47,7 @@
|
||||
"@vue/runtime-core": "^3.5.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",
|
||||
@@ -68,6 +71,7 @@
|
||||
"remixicon": "^4.2.0",
|
||||
"sass": "^1.82.0",
|
||||
"tailwindcss": "^3.4.15",
|
||||
"tinycolor2": "^1.6.0",
|
||||
"typescript": "^5.5.2",
|
||||
"unplugin-auto-import": "^0.18.2",
|
||||
"unplugin-vue-components": "^0.27.4",
|
||||
@@ -78,8 +82,7 @@
|
||||
"vue": "^3.4.30",
|
||||
"vue-router": "^4.4.3",
|
||||
"vue-tsc": "^2.0.22",
|
||||
"vuex": "^4.1.0",
|
||||
"animate.css": "^4.1.1"
|
||||
"vuex": "^4.1.0"
|
||||
},
|
||||
"build": {
|
||||
"appId": "com.alger.music",
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import { electronApp, optimizer } from '@electron-toolkit/utils';
|
||||
import { app, globalShortcut, ipcMain, nativeImage } from 'electron';
|
||||
import { app, ipcMain, nativeImage } from 'electron';
|
||||
import { join } from 'path';
|
||||
|
||||
import { loadLyricWindow } from './lyric';
|
||||
import { initializeCacheManager } from './modules/cache';
|
||||
import { initializeConfig } from './modules/config';
|
||||
import { initializeFileManager } from './modules/fileManager';
|
||||
import { initializeFonts } from './modules/fonts';
|
||||
import { initializeShortcuts, registerShortcuts } from './modules/shortcuts';
|
||||
import { initializeTray } from './modules/tray';
|
||||
import { createMainWindow, initializeWindowManager } from './modules/window';
|
||||
import { startMusicApi } from './server';
|
||||
@@ -26,12 +27,12 @@ let mainWindow: Electron.BrowserWindow;
|
||||
function initialize() {
|
||||
// 初始化配置管理
|
||||
initializeConfig();
|
||||
// 初始化缓存管理
|
||||
initializeCacheManager();
|
||||
// 初始化文件管理
|
||||
initializeFileManager();
|
||||
// 初始化窗口管理
|
||||
initializeWindowManager();
|
||||
// 初始化字体管理
|
||||
initializeFonts();
|
||||
|
||||
// 创建主窗口
|
||||
mainWindow = createMainWindow(icon);
|
||||
@@ -44,52 +45,67 @@ function initialize() {
|
||||
|
||||
// 加载歌词窗口
|
||||
loadLyricWindow(ipcMain, mainWindow);
|
||||
|
||||
// 初始化快捷键
|
||||
initializeShortcuts(mainWindow);
|
||||
}
|
||||
|
||||
// 应用程序准备就绪时的处理
|
||||
app.whenReady().then(() => {
|
||||
// 设置应用ID
|
||||
electronApp.setAppUserModelId('com.alger.music');
|
||||
// 检查是否为第一个实例
|
||||
const isSingleInstance = app.requestSingleInstanceLock();
|
||||
|
||||
// 监听窗口创建事件
|
||||
app.on('browser-window-created', (_, window) => {
|
||||
optimizer.watchWindowShortcuts(window);
|
||||
});
|
||||
|
||||
// 初始化应用
|
||||
initialize();
|
||||
|
||||
// macOS 激活应用时的处理
|
||||
app.on('activate', () => {
|
||||
if (mainWindow === null) initialize();
|
||||
});
|
||||
});
|
||||
|
||||
// 应用程序准备就绪后的快捷键设置
|
||||
app.on('ready', () => {
|
||||
globalShortcut.register('CommandOrControl+Alt+Shift+M', () => {
|
||||
if (mainWindow.isVisible()) {
|
||||
mainWindow.hide();
|
||||
} else {
|
||||
if (!isSingleInstance) {
|
||||
app.quit();
|
||||
} else {
|
||||
// 当第二个实例启动时,将焦点转移到第一个实例的窗口
|
||||
app.on('second-instance', () => {
|
||||
if (mainWindow) {
|
||||
if (mainWindow.isMinimized()) {
|
||||
mainWindow.restore();
|
||||
}
|
||||
mainWindow.show();
|
||||
mainWindow.focus();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// 所有窗口关闭时的处理
|
||||
app.on('window-all-closed', () => {
|
||||
if (process.platform !== 'darwin') {
|
||||
app.quit();
|
||||
}
|
||||
});
|
||||
// 应用程序准备就绪时的处理
|
||||
app.whenReady().then(() => {
|
||||
// 设置应用ID
|
||||
electronApp.setAppUserModelId('com.alger.music');
|
||||
|
||||
// 重启应用
|
||||
ipcMain.on('restart', () => {
|
||||
app.relaunch();
|
||||
app.exit(0);
|
||||
});
|
||||
// 监听窗口创建事件
|
||||
app.on('browser-window-created', (_, window) => {
|
||||
optimizer.watchWindowShortcuts(window);
|
||||
});
|
||||
|
||||
// 获取系统架构信息
|
||||
ipcMain.on('get-arch', (event) => {
|
||||
event.returnValue = process.arch;
|
||||
});
|
||||
// 初始化应用
|
||||
initialize();
|
||||
|
||||
// macOS 激活应用时的处理
|
||||
app.on('activate', () => {
|
||||
if (mainWindow === null) initialize();
|
||||
});
|
||||
});
|
||||
|
||||
// 监听快捷键更新
|
||||
ipcMain.on('update-shortcuts', () => {
|
||||
registerShortcuts(mainWindow);
|
||||
});
|
||||
|
||||
// 所有窗口关闭时的处理
|
||||
app.on('window-all-closed', () => {
|
||||
if (process.platform !== 'darwin') {
|
||||
app.quit();
|
||||
}
|
||||
});
|
||||
|
||||
// 重启应用
|
||||
ipcMain.on('restart', () => {
|
||||
app.relaunch();
|
||||
app.exit(0);
|
||||
});
|
||||
|
||||
// 获取系统架构信息
|
||||
ipcMain.on('get-arch', (event) => {
|
||||
event.returnValue = process.arch;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2,16 +2,31 @@ import { app, ipcMain } from 'electron';
|
||||
import Store from 'electron-store';
|
||||
|
||||
import set from '../set.json';
|
||||
import { defaultShortcuts } from './shortcuts';
|
||||
|
||||
interface StoreType {
|
||||
set: {
|
||||
isProxy: boolean;
|
||||
noAnimate: boolean;
|
||||
animationSpeed: number;
|
||||
author: string;
|
||||
authorUrl: string;
|
||||
musicApiPort: number;
|
||||
type SetConfig = {
|
||||
isProxy: boolean;
|
||||
proxyConfig: {
|
||||
enable: boolean;
|
||||
protocol: string;
|
||||
host: string;
|
||||
port: number;
|
||||
};
|
||||
enableRealIP: boolean;
|
||||
realIP: string;
|
||||
noAnimate: boolean;
|
||||
animationSpeed: number;
|
||||
author: string;
|
||||
authorUrl: string;
|
||||
musicApiPort: number;
|
||||
closeAction: 'ask' | 'minimize' | 'close';
|
||||
musicQuality: string;
|
||||
fontFamily: string;
|
||||
fontScope: 'global' | 'lyric';
|
||||
};
|
||||
interface StoreType {
|
||||
set: SetConfig;
|
||||
shortcuts: typeof defaultShortcuts;
|
||||
}
|
||||
|
||||
let store: Store<StoreType>;
|
||||
@@ -23,7 +38,8 @@ export function initializeConfig() {
|
||||
store = new Store<StoreType>({
|
||||
name: 'config',
|
||||
defaults: {
|
||||
set
|
||||
set: set as SetConfig,
|
||||
shortcuts: defaultShortcuts
|
||||
}
|
||||
});
|
||||
|
||||
@@ -41,3 +57,7 @@ export function initializeConfig() {
|
||||
|
||||
return store;
|
||||
}
|
||||
|
||||
export function getStore() {
|
||||
return store;
|
||||
}
|
||||
|
||||
@@ -317,8 +317,8 @@ async function downloadMusic(
|
||||
|
||||
// 等待下载完成
|
||||
await new Promise((resolve, reject) => {
|
||||
writer!.on('finish', resolve);
|
||||
writer!.on('error', reject);
|
||||
writer!.on('finish', () => resolve(undefined));
|
||||
writer!.on('error', (error) => reject(error));
|
||||
response.data.pipe(writer!);
|
||||
});
|
||||
|
||||
|
||||
42
src/main/modules/fonts.ts
Normal file
42
src/main/modules/fonts.ts
Normal file
@@ -0,0 +1,42 @@
|
||||
import { ipcMain } from 'electron';
|
||||
import { getFonts } from 'font-list';
|
||||
|
||||
/**
|
||||
* 清理字体名称
|
||||
* @param fontName 原始字体名称
|
||||
* @returns 清理后的字体名称
|
||||
*/
|
||||
function cleanFontName(fontName: string): string {
|
||||
return fontName
|
||||
.trim()
|
||||
.replace(/^["']|["']$/g, '') // 移除首尾的引号
|
||||
.replace(/\s+/g, ' '); // 将多个空格替换为单个空格
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取系统字体列表
|
||||
*/
|
||||
async function getSystemFonts(): Promise<string[]> {
|
||||
try {
|
||||
// 使用 font-list 获取系统字体
|
||||
const fonts = await getFonts();
|
||||
// 清理字体名称并去重
|
||||
const cleanedFonts = [...new Set(fonts.map(cleanFontName))];
|
||||
// 添加系统默认字体并排序
|
||||
return ['system-ui', ...cleanedFonts].sort();
|
||||
} catch (error) {
|
||||
console.error('获取系统字体失败:', error);
|
||||
// 如果获取失败,至少返回系统默认字体
|
||||
return ['system-ui'];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化字体管理模块
|
||||
*/
|
||||
export function initializeFonts() {
|
||||
// 添加获取系统字体的 IPC 处理
|
||||
ipcMain.handle('get-system-fonts', async () => {
|
||||
return await getSystemFonts();
|
||||
});
|
||||
}
|
||||
88
src/main/modules/shortcuts.ts
Normal file
88
src/main/modules/shortcuts.ts
Normal file
@@ -0,0 +1,88 @@
|
||||
import { globalShortcut, ipcMain } from 'electron';
|
||||
|
||||
import { getStore } from './config';
|
||||
|
||||
// 添加获取平台信息的 IPC 处理程序
|
||||
ipcMain.on('get-platform', (event) => {
|
||||
event.returnValue = process.platform;
|
||||
});
|
||||
|
||||
// 定义默认快捷键
|
||||
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) {
|
||||
mainWindowRef = mainWindow;
|
||||
const store = getStore();
|
||||
const shortcuts = store.get('shortcuts');
|
||||
|
||||
// 注销所有已注册的快捷键
|
||||
globalShortcut.unregisterAll();
|
||||
|
||||
// 显示/隐藏主窗口
|
||||
globalShortcut.register(shortcuts.toggleWindow, () => {
|
||||
if (mainWindow.isVisible()) {
|
||||
mainWindow.hide();
|
||||
} else {
|
||||
mainWindow.show();
|
||||
}
|
||||
});
|
||||
|
||||
// 播放/暂停
|
||||
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');
|
||||
});
|
||||
}
|
||||
|
||||
// 初始化快捷键
|
||||
export function initializeShortcuts(mainWindow: Electron.BrowserWindow) {
|
||||
mainWindowRef = mainWindow;
|
||||
registerShortcuts(mainWindow);
|
||||
|
||||
// 监听禁用快捷键事件
|
||||
ipcMain.on('disable-shortcuts', () => {
|
||||
globalShortcut.unregisterAll();
|
||||
});
|
||||
|
||||
// 监听启用快捷键事件
|
||||
ipcMain.on('enable-shortcuts', () => {
|
||||
if (mainWindowRef) {
|
||||
registerShortcuts(mainWindowRef);
|
||||
}
|
||||
});
|
||||
}
|
||||
90
src/main/modules/update.ts
Normal file
90
src/main/modules/update.ts
Normal file
@@ -0,0 +1,90 @@
|
||||
import axios from 'axios';
|
||||
import { exec } from 'child_process';
|
||||
import { app, BrowserWindow, ipcMain } from 'electron';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
|
||||
export function setupUpdateHandlers(_mainWindow: BrowserWindow) {
|
||||
ipcMain.on('start-download', async (event, url: string) => {
|
||||
try {
|
||||
const response = await axios({
|
||||
url,
|
||||
method: 'GET',
|
||||
responseType: 'stream',
|
||||
onDownloadProgress: (progressEvent: { loaded: number; total?: number }) => {
|
||||
if (!progressEvent.total) return;
|
||||
const percent = Math.round((progressEvent.loaded / progressEvent.total) * 100);
|
||||
const downloaded = (progressEvent.loaded / 1024 / 1024).toFixed(2);
|
||||
const total = (progressEvent.total / 1024 / 1024).toFixed(2);
|
||||
event.sender.send('download-progress', percent, `已下载 ${downloaded}MB / ${total}MB`);
|
||||
}
|
||||
});
|
||||
|
||||
const fileName = url.split('/').pop() || 'update.exe';
|
||||
const downloadPath = path.join(app.getPath('downloads'), fileName);
|
||||
|
||||
// 创建写入流
|
||||
const writer = fs.createWriteStream(downloadPath);
|
||||
|
||||
// 将响应流写入文件
|
||||
response.data.pipe(writer);
|
||||
|
||||
// 处理写入完成
|
||||
writer.on('finish', () => {
|
||||
event.sender.send('download-complete', true, downloadPath);
|
||||
});
|
||||
|
||||
// 处理写入错误
|
||||
writer.on('error', (error) => {
|
||||
console.error('Write file error:', error);
|
||||
event.sender.send('download-complete', false, '');
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Download failed:', error);
|
||||
event.sender.send('download-complete', false, '');
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.on('install-update', (_event, filePath: string) => {
|
||||
if (!fs.existsSync(filePath)) {
|
||||
console.error('Installation file not found:', filePath);
|
||||
return;
|
||||
}
|
||||
|
||||
const { platform } = process;
|
||||
|
||||
// 关闭当前应用
|
||||
app.quit();
|
||||
|
||||
// 根据不同平台执行安装
|
||||
if (platform === 'win32') {
|
||||
exec(`"${filePath}"`, (error) => {
|
||||
if (error) {
|
||||
console.error('Error starting installer:', error);
|
||||
}
|
||||
});
|
||||
} else if (platform === 'darwin') {
|
||||
// 挂载 DMG 文件
|
||||
exec(`open "${filePath}"`, (error) => {
|
||||
if (error) {
|
||||
console.error('Error opening DMG:', error);
|
||||
}
|
||||
});
|
||||
} else if (platform === 'linux') {
|
||||
const ext = path.extname(filePath);
|
||||
if (ext === '.AppImage') {
|
||||
exec(`chmod +x "${filePath}" && "${filePath}"`, (error) => {
|
||||
if (error) {
|
||||
console.error('Error running AppImage:', error);
|
||||
}
|
||||
});
|
||||
} else if (ext === '.deb') {
|
||||
exec(`pkexec dpkg -i "${filePath}"`, (error) => {
|
||||
if (error) {
|
||||
console.error('Error installing deb package:', error);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -14,5 +14,7 @@
|
||||
"authorUrl": "https://github.com/algerkong",
|
||||
"musicApiPort": 30488,
|
||||
"closeAction": "ask",
|
||||
"musicQuality": "higher"
|
||||
"musicQuality": "higher",
|
||||
"fontFamily": "system-ui",
|
||||
"fontScope": "global"
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import match from '@unblockneteasemusic/server';
|
||||
import Store from 'electron-store';
|
||||
|
||||
type Platform = 'qq' | 'migu' | 'kugou' | 'pyncmd' | 'joox' | 'kuwo' | 'bilibili' | 'youtube';
|
||||
|
||||
@@ -28,73 +27,6 @@ interface UnblockResult {
|
||||
};
|
||||
}
|
||||
|
||||
interface CacheData extends UnblockResult {
|
||||
timestamp: number;
|
||||
}
|
||||
|
||||
interface CacheStore {
|
||||
[key: string]: CacheData;
|
||||
}
|
||||
|
||||
// 初始化缓存存储
|
||||
const store = new Store<CacheStore>({
|
||||
name: 'unblock-cache'
|
||||
});
|
||||
|
||||
// 缓存过期时间(24小时)
|
||||
const CACHE_EXPIRY = 24 * 60 * 60 * 1000;
|
||||
|
||||
/**
|
||||
* 检查缓存是否有效
|
||||
* @param cacheData 缓存数据
|
||||
* @returns boolean
|
||||
*/
|
||||
const isCacheValid = (cacheData: CacheData | null): boolean => {
|
||||
if (!cacheData) return false;
|
||||
const now = Date.now();
|
||||
return now - cacheData.timestamp < CACHE_EXPIRY;
|
||||
};
|
||||
|
||||
/**
|
||||
* 从缓存中获取数据
|
||||
* @param id 歌曲ID
|
||||
* @returns CacheData | null
|
||||
*/
|
||||
const getFromCache = (id: string | number): CacheData | null => {
|
||||
const cacheData = store.get(String(id)) as CacheData | null;
|
||||
if (isCacheValid(cacheData)) {
|
||||
return cacheData;
|
||||
}
|
||||
// 清除过期缓存
|
||||
store.delete(String(id));
|
||||
return null;
|
||||
};
|
||||
|
||||
/**
|
||||
* 将数据存入缓存
|
||||
* @param id 歌曲ID
|
||||
* @param data 解析结果
|
||||
*/
|
||||
const saveToCache = (id: string | number, data: UnblockResult): void => {
|
||||
const cacheData: CacheData = {
|
||||
...data,
|
||||
timestamp: Date.now()
|
||||
};
|
||||
store.set(String(id), cacheData);
|
||||
};
|
||||
|
||||
/**
|
||||
* 清理过期缓存
|
||||
*/
|
||||
const cleanExpiredCache = (): void => {
|
||||
const allData = store.store;
|
||||
Object.entries(allData).forEach(([id, data]) => {
|
||||
if (!isCacheValid(data)) {
|
||||
store.delete(id);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 音乐解析函数
|
||||
* @param id 歌曲ID
|
||||
@@ -107,12 +39,6 @@ const unblockMusic = async (
|
||||
songData: SongData,
|
||||
retryCount = 3
|
||||
): Promise<UnblockResult> => {
|
||||
// 检查缓存
|
||||
const cachedData = getFromCache(id);
|
||||
if (cachedData) {
|
||||
return cachedData;
|
||||
}
|
||||
|
||||
// 所有可用平台
|
||||
const platforms: Platform[] = ['migu', 'kugou', 'pyncmd', 'joox', 'kuwo', 'bilibili', 'youtube'];
|
||||
|
||||
@@ -128,9 +54,6 @@ const unblockMusic = async (
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 保存到缓存
|
||||
saveToCache(id, result);
|
||||
return result;
|
||||
} catch (err) {
|
||||
if (attempt < retryCount) {
|
||||
@@ -149,14 +72,4 @@ const unblockMusic = async (
|
||||
return retry(1);
|
||||
};
|
||||
|
||||
// 定期清理过期缓存(每小时执行一次)
|
||||
setInterval(cleanExpiredCache, 60 * 60 * 1000);
|
||||
|
||||
export {
|
||||
cleanExpiredCache, // 导出清理缓存函数,以便手动调用
|
||||
type Platform,
|
||||
type ResponseData,
|
||||
type SongData,
|
||||
unblockMusic,
|
||||
type UnblockResult
|
||||
};
|
||||
export { type Platform, type ResponseData, type SongData, unblockMusic, type UnblockResult };
|
||||
|
||||
@@ -14,11 +14,18 @@ const api = {
|
||||
unblockMusic: (id) => ipcRenderer.invoke('unblock-music', id),
|
||||
// 歌词缓存相关
|
||||
invoke: (channel: string, ...args: any[]) => {
|
||||
const validChannels = ['get-cached-lyric', 'cache-lyric', 'clear-lyric-cache'];
|
||||
const validChannels = [
|
||||
'get-lyrics',
|
||||
'clear-lyrics-cache',
|
||||
'get-system-fonts',
|
||||
'get-cached-lyric',
|
||||
'cache-lyric',
|
||||
'clear-lyric-cache'
|
||||
];
|
||||
if (validChannels.includes(channel)) {
|
||||
return ipcRenderer.invoke(channel, ...args);
|
||||
}
|
||||
return Promise.reject(new Error(`Invalid channel: ${channel}`));
|
||||
return Promise.reject(new Error(`未授权的 IPC 通道: ${channel}`));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { darkTheme, lightTheme } from 'naive-ui';
|
||||
import { onMounted } from 'vue';
|
||||
import { computed, onMounted, watch } from 'vue';
|
||||
|
||||
import homeRouter from '@/router/home';
|
||||
import store from '@/store';
|
||||
@@ -24,9 +24,45 @@ const theme = computed(() => {
|
||||
return store.state.theme;
|
||||
});
|
||||
|
||||
// 监听字体变化并应用
|
||||
watch(
|
||||
() => [store.state.setData.fontFamily, store.state.setData.fontScope],
|
||||
([newFont, fontScope]) => {
|
||||
const appElement = document.body;
|
||||
if (!appElement) return;
|
||||
|
||||
const defaultFonts =
|
||||
'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif';
|
||||
|
||||
// 只有在全局模式下才应用字体
|
||||
if (fontScope !== 'global') {
|
||||
appElement.style.fontFamily = defaultFonts;
|
||||
return;
|
||||
}
|
||||
|
||||
if (newFont === 'system-ui') {
|
||||
appElement.style.fontFamily = defaultFonts;
|
||||
} else {
|
||||
// 处理多个字体,确保每个字体名都被正确引用
|
||||
const fontList = newFont.split(',').map((font) => {
|
||||
const trimmedFont = font.trim();
|
||||
// 如果字体名包含空格或特殊字符,添加引号(如果还没有引号的话)
|
||||
return /[\s'"()]/.test(trimmedFont) && !/^['"].*['"]$/.test(trimmedFont)
|
||||
? `"${trimmedFont}"`
|
||||
: trimmedFont;
|
||||
});
|
||||
|
||||
// 将选择的字体和默认字体组合
|
||||
appElement.style.fontFamily = `${fontList.join(', ')}, ${defaultFonts}`;
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
onMounted(() => {
|
||||
store.dispatch('initializeSettings');
|
||||
store.dispatch('initializeTheme');
|
||||
store.dispatch('initializeSystemFonts');
|
||||
if (isMobile.value) {
|
||||
store.commit(
|
||||
'setMenus',
|
||||
@@ -36,7 +72,7 @@ onMounted(() => {
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
<style lang="scss">
|
||||
.app-container {
|
||||
@apply h-full w-full;
|
||||
user-select: none;
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
import { musicDB } from '@/hooks/MusicHook';
|
||||
import store from '@/store';
|
||||
import type { ILyric } from '@/type/lyric';
|
||||
import { isElectron } from '@/utils';
|
||||
import request from '@/utils/request';
|
||||
import requestMusic from '@/utils/request_music';
|
||||
|
||||
const { addData, getData, deleteData } = musicDB;
|
||||
|
||||
// 获取音乐音质详情
|
||||
export const getMusicQualityDetail = (id: number) => {
|
||||
return request.get('/song/music/detail', { params: { id } });
|
||||
@@ -37,24 +40,31 @@ export const getMusicDetail = (ids: Array<number>) => {
|
||||
|
||||
// 根据音乐Id获取音乐歌词
|
||||
export const getMusicLrc = async (id: number) => {
|
||||
if (isElectron) {
|
||||
// 先尝试从缓存获取
|
||||
const cachedLyric = await window.api.invoke('get-cached-lyric', id);
|
||||
console.log('cachedLyric', cachedLyric);
|
||||
if (cachedLyric) {
|
||||
return { data: cachedLyric };
|
||||
const TEN_DAYS_MS = 10 * 24 * 60 * 60 * 1000; // 10天的毫秒数
|
||||
|
||||
try {
|
||||
// 尝试获取缓存的歌词
|
||||
const cachedLyric = await getData('music_lyric', id);
|
||||
if (cachedLyric?.createTime && Date.now() - cachedLyric.createTime < TEN_DAYS_MS) {
|
||||
return { ...cachedLyric };
|
||||
}
|
||||
|
||||
// 获取新的歌词数据
|
||||
const res = await request.get<ILyric>('/lyric', { params: { id } });
|
||||
|
||||
// 只有在成功获取新数据后才删除旧缓存并添加新缓存
|
||||
if (res?.data) {
|
||||
if (cachedLyric) {
|
||||
await deleteData('music_lyric', id);
|
||||
}
|
||||
addData('music_lyric', { id, data: res.data, createTime: Date.now() });
|
||||
}
|
||||
|
||||
return res;
|
||||
} catch (error) {
|
||||
console.error('获取歌词失败:', error);
|
||||
throw error; // 向上抛出错误,让调用者处理
|
||||
}
|
||||
|
||||
// 如果缓存中没有,则从服务器获取
|
||||
const res = await request.get<ILyric>('/lyric', { params: { id } });
|
||||
|
||||
// 缓存完整的响应数据
|
||||
if (isElectron && res) {
|
||||
await window.api.invoke('cache-lyric', id, res.data);
|
||||
}
|
||||
|
||||
return res;
|
||||
};
|
||||
|
||||
export const getParsingMusicUrl = (id: number, data: any) => {
|
||||
|
||||
3687
src/renderer/assets/css/animate.css
vendored
3687
src/renderer/assets/css/animate.css
vendored
File diff suppressed because it is too large
Load Diff
@@ -9,3 +9,7 @@ body {
|
||||
border-radius: 0.5rem !important;
|
||||
overflow: hidden !important;
|
||||
}
|
||||
.n-popover:has(.transparent-popover ) {
|
||||
background-color: transparent !important;
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
9
src/renderer/components.d.ts
vendored
9
src/renderer/components.d.ts
vendored
@@ -22,14 +22,20 @@ declare module 'vue' {
|
||||
NEmpty: typeof import('naive-ui')['NEmpty']
|
||||
NForm: typeof import('naive-ui')['NForm']
|
||||
NFormItem: typeof import('naive-ui')['NFormItem']
|
||||
NIcon: typeof import('naive-ui')['NIcon']
|
||||
NImage: typeof import('naive-ui')['NImage']
|
||||
NInput: typeof import('naive-ui')['NInput']
|
||||
NInputNumber: typeof import('naive-ui')['NInputNumber']
|
||||
NLayout: typeof import('naive-ui')['NLayout']
|
||||
NList: typeof import('naive-ui')['NList']
|
||||
NListItem: typeof import('naive-ui')['NListItem']
|
||||
NMessageProvider: typeof import('naive-ui')['NMessageProvider']
|
||||
NModal: typeof import('naive-ui')['NModal']
|
||||
NPopover: typeof import('naive-ui')['NPopover']
|
||||
NProgress: typeof import('naive-ui')['NProgress']
|
||||
NRadio: typeof import('naive-ui')['NRadio']
|
||||
NRadioButton: typeof import('naive-ui')['NRadioButton']
|
||||
NRadioGroup: typeof import('naive-ui')['NRadioGroup']
|
||||
NScrollbar: typeof import('naive-ui')['NScrollbar']
|
||||
NSelect: typeof import('naive-ui')['NSelect']
|
||||
NSlider: typeof import('naive-ui')['NSlider']
|
||||
@@ -39,6 +45,9 @@ declare module 'vue' {
|
||||
NTabPane: typeof import('naive-ui')['NTabPane']
|
||||
NTabs: typeof import('naive-ui')['NTabs']
|
||||
NTag: typeof import('naive-ui')['NTag']
|
||||
NTooltip: typeof import('naive-ui')['NTooltip']
|
||||
NTransfer: typeof import('naive-ui')['NTransfer']
|
||||
NVirtualList: typeof import('naive-ui')['NVirtualList']
|
||||
RouterLink: typeof import('vue-router')['RouterLink']
|
||||
RouterView: typeof import('vue-router')['RouterView']
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
mask-closable
|
||||
:style="{ backgroundColor: 'transparent' }"
|
||||
:to="`#layout-main`"
|
||||
:z-index="9998"
|
||||
:z-index="zIndex"
|
||||
@mask-click="close"
|
||||
>
|
||||
<div class="music-page">
|
||||
@@ -89,6 +89,7 @@ const props = withDefaults(
|
||||
defineProps<{
|
||||
show: boolean;
|
||||
name: string;
|
||||
zIndex?: number;
|
||||
songList: any[];
|
||||
loading?: boolean;
|
||||
listInfo?: {
|
||||
@@ -99,7 +100,8 @@ const props = withDefaults(
|
||||
}>(),
|
||||
{
|
||||
loading: false,
|
||||
cover: true
|
||||
cover: true,
|
||||
zIndex: 9996
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
91
src/renderer/components/ShortcutToast.vue
Normal file
91
src/renderer/components/ShortcutToast.vue
Normal file
@@ -0,0 +1,91 @@
|
||||
<template>
|
||||
<transition name="shortcut-toast">
|
||||
<div v-if="visible" class="shortcut-toast">
|
||||
<div class="shortcut-toast-content">
|
||||
<div class="shortcut-toast-icon">
|
||||
<i :class="icon"></i>
|
||||
</div>
|
||||
<div class="shortcut-toast-text">{{ text }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</transition>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onBeforeUnmount, ref } from 'vue';
|
||||
|
||||
const visible = ref(false);
|
||||
const text = ref('');
|
||||
const icon = ref('');
|
||||
let timer: NodeJS.Timeout | null = null;
|
||||
|
||||
const show = (message: string, iconName: string) => {
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
|
||||
text.value = message;
|
||||
icon.value = iconName;
|
||||
visible.value = true;
|
||||
|
||||
timer = setTimeout(() => {
|
||||
visible.value = false;
|
||||
// 在动画结束后触发销毁事件
|
||||
setTimeout(() => {
|
||||
emit('destroy');
|
||||
}, 300);
|
||||
}, 1500);
|
||||
};
|
||||
|
||||
// 清理定时器
|
||||
onBeforeUnmount(() => {
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
});
|
||||
|
||||
const emit = defineEmits(['destroy']);
|
||||
|
||||
// 暴露方法给父组件
|
||||
defineExpose({
|
||||
show
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.shortcut-toast {
|
||||
@apply fixed left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 z-[9999];
|
||||
@apply flex items-center justify-center;
|
||||
|
||||
&-content {
|
||||
@apply flex flex-col items-center gap-2 p-4 rounded-lg;
|
||||
@apply bg-light-200 bg-opacity-70 dark:bg-dark-200 dark:bg-opacity-90;
|
||||
@apply text-dark-100 dark:text-light-100;
|
||||
@apply shadow-lg backdrop-blur-sm;
|
||||
min-width: 120px;
|
||||
}
|
||||
|
||||
&-icon {
|
||||
@apply text-3xl;
|
||||
}
|
||||
|
||||
&-text {
|
||||
@apply text-sm font-medium text-center;
|
||||
}
|
||||
}
|
||||
|
||||
.shortcut-toast-enter-active,
|
||||
.shortcut-toast-leave-active {
|
||||
@apply transition-all duration-300;
|
||||
}
|
||||
|
||||
.shortcut-toast-enter-from,
|
||||
.shortcut-toast-leave-to {
|
||||
@apply opacity-0 scale-90;
|
||||
}
|
||||
|
||||
.shortcut-toast-enter-to,
|
||||
.shortcut-toast-leave-from {
|
||||
@apply opacity-100 scale-100;
|
||||
}
|
||||
</style>
|
||||
@@ -59,6 +59,7 @@
|
||||
v-for="album in albums"
|
||||
:key="album.id"
|
||||
shape="square"
|
||||
:z-index="9998"
|
||||
:item="{
|
||||
id: album.id,
|
||||
picUrl: album.picUrl,
|
||||
|
||||
@@ -106,8 +106,6 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import 'animate.css';
|
||||
|
||||
import axios from 'axios';
|
||||
import { computed, onActivated, onMounted, ref } from 'vue';
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
:song-list="songList"
|
||||
:list-info="listInfo"
|
||||
:cover="false"
|
||||
:z-index="zIndex"
|
||||
/>
|
||||
<mv-player
|
||||
v-if="item.type === 'mv'"
|
||||
@@ -52,6 +53,7 @@ import MusicList from '../MusicList.vue';
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
shape?: 'square' | 'rectangle';
|
||||
zIndex?: number;
|
||||
item: {
|
||||
picUrl: string;
|
||||
name: string;
|
||||
|
||||
@@ -328,11 +328,11 @@ const artists = computed(() => {
|
||||
}
|
||||
|
||||
&-like {
|
||||
@apply mr-2 cursor-pointer ml-4;
|
||||
@apply mr-2 cursor-pointer ml-4 transition-all;
|
||||
}
|
||||
|
||||
.like-active {
|
||||
@apply text-red-500;
|
||||
@apply text-red-500 dark:text-red-500;
|
||||
}
|
||||
|
||||
&-play {
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
v-model:show="showModal"
|
||||
preset="dialog"
|
||||
:show-icon="false"
|
||||
:mask-closable="true"
|
||||
:mask-closable="!downloading"
|
||||
:closable="!downloading"
|
||||
class="update-app-modal"
|
||||
style="width: 800px; max-width: 90vw"
|
||||
>
|
||||
@@ -15,7 +16,6 @@
|
||||
<div class="app-info">
|
||||
<h2 class="app-name">发现新版本 {{ updateInfo.latestVersion }}</h2>
|
||||
<p class="app-desc mb-2">当前版本 {{ updateInfo.currentVersion }}</p>
|
||||
<n-checkbox v-model:checked="noPrompt">不再提示</n-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="update-info">
|
||||
@@ -23,11 +23,35 @@
|
||||
<div class="update-body" v-html="parsedReleaseNotes"></div>
|
||||
</n-scrollbar>
|
||||
</div>
|
||||
<div class="modal-actions">
|
||||
<n-button class="cancel-btn" @click="closeModal">暂不更新</n-button>
|
||||
<n-button type="primary" class="update-btn" @click="handleUpdate">立即更新</n-button>
|
||||
<div v-if="downloading" class="download-status mt-6">
|
||||
<div class="flex items-center justify-between mb-2">
|
||||
<span class="text-sm text-gray-500">{{ downloadStatus }}</span>
|
||||
<span class="text-sm font-medium">{{ downloadProgress }}%</span>
|
||||
</div>
|
||||
<div class="progress-bar-wrapper">
|
||||
<div class="progress-bar" :style="{ width: `${downloadProgress}%` }"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-desc mt-4 text-center">
|
||||
<div class="modal-actions" :class="{ 'mt-6': !downloading }">
|
||||
<n-button
|
||||
class="cancel-btn"
|
||||
:disabled="downloading"
|
||||
:loading="downloading"
|
||||
@click="closeModal"
|
||||
>
|
||||
{{ '暂不更新' }}
|
||||
</n-button>
|
||||
<n-button
|
||||
type="primary"
|
||||
class="update-btn"
|
||||
:loading="downloading"
|
||||
:disabled="downloading"
|
||||
@click="handleUpdate"
|
||||
>
|
||||
{{ downloadBtnText }}
|
||||
</n-button>
|
||||
</div>
|
||||
<div v-if="!downloading" class="modal-desc mt-4 text-center">
|
||||
<p class="text-xs text-gray-400">
|
||||
下载遇到问题?去
|
||||
<a
|
||||
@@ -45,7 +69,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { marked } from 'marked';
|
||||
import { computed, onMounted, ref, watch } from 'vue';
|
||||
import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
|
||||
import { useStore } from 'vuex';
|
||||
|
||||
import { checkUpdate, UpdateResult } from '@/utils/update';
|
||||
@@ -59,7 +83,6 @@ marked.setOptions({
|
||||
});
|
||||
|
||||
const showModal = ref(false);
|
||||
const noPrompt = ref(false);
|
||||
const updateInfo = ref<UpdateResult>({
|
||||
hasUpdate: false,
|
||||
latestVersion: '',
|
||||
@@ -102,9 +125,6 @@ const parsedReleaseNotes = computed(() => {
|
||||
|
||||
const closeModal = () => {
|
||||
showModal.value = false;
|
||||
if (noPrompt.value) {
|
||||
localStorage.setItem('updatePromptDismissed', 'true');
|
||||
}
|
||||
};
|
||||
|
||||
const checkForUpdates = async () => {
|
||||
@@ -112,21 +132,54 @@ const checkForUpdates = async () => {
|
||||
const result = await checkUpdate(config.version);
|
||||
if (result) {
|
||||
updateInfo.value = result;
|
||||
if (localStorage.getItem('updatePromptDismissed') !== 'true') {
|
||||
showModal.value = true;
|
||||
}
|
||||
showModal.value = true;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('检查更新失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
const downloading = ref(false);
|
||||
const downloadProgress = ref(0);
|
||||
const downloadStatus = ref('准备下载...');
|
||||
const downloadBtnText = computed(() => {
|
||||
if (downloading.value) return '下载中...';
|
||||
return '立即更新';
|
||||
});
|
||||
|
||||
// 处理下载状态更新
|
||||
const handleDownloadProgress = (_event: any, progress: number, status: string) => {
|
||||
downloadProgress.value = progress;
|
||||
downloadStatus.value = status;
|
||||
};
|
||||
|
||||
// 处理下载完成
|
||||
const handleDownloadComplete = (_event: any, success: boolean, filePath: string) => {
|
||||
downloading.value = false;
|
||||
if (success) {
|
||||
window.electron.ipcRenderer.send('install-update', filePath);
|
||||
} else {
|
||||
window.$message.error('下载失败,请重试或手动下载');
|
||||
}
|
||||
};
|
||||
|
||||
// 监听下载事件
|
||||
onMounted(() => {
|
||||
checkForUpdates();
|
||||
window.electron.ipcRenderer.on('download-progress', handleDownloadProgress);
|
||||
window.electron.ipcRenderer.on('download-complete', handleDownloadComplete);
|
||||
});
|
||||
|
||||
// 清理事件监听
|
||||
onUnmounted(() => {
|
||||
window.electron.ipcRenderer.removeListener('download-progress', handleDownloadProgress);
|
||||
window.electron.ipcRenderer.removeListener('download-complete', handleDownloadComplete);
|
||||
});
|
||||
|
||||
const handleUpdate = async () => {
|
||||
const assets = updateInfo.value.releaseInfo?.assets || [];
|
||||
const { platform } = window.electron.process;
|
||||
const arch = window.electron.ipcRenderer.sendSync('get-arch');
|
||||
console.log('arch', arch);
|
||||
console.log('platform', platform);
|
||||
const version = updateInfo.value.latestVersion;
|
||||
const downUrls = {
|
||||
win32: {
|
||||
@@ -170,16 +223,20 @@ const handleUpdate = async () => {
|
||||
}
|
||||
|
||||
if (downloadUrl) {
|
||||
window.open(`https://www.ghproxy.cn/${downloadUrl}`, '_blank');
|
||||
try {
|
||||
downloading.value = true;
|
||||
downloadStatus.value = '准备下载...';
|
||||
window.electron.ipcRenderer.send('start-download', downloadUrl);
|
||||
} catch (error) {
|
||||
downloading.value = false;
|
||||
window.$message.error('启动下载失败,请重试或手动下载');
|
||||
console.error('下载失败:', error);
|
||||
}
|
||||
} else {
|
||||
// 如果没有找到对应的安装包,跳转到 release 页面
|
||||
window.$message.error('未找到适合当前系统的安装包,请手动下载');
|
||||
window.open('https://github.com/algerkong/AlgerMusicPlayer/releases/latest', '_blank');
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
checkForUpdates();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -266,8 +323,18 @@ onMounted(() => {
|
||||
}
|
||||
}
|
||||
}
|
||||
.download-status {
|
||||
@apply p-2;
|
||||
.progress-bar-wrapper {
|
||||
@apply w-full h-2 bg-gray-100 dark:bg-gray-700 rounded-full overflow-hidden;
|
||||
.progress-bar {
|
||||
@apply h-full bg-green-500 rounded-full transition-all duration-300 ease-out;
|
||||
box-shadow: 0 0 10px rgba(34, 197, 94, 0.5);
|
||||
}
|
||||
}
|
||||
}
|
||||
.modal-actions {
|
||||
@apply flex gap-4 mt-6;
|
||||
@apply flex gap-4;
|
||||
.n-button {
|
||||
@apply flex-1 text-base py-2;
|
||||
}
|
||||
@@ -276,12 +343,18 @@ onMounted(() => {
|
||||
&:hover {
|
||||
@apply bg-gray-700;
|
||||
}
|
||||
&:disabled {
|
||||
@apply opacity-50 cursor-not-allowed;
|
||||
}
|
||||
}
|
||||
.update-btn {
|
||||
@apply bg-green-600 border-none;
|
||||
&:hover {
|
||||
@apply bg-green-500;
|
||||
}
|
||||
&:disabled {
|
||||
@apply opacity-50 cursor-not-allowed;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
192
src/renderer/components/lyric/LyricSettings.vue
Normal file
192
src/renderer/components/lyric/LyricSettings.vue
Normal file
@@ -0,0 +1,192 @@
|
||||
<template>
|
||||
<div class="settings-panel transparent-popover">
|
||||
<div class="settings-title">页面设置</div>
|
||||
<div class="settings-content">
|
||||
<div class="settings-item">
|
||||
<span>纯净模式</span>
|
||||
<n-switch v-model:value="config.pureModeEnabled" />
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>隐藏封面</span>
|
||||
<n-switch v-model:value="config.hideCover" />
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>居中显示</span>
|
||||
<n-switch v-model:value="config.centerLyrics" />
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>显示翻译</span>
|
||||
<n-switch v-model:value="config.showTranslation" />
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>隐藏播放栏</span>
|
||||
<n-switch v-model:value="config.hidePlayBar" />
|
||||
</div>
|
||||
|
||||
<div class="settings-slider">
|
||||
<span>字体大小</span>
|
||||
<n-slider
|
||||
v-model:value="config.fontSize"
|
||||
:step="1"
|
||||
:min="12"
|
||||
:max="32"
|
||||
:marks="{
|
||||
12: '小',
|
||||
22: '中',
|
||||
32: '大'
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="settings-slider">
|
||||
<span>文字间距</span>
|
||||
<n-slider
|
||||
v-model:value="config.letterSpacing"
|
||||
:step="0.2"
|
||||
:min="-2"
|
||||
:max="10"
|
||||
:marks="{
|
||||
'-2': '紧凑',
|
||||
0: '默认',
|
||||
10: '宽松'
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="settings-slider">
|
||||
<span>行高</span>
|
||||
<n-slider
|
||||
v-model:value="config.lineHeight"
|
||||
:step="0.1"
|
||||
:min="1"
|
||||
:max="3"
|
||||
:marks="{
|
||||
1: '紧凑',
|
||||
1.5: '默认',
|
||||
3: '宽松'
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="settings-item">
|
||||
<span>背景主题</span>
|
||||
<n-radio-group v-model:value="config.theme" name="theme">
|
||||
<n-radio value="default">默认</n-radio>
|
||||
<n-radio value="light">亮色</n-radio>
|
||||
<n-radio value="dark">暗色</n-radio>
|
||||
</n-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref, watch } from 'vue';
|
||||
|
||||
interface LyricConfig {
|
||||
hideCover: boolean;
|
||||
centerLyrics: boolean;
|
||||
fontSize: number;
|
||||
letterSpacing: number;
|
||||
lineHeight: number;
|
||||
showTranslation: boolean;
|
||||
theme: 'default' | 'light' | 'dark';
|
||||
hidePlayBar: boolean;
|
||||
pureModeEnabled: boolean;
|
||||
}
|
||||
|
||||
const config = ref<LyricConfig>({
|
||||
hideCover: false,
|
||||
centerLyrics: false,
|
||||
fontSize: 22,
|
||||
letterSpacing: 0,
|
||||
lineHeight: 2,
|
||||
showTranslation: true,
|
||||
theme: 'default',
|
||||
hidePlayBar: false,
|
||||
pureModeEnabled: false
|
||||
});
|
||||
|
||||
const emit = defineEmits(['themeChange']);
|
||||
|
||||
// 监听配置变化并保存到本地存储
|
||||
watch(
|
||||
() => config.value,
|
||||
(newConfig) => {
|
||||
updateCSSVariables(newConfig);
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
// 监听主题变化
|
||||
watch(
|
||||
() => config.value.theme,
|
||||
(newTheme) => {
|
||||
emit('themeChange', newTheme);
|
||||
}
|
||||
);
|
||||
|
||||
// 更新 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) {
|
||||
config.value = { ...config.value, ...JSON.parse(savedConfig) };
|
||||
updateCSSVariables(config.value);
|
||||
}
|
||||
});
|
||||
|
||||
defineExpose({
|
||||
config
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.settings-panel {
|
||||
@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 {
|
||||
@apply space-y-4;
|
||||
}
|
||||
|
||||
.settings-item {
|
||||
@apply flex items-center justify-between;
|
||||
span {
|
||||
@apply text-sm;
|
||||
color: var(--text-color-primary);
|
||||
}
|
||||
}
|
||||
|
||||
.settings-slider {
|
||||
@apply space-y-2;
|
||||
@apply mb-10 !important;
|
||||
span {
|
||||
@apply text-sm;
|
||||
color: var(--text-color-primary);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 修改 slider 字体颜色
|
||||
:deep(.n-slider-mark) {
|
||||
color: var(--text-color-primary) !important;
|
||||
}
|
||||
// 修改 radio 字体颜色
|
||||
:deep(.n-radio__label) {
|
||||
color: var(--text-color-active) !important;
|
||||
}
|
||||
</style>
|
||||
380
src/renderer/components/settings/ShortcutSettings.vue
Normal file
380
src/renderer/components/settings/ShortcutSettings.vue
Normal file
@@ -0,0 +1,380 @@
|
||||
<template>
|
||||
<n-modal
|
||||
v-model:show="visible"
|
||||
preset="dialog"
|
||||
title="快捷键设置"
|
||||
:show-icon="false"
|
||||
style="width: 600px"
|
||||
@after-leave="handleAfterLeave"
|
||||
>
|
||||
<div class="shortcut-settings">
|
||||
<div class="shortcut-card">
|
||||
<div class="shortcut-content">
|
||||
<n-scrollbar>
|
||||
<n-space vertical>
|
||||
<div v-for="(shortcut, key) in tempShortcuts" :key="key" class="shortcut-item">
|
||||
<div class="shortcut-info">
|
||||
<span class="shortcut-label">{{ getShortcutLabel(key) }}</span>
|
||||
</div>
|
||||
<div class="shortcut-input">
|
||||
<n-input
|
||||
:value="formatShortcut(shortcut)"
|
||||
:status="duplicateKeys[key] ? 'error' : undefined"
|
||||
placeholder="点击输入快捷键"
|
||||
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>
|
||||
快捷键冲突
|
||||
</n-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
</n-space>
|
||||
</n-scrollbar>
|
||||
</div>
|
||||
|
||||
<div class="shortcut-footer">
|
||||
<n-space justify="end">
|
||||
<n-button size="small" @click="handleCancel">取消</n-button>
|
||||
<n-button size="small" @click="resetShortcuts">恢复默认</n-button>
|
||||
<n-button type="primary" size="small" :disabled="hasConflict" @click="handleSave">
|
||||
保存
|
||||
</n-button>
|
||||
</n-space>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</n-modal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { useMessage } from 'naive-ui';
|
||||
import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
|
||||
|
||||
import { isElectron } from '@/utils';
|
||||
|
||||
interface Shortcuts {
|
||||
togglePlay: string;
|
||||
prevPlay: string;
|
||||
nextPlay: string;
|
||||
volumeUp: string;
|
||||
volumeDown: string;
|
||||
toggleFavorite: string;
|
||||
toggleWindow: string;
|
||||
}
|
||||
|
||||
const defaultShortcuts: Shortcuts = {
|
||||
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 shortcuts = ref<Shortcuts>(
|
||||
isElectron
|
||||
? window.electron.ipcRenderer.sendSync('get-store-value', 'shortcuts') || defaultShortcuts
|
||||
: { ...defaultShortcuts }
|
||||
);
|
||||
|
||||
// 临时存储编辑中的快捷键
|
||||
const tempShortcuts = ref<Shortcuts>({ ...shortcuts.value });
|
||||
|
||||
// 监听快捷键更新
|
||||
if (isElectron) {
|
||||
window.electron.ipcRenderer.on('shortcuts-updated', () => {
|
||||
const newShortcuts = window.electron.ipcRenderer.sendSync('get-store-value', 'shortcuts');
|
||||
if (newShortcuts) {
|
||||
shortcuts.value = newShortcuts;
|
||||
tempShortcuts.value = { ...newShortcuts };
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 组件挂载时禁用快捷键
|
||||
onMounted(() => {
|
||||
if (isElectron) {
|
||||
// 禁用全局快捷键
|
||||
window.electron.ipcRenderer.send('disable-shortcuts');
|
||||
|
||||
const storedShortcuts = window.electron.ipcRenderer.sendSync('get-store-value', 'shortcuts');
|
||||
console.log('storedShortcuts', storedShortcuts);
|
||||
if (storedShortcuts) {
|
||||
shortcuts.value = storedShortcuts;
|
||||
tempShortcuts.value = { ...storedShortcuts };
|
||||
} else {
|
||||
shortcuts.value = { ...defaultShortcuts };
|
||||
tempShortcuts.value = { ...defaultShortcuts };
|
||||
window.electron.ipcRenderer.send('set-store-value', 'shortcuts', defaultShortcuts);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const shortcutLabels: Record<keyof Shortcuts, string> = {
|
||||
togglePlay: '播放/暂停',
|
||||
prevPlay: '上一首',
|
||||
nextPlay: '下一首',
|
||||
volumeUp: '音量增加',
|
||||
volumeDown: '音量减少',
|
||||
toggleFavorite: '收藏/取消收藏',
|
||||
toggleWindow: '显示/隐藏窗口'
|
||||
};
|
||||
|
||||
const getShortcutLabel = (key: keyof Shortcuts) => shortcutLabels[key];
|
||||
|
||||
const isRecording = ref(false);
|
||||
const currentKey = ref<keyof Shortcuts | ''>('');
|
||||
const message = useMessage();
|
||||
|
||||
// 检查快捷键冲突
|
||||
const duplicateKeys = computed(() => {
|
||||
const result: Record<string, boolean> = {};
|
||||
const usedShortcuts = new Set<string>();
|
||||
|
||||
Object.entries(tempShortcuts.value).forEach(([key, shortcut]) => {
|
||||
if (usedShortcuts.has(shortcut)) {
|
||||
result[key] = true;
|
||||
} else {
|
||||
usedShortcuts.add(shortcut);
|
||||
}
|
||||
});
|
||||
|
||||
return result;
|
||||
});
|
||||
|
||||
// 是否存在冲突
|
||||
const hasConflict = computed(() => Object.keys(duplicateKeys.value).length > 0);
|
||||
|
||||
const startRecording = (key: keyof Shortcuts) => {
|
||||
isRecording.value = true;
|
||||
currentKey.value = key;
|
||||
// 禁用全局快捷键
|
||||
if (isElectron) {
|
||||
window.electron.ipcRenderer.send('disable-shortcuts');
|
||||
}
|
||||
};
|
||||
|
||||
const stopRecording = () => {
|
||||
isRecording.value = false;
|
||||
currentKey.value = '';
|
||||
// 重新启用全局快捷键
|
||||
if (isElectron) {
|
||||
window.electron.ipcRenderer.send('enable-shortcuts');
|
||||
}
|
||||
};
|
||||
|
||||
const handleKeyDown = (e: KeyboardEvent, key: keyof Shortcuts) => {
|
||||
if (!isRecording.value || currentKey.value !== key) return;
|
||||
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
const modifiers: string[] = [];
|
||||
|
||||
// 统一使用 CommandOrControl
|
||||
if (e.ctrlKey || e.metaKey) {
|
||||
modifiers.push('CommandOrControl');
|
||||
}
|
||||
if (e.altKey) modifiers.push('Alt');
|
||||
if (e.shiftKey) modifiers.push('Shift');
|
||||
|
||||
let keyName = e.key;
|
||||
|
||||
// 特殊按键处理
|
||||
switch (e.key) {
|
||||
case 'ArrowLeft':
|
||||
keyName = 'Left';
|
||||
break;
|
||||
case 'ArrowRight':
|
||||
keyName = 'Right';
|
||||
break;
|
||||
case 'ArrowUp':
|
||||
keyName = 'Up';
|
||||
break;
|
||||
case 'ArrowDown':
|
||||
keyName = 'Down';
|
||||
break;
|
||||
case 'Control':
|
||||
case 'Alt':
|
||||
case 'Shift':
|
||||
case 'Meta':
|
||||
case 'Command':
|
||||
return; // 忽略单独的修饰键
|
||||
default:
|
||||
keyName = e.key.length === 1 ? e.key.toUpperCase() : e.key;
|
||||
}
|
||||
|
||||
if (!['Control', 'Alt', 'Shift', 'Meta', 'Command'].includes(keyName)) {
|
||||
tempShortcuts.value[key] = [...modifiers, keyName].join('+');
|
||||
}
|
||||
};
|
||||
|
||||
const resetShortcuts = () => {
|
||||
tempShortcuts.value = { ...defaultShortcuts };
|
||||
message.success('已恢复默认快捷键,请记得保存');
|
||||
};
|
||||
|
||||
const saveShortcuts = () => {
|
||||
if (hasConflict.value) {
|
||||
message.error('存在冲突的快捷键,请重新设置');
|
||||
return;
|
||||
}
|
||||
|
||||
// 创建一个新的 Shortcuts 对象
|
||||
const shortcutsToSave = cloneDeep(tempShortcuts.value);
|
||||
|
||||
shortcuts.value = shortcutsToSave;
|
||||
|
||||
if (isElectron) {
|
||||
try {
|
||||
// 先保存到 store
|
||||
window.electron.ipcRenderer.send('set-store-value', 'shortcuts', shortcutsToSave);
|
||||
// 然后更新快捷键
|
||||
window.electron.ipcRenderer.send('update-shortcuts');
|
||||
message.success('快捷键设置已保存');
|
||||
} catch (error) {
|
||||
console.error('保存快捷键失败:', error);
|
||||
message.error('保存快捷键失败,请重试');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const cancelEdit = () => {
|
||||
tempShortcuts.value = { ...shortcuts.value };
|
||||
message.info('已取消修改');
|
||||
emit('update:show', false);
|
||||
};
|
||||
|
||||
// 组件卸载时确保快捷键被重新启用
|
||||
onUnmounted(() => {
|
||||
if (isElectron) {
|
||||
window.electron.ipcRenderer.send('enable-shortcuts');
|
||||
}
|
||||
});
|
||||
|
||||
// 格式化快捷键显示
|
||||
const formatShortcut = (shortcut: string) => {
|
||||
const isMac = isElectron
|
||||
? window.electron.ipcRenderer.sendSync('get-platform') === 'darwin'
|
||||
: false;
|
||||
return shortcut
|
||||
.replace(/CommandOrControl/g, isMac ? '⌘' : 'Ctrl')
|
||||
.replace(/\+/g, ' + ')
|
||||
.replace(/Meta/g, isMac ? '⌘' : 'Win')
|
||||
.replace(/Control/g, isMac ? '⌃' : 'Ctrl')
|
||||
.replace(/Alt/g, isMac ? '⌥' : 'Alt')
|
||||
.replace(/Shift/g, isMac ? '⇧' : 'Shift')
|
||||
.replace(/ArrowUp/g, '↑')
|
||||
.replace(/ArrowDown/g, '↓')
|
||||
.replace(/ArrowLeft/g, '←')
|
||||
.replace(/ArrowRight/g, '→');
|
||||
};
|
||||
|
||||
const visible = ref(false);
|
||||
const emit = defineEmits(['update:show', 'change']);
|
||||
|
||||
// 接收外部的 show 属性
|
||||
const props = defineProps<{
|
||||
show?: boolean;
|
||||
}>();
|
||||
|
||||
// 监听 show 属性变化
|
||||
watch(
|
||||
() => props.show,
|
||||
(newVal) => {
|
||||
visible.value = newVal;
|
||||
}
|
||||
);
|
||||
|
||||
// 监听内部 visible 变化
|
||||
watch(visible, (newVal) => {
|
||||
emit('update:show', newVal);
|
||||
});
|
||||
|
||||
// 处理弹窗关闭后的事件
|
||||
const handleAfterLeave = () => {
|
||||
// 重置临时数据
|
||||
tempShortcuts.value = { ...shortcuts.value };
|
||||
};
|
||||
|
||||
// 处理取消按钮点击
|
||||
const handleCancel = () => {
|
||||
visible.value = false;
|
||||
cancelEdit();
|
||||
};
|
||||
|
||||
// 处理保存按钮点击
|
||||
const handleSave = () => {
|
||||
saveShortcuts();
|
||||
visible.value = false;
|
||||
emit('change', shortcuts.value);
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.shortcut-settings {
|
||||
height: 500px;
|
||||
|
||||
.shortcut-card {
|
||||
@apply flex flex-col h-full;
|
||||
|
||||
.shortcut-footer {
|
||||
@apply p-4 border-t border-gray-100 dark:border-gray-800;
|
||||
}
|
||||
|
||||
.shortcut-content {
|
||||
@apply flex-1 overflow-hidden;
|
||||
|
||||
:deep(.n-scrollbar) {
|
||||
@apply h-full;
|
||||
|
||||
.n-scrollbar-content {
|
||||
@apply p-4;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.shortcut-item {
|
||||
@apply flex items-center justify-between p-3 rounded-lg transition-all mb-3;
|
||||
@apply bg-gray-50 dark:bg-gray-800;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.shortcut-info {
|
||||
@apply flex flex-col;
|
||||
|
||||
.shortcut-label {
|
||||
@apply text-base font-medium;
|
||||
}
|
||||
}
|
||||
|
||||
.shortcut-input {
|
||||
@apply flex items-center gap-2;
|
||||
min-width: 200px;
|
||||
|
||||
:deep(.n-input) {
|
||||
.n-input__input-el {
|
||||
@apply text-center font-mono;
|
||||
}
|
||||
}
|
||||
|
||||
.error-icon {
|
||||
@apply text-red-500;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,24 +1,29 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import { ref } from 'vue';
|
||||
|
||||
// 定义表配置的泛型接口
|
||||
export interface StoreConfig<T extends string> {
|
||||
name: T;
|
||||
keyPath?: string;
|
||||
}
|
||||
|
||||
// 创建一个使用 IndexedDB 的组合函数
|
||||
const useIndexedDB = () => {
|
||||
const db = ref<IDBDatabase | null>(null); // 数据库引用
|
||||
const useIndexedDB = async <T extends string, S extends Record<T, Record<string, any>>>(
|
||||
dbName: string,
|
||||
stores: StoreConfig<T>[],
|
||||
version: number = 1
|
||||
) => {
|
||||
const db = ref<IDBDatabase | null>(null);
|
||||
|
||||
// 打开数据库并创建表
|
||||
const initDB = (
|
||||
dbName: string,
|
||||
version: number,
|
||||
stores: { name: string; keyPath?: string }[]
|
||||
) => {
|
||||
const initDB = () => {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
const request = indexedDB.open(dbName, version); // 打开数据库请求
|
||||
const request = indexedDB.open(dbName, version);
|
||||
|
||||
request.onupgradeneeded = (event: any) => {
|
||||
const db = event.target.result; // 获取数据库实例
|
||||
const db = event.target.result;
|
||||
stores.forEach((store) => {
|
||||
if (!db.objectStoreNames.contains(store.name)) {
|
||||
// 确保对象存储(表)创建
|
||||
db.createObjectStore(store.name, {
|
||||
keyPath: store.keyPath || 'id',
|
||||
autoIncrement: true
|
||||
@@ -28,39 +33,41 @@ const useIndexedDB = () => {
|
||||
};
|
||||
|
||||
request.onsuccess = (event: any) => {
|
||||
db.value = event.target.result; // 保存数据库实例
|
||||
resolve(); // 成功时解析 Promise
|
||||
db.value = event.target.result;
|
||||
resolve();
|
||||
};
|
||||
|
||||
request.onerror = (event: any) => {
|
||||
reject(event.target.error); // 失败时拒绝 Promise
|
||||
reject(event.target.error);
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
// 通用新增数据
|
||||
const addData = (storeName: string, value: any) => {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
if (!db.value) return reject('数据库未初始化'); // 检查数据库是否已初始化
|
||||
const tx = db.value.transaction(storeName, 'readwrite'); // 创建事务
|
||||
const store = tx.objectStore(storeName); // 获取对象存储
|
||||
await initDB();
|
||||
|
||||
const request = store.add(value); // 添加数据请求
|
||||
// 通用新增数据
|
||||
const addData = <K extends T>(storeName: K, value: S[K]) => {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
if (!db.value) return reject('数据库未初始化');
|
||||
const tx = db.value.transaction(storeName, 'readwrite');
|
||||
const store = tx.objectStore(storeName);
|
||||
|
||||
const request = store.add(value);
|
||||
|
||||
request.onsuccess = () => {
|
||||
console.log('成功'); // 成功时输出
|
||||
resolve(); // 解析 Promise
|
||||
console.log('成功');
|
||||
resolve();
|
||||
};
|
||||
|
||||
request.onerror = (event) => {
|
||||
console.error('新增失败:', (event.target as IDBRequest).error); // 输出错误
|
||||
reject((event.target as IDBRequest).error); // 拒绝 Promise
|
||||
console.error('新增失败:', (event.target as IDBRequest).error);
|
||||
reject((event.target as IDBRequest).error);
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
// 通用保存数据(新增或更新)
|
||||
const saveData = (storeName: string, value: any) => {
|
||||
const saveData = <K extends T>(storeName: K, value: S[K]) => {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
if (!db.value) return reject('数据库未初始化');
|
||||
const tx = db.value.transaction(storeName, 'readwrite');
|
||||
@@ -79,8 +86,8 @@ const useIndexedDB = () => {
|
||||
};
|
||||
|
||||
// 通用获取数据
|
||||
const getData = (storeName: string, key: string | number) => {
|
||||
return new Promise<any>((resolve, reject) => {
|
||||
const getData = <K extends T>(storeName: K, key: string | number) => {
|
||||
return new Promise<S[K]>((resolve, reject) => {
|
||||
if (!db.value) return reject('数据库未初始化');
|
||||
const tx = db.value.transaction(storeName, 'readonly');
|
||||
const store = tx.objectStore(storeName);
|
||||
@@ -101,7 +108,7 @@ const useIndexedDB = () => {
|
||||
};
|
||||
|
||||
// 删除数据
|
||||
const deleteData = (storeName: string, key: string | number) => {
|
||||
const deleteData = <K extends T>(storeName: K, key: string | number) => {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
if (!db.value) return reject('数据库未初始化');
|
||||
const tx = db.value.transaction(storeName, 'readwrite');
|
||||
@@ -120,8 +127,8 @@ const useIndexedDB = () => {
|
||||
};
|
||||
|
||||
// 查询所有数据
|
||||
const getAllData = (storeName: string) => {
|
||||
return new Promise<any[]>((resolve, reject) => {
|
||||
const getAllData = <K extends T>(storeName: K) => {
|
||||
return new Promise<S[K][]>((resolve, reject) => {
|
||||
if (!db.value) return reject('数据库未初始化');
|
||||
const tx = db.value.transaction(storeName, 'readonly');
|
||||
const store = tx.objectStore(storeName);
|
||||
@@ -142,29 +149,29 @@ const useIndexedDB = () => {
|
||||
};
|
||||
|
||||
// 分页查询数据
|
||||
const getDataWithPagination = (storeName: string, page: number, pageSize: number) => {
|
||||
return new Promise<any[]>((resolve, reject) => {
|
||||
const getDataWithPagination = <K extends T>(storeName: K, page: number, pageSize: number) => {
|
||||
return new Promise<S[K][]>((resolve, reject) => {
|
||||
if (!db.value) return reject('数据库未初始化');
|
||||
const tx = db.value.transaction(storeName, 'readonly');
|
||||
const store = tx.objectStore(storeName);
|
||||
const request = store.openCursor(); // 打开游标请求
|
||||
const results: any[] = []; // 存储结果的数组
|
||||
let index = 0; // 当前索引
|
||||
const skip = (page - 1) * pageSize; // 计算跳过的数量
|
||||
const request = store.openCursor();
|
||||
const results: S[K][] = [];
|
||||
let index = 0;
|
||||
const skip = (page - 1) * pageSize;
|
||||
|
||||
request.onsuccess = (event: any) => {
|
||||
const cursor = event.target.result; // 获取游标
|
||||
const cursor = event.target.result;
|
||||
if (!cursor) {
|
||||
resolve(results); // 如果没有更多数据,解析结果
|
||||
resolve(results);
|
||||
return;
|
||||
}
|
||||
|
||||
if (index >= skip && results.length < pageSize) {
|
||||
results.push(cursor.value); // 添加当前游标值到结果
|
||||
results.push(cursor.value);
|
||||
}
|
||||
|
||||
index++; // 增加索引
|
||||
cursor.continue(); // 继续游标
|
||||
index++;
|
||||
cursor.continue();
|
||||
};
|
||||
|
||||
request.onerror = (event: any) => {
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
|
||||
|
||||
import useIndexedDB from '@/hooks/IndexDBHook';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import store from '@/store';
|
||||
import type { ILyricText, SongResult } from '@/type/music';
|
||||
import type { Artist, ILyricText, SongResult } from '@/type/music';
|
||||
import { isElectron } from '@/utils';
|
||||
import { getTextColors } from '@/utils/linearColor';
|
||||
|
||||
import { createDiscreteApi } from 'naive-ui';
|
||||
const windowData = window as any;
|
||||
|
||||
export const lrcArray = ref<ILyricText[]>([]); // 歌词数组
|
||||
@@ -19,6 +20,15 @@ export const playMusic = computed(() => store.state.playMusic as SongResult); //
|
||||
export const sound = ref<Howl | null>(audioService.getCurrentSound());
|
||||
export const isLyricWindowOpen = ref(false); // 新增状态
|
||||
export const textColors = ref<any>(getTextColors());
|
||||
export const artistList = computed(
|
||||
() => (store.state.playMusic.ar || store.state.playMusic?.song?.artists) as Artist[]
|
||||
);
|
||||
|
||||
export const musicDB = await useIndexedDB('musicDB', [
|
||||
{ name: 'music', keyPath: 'id' },
|
||||
{ name: 'music_lyric', keyPath: 'id' },
|
||||
{ name: 'api_cache', keyPath: 'id' }
|
||||
]);
|
||||
|
||||
document.onkeyup = (e) => {
|
||||
// 检查事件目标是否是输入框元素
|
||||
@@ -41,12 +51,24 @@ document.onkeyup = (e) => {
|
||||
}
|
||||
};
|
||||
|
||||
const { message } = createDiscreteApi(['message']);
|
||||
|
||||
watch(
|
||||
() => store.state.playMusicUrl,
|
||||
(newVal) => {
|
||||
async (newVal) => {
|
||||
if (newVal && playMusic.value) {
|
||||
sound.value = audioService.play(newVal, playMusic.value);
|
||||
setupAudioListeners();
|
||||
try {
|
||||
const newSound = await audioService.play(newVal, playMusic.value);
|
||||
sound.value = newSound as Howl;
|
||||
setupAudioListeners();
|
||||
} catch (error) {
|
||||
|
||||
console.error('播放音频失败:', error);
|
||||
store.commit('setPlayMusic', false);
|
||||
message.error('当前歌曲播放失败,播放下一首');
|
||||
// 下一首
|
||||
store.commit('nextPlay');
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
@@ -72,22 +94,52 @@ watch(
|
||||
const setupAudioListeners = () => {
|
||||
let interval: any = null;
|
||||
|
||||
const clearInterval = () => {
|
||||
if (interval) {
|
||||
window.clearInterval(interval);
|
||||
interval = null;
|
||||
}
|
||||
};
|
||||
|
||||
// 清理所有事件监听器
|
||||
audioService.clearAllListeners();
|
||||
|
||||
// 监听播放
|
||||
audioService.on('play', () => {
|
||||
store.commit('setPlayMusic', true);
|
||||
interval = setInterval(() => {
|
||||
nowTime.value = sound.value?.seek() as number;
|
||||
allTime.value = sound.value?.duration() as number;
|
||||
const newIndex = getLrcIndex(nowTime.value);
|
||||
if (newIndex !== nowIndex.value) {
|
||||
nowIndex.value = newIndex;
|
||||
currentLrcProgress.value = 0;
|
||||
clearInterval();
|
||||
interval = window.setInterval(() => {
|
||||
try {
|
||||
const currentSound = sound.value;
|
||||
if (!currentSound || typeof currentSound.seek !== 'function') {
|
||||
console.error('Invalid sound object or seek function');
|
||||
clearInterval();
|
||||
return;
|
||||
}
|
||||
|
||||
const currentTime = currentSound.seek() as number;
|
||||
if (typeof currentTime !== 'number' || Number.isNaN(currentTime)) {
|
||||
console.error('Invalid current time:', currentTime);
|
||||
clearInterval();
|
||||
return;
|
||||
}
|
||||
|
||||
nowTime.value = currentTime;
|
||||
allTime.value = currentSound.duration() as number;
|
||||
const newIndex = getLrcIndex(nowTime.value);
|
||||
if (newIndex !== nowIndex.value) {
|
||||
nowIndex.value = newIndex;
|
||||
currentLrcProgress.value = 0;
|
||||
if (isElectron && isLyricWindowOpen.value) {
|
||||
sendLyricToWin();
|
||||
}
|
||||
}
|
||||
if (isElectron && isLyricWindowOpen.value) {
|
||||
sendLyricToWin();
|
||||
}
|
||||
}
|
||||
if (isElectron && isLyricWindowOpen.value) {
|
||||
sendLyricToWin();
|
||||
} catch (error) {
|
||||
console.error('Error in interval:', error);
|
||||
clearInterval();
|
||||
}
|
||||
}, 50);
|
||||
});
|
||||
@@ -95,22 +147,50 @@ const setupAudioListeners = () => {
|
||||
// 监听暂停
|
||||
audioService.on('pause', () => {
|
||||
store.commit('setPlayMusic', false);
|
||||
clearInterval(interval);
|
||||
clearInterval();
|
||||
if (isElectron && isLyricWindowOpen.value) {
|
||||
sendLyricToWin();
|
||||
}
|
||||
});
|
||||
|
||||
const replayMusic = async () => {
|
||||
try {
|
||||
// 如果当前有音频实例,先停止并销毁
|
||||
if (sound.value) {
|
||||
sound.value.stop();
|
||||
sound.value.unload();
|
||||
sound.value = null;
|
||||
}
|
||||
|
||||
// 重新播放当前歌曲
|
||||
if (store.state.playMusicUrl && playMusic.value) {
|
||||
const newSound = await audioService.play(store.state.playMusicUrl, playMusic.value);
|
||||
sound.value = newSound as Howl;
|
||||
setupAudioListeners();
|
||||
} else {
|
||||
console.error('No music URL or playMusic data available');
|
||||
store.commit('nextPlay');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error replaying song:', error);
|
||||
store.commit('nextPlay');
|
||||
}
|
||||
};
|
||||
|
||||
// 监听结束
|
||||
audioService.on('end', () => {
|
||||
clearInterval();
|
||||
|
||||
if (store.state.playMode === 1) {
|
||||
// 单曲循环模式
|
||||
sound.value?.play();
|
||||
if (sound.value) {
|
||||
replayMusic();
|
||||
}
|
||||
} else if (store.state.playMode === 2) {
|
||||
// 随机播放模式
|
||||
const { playList } = store.state;
|
||||
if (playList.length <= 1) {
|
||||
sound.value?.play();
|
||||
replayMusic();
|
||||
} else {
|
||||
let randomIndex;
|
||||
do {
|
||||
@@ -125,14 +205,7 @@ const setupAudioListeners = () => {
|
||||
}
|
||||
});
|
||||
|
||||
// 监听上一曲/下一曲控制
|
||||
audioService.on('previoustrack', () => {
|
||||
store.commit('prevPlay');
|
||||
});
|
||||
|
||||
audioService.on('nexttrack', () => {
|
||||
store.commit('nextPlay');
|
||||
});
|
||||
return clearInterval;
|
||||
};
|
||||
|
||||
export const play = () => {
|
||||
@@ -197,20 +270,47 @@ export const useLyricProgress = () => {
|
||||
let animationFrameId: number | null = null;
|
||||
|
||||
const updateProgress = () => {
|
||||
if (!isPlaying.value) return;
|
||||
if (!isPlaying.value) {
|
||||
stopProgressAnimation();
|
||||
return;
|
||||
}
|
||||
|
||||
const currentSound = sound.value;
|
||||
if (!currentSound) return;
|
||||
if (!currentSound || typeof currentSound.seek !== 'function') {
|
||||
console.error('Invalid sound object or seek function');
|
||||
stopProgressAnimation();
|
||||
return;
|
||||
}
|
||||
|
||||
const { start, end } = currentLrcTiming.value;
|
||||
const duration = end - start;
|
||||
const elapsed = (currentSound.seek() as number) - start;
|
||||
currentLrcProgress.value = Math.min(Math.max((elapsed / duration) * 100, 0), 100);
|
||||
try {
|
||||
const { start, end } = currentLrcTiming.value;
|
||||
if (typeof start !== 'number' || typeof end !== 'number' || start === end) {
|
||||
return;
|
||||
}
|
||||
|
||||
const currentTime = currentSound.seek() as number;
|
||||
if (typeof currentTime !== 'number' || Number.isNaN(currentTime)) {
|
||||
console.error('Invalid current time:', currentTime);
|
||||
return;
|
||||
}
|
||||
|
||||
const elapsed = currentTime - start;
|
||||
const duration = end - start;
|
||||
const progress = (elapsed / duration) * 100;
|
||||
|
||||
// 确保进度在 0-100 之间
|
||||
currentLrcProgress.value = Math.min(Math.max(progress, 0), 100);
|
||||
} catch (error) {
|
||||
console.error('Error updating progress:', error);
|
||||
}
|
||||
|
||||
// 继续下一帧更新
|
||||
animationFrameId = requestAnimationFrame(updateProgress);
|
||||
};
|
||||
|
||||
const startProgressAnimation = () => {
|
||||
if (!animationFrameId && isPlaying.value) {
|
||||
stopProgressAnimation(); // 先停止之前的动画
|
||||
if (isPlaying.value) {
|
||||
updateProgress();
|
||||
}
|
||||
};
|
||||
@@ -222,8 +322,30 @@ export const useLyricProgress = () => {
|
||||
}
|
||||
};
|
||||
|
||||
watch(isPlaying, (newIsPlaying) => {
|
||||
if (newIsPlaying) {
|
||||
// 监听播放状态变化
|
||||
watch(
|
||||
isPlaying,
|
||||
(newIsPlaying) => {
|
||||
if (newIsPlaying) {
|
||||
startProgressAnimation();
|
||||
} else {
|
||||
stopProgressAnimation();
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
// 监听当前歌词索引变化
|
||||
watch(nowIndex, () => {
|
||||
currentLrcProgress.value = 0;
|
||||
if (isPlaying.value) {
|
||||
startProgressAnimation();
|
||||
}
|
||||
});
|
||||
|
||||
// 监听音频对象变化
|
||||
watch(sound, (newSound) => {
|
||||
if (newSound && isPlaying.value) {
|
||||
startProgressAnimation();
|
||||
} else {
|
||||
stopProgressAnimation();
|
||||
@@ -362,12 +484,6 @@ if (isElectron) {
|
||||
|
||||
// 在组件挂载时设置监听器
|
||||
onMounted(() => {
|
||||
if (isPlaying.value) {
|
||||
useLyricProgress();
|
||||
}
|
||||
});
|
||||
|
||||
// 在组件卸载时清理
|
||||
onUnmounted(() => {
|
||||
audioService.stop();
|
||||
setupAudioListeners();
|
||||
useLyricProgress(); // 直接调用,不需要解构返回值
|
||||
});
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { Howl } from 'howler';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { getMusicLrc, getMusicUrl, getParsingMusicUrl } from '@/api/music';
|
||||
import { useMusicHistory } from '@/hooks/MusicHistoryHook';
|
||||
@@ -63,43 +64,91 @@ export const useMusicListHook = () => {
|
||||
fetchSongs(state, playListIndex + 1, playListIndex + 6);
|
||||
};
|
||||
|
||||
const preloadingSounds = ref<Howl[]>([]);
|
||||
|
||||
// 用于预加载下一首歌曲的 MP3 数据
|
||||
const preloadNextSong = (nextSongUrl: string) => {
|
||||
const sound = new Howl({
|
||||
src: [nextSongUrl],
|
||||
html5: true,
|
||||
preload: true,
|
||||
autoplay: false
|
||||
});
|
||||
return sound;
|
||||
try {
|
||||
// 限制同时预加载的数量
|
||||
if (preloadingSounds.value.length >= 2) {
|
||||
const oldestSound = preloadingSounds.value.shift();
|
||||
if (oldestSound) {
|
||||
oldestSound.unload();
|
||||
}
|
||||
}
|
||||
|
||||
const sound = new Howl({
|
||||
src: [nextSongUrl],
|
||||
html5: true,
|
||||
preload: true,
|
||||
autoplay: false
|
||||
});
|
||||
|
||||
preloadingSounds.value.push(sound);
|
||||
|
||||
// 添加加载错误处理
|
||||
sound.on('loaderror', () => {
|
||||
console.error('预加载音频失败:', nextSongUrl);
|
||||
const index = preloadingSounds.value.indexOf(sound);
|
||||
if (index > -1) {
|
||||
preloadingSounds.value.splice(index, 1);
|
||||
}
|
||||
sound.unload();
|
||||
});
|
||||
|
||||
return sound;
|
||||
} catch (error) {
|
||||
console.error('预加载音频出错:', error);
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
const fetchSongs = async (state: any, startIndex: number, endIndex: number) => {
|
||||
const songs = state.playList.slice(
|
||||
Math.max(0, startIndex),
|
||||
Math.min(endIndex, state.playList.length)
|
||||
);
|
||||
try {
|
||||
const songs = state.playList.slice(
|
||||
Math.max(0, startIndex),
|
||||
Math.min(endIndex, state.playList.length)
|
||||
);
|
||||
|
||||
const detailedSongs = await Promise.all(
|
||||
songs.map(async (song: SongResult) => {
|
||||
// 如果歌曲详情已经存在,就不重复请求
|
||||
if (!song.playMusicUrl) {
|
||||
return await getSongDetail(song);
|
||||
const detailedSongs = await Promise.all(
|
||||
songs.map(async (song: SongResult) => {
|
||||
try {
|
||||
// 如果歌曲详情已经存在,就不重复请求
|
||||
if (!song.playMusicUrl) {
|
||||
return await getSongDetail(song);
|
||||
}
|
||||
return song;
|
||||
} catch (error) {
|
||||
console.error('获取歌曲详情失败:', error);
|
||||
return song;
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
// 加载下一首的歌词
|
||||
const nextSong = detailedSongs[0];
|
||||
if (nextSong && !(nextSong.lyric && nextSong.lyric.lrcTimeArray.length > 0)) {
|
||||
try {
|
||||
nextSong.lyric = await loadLrc(nextSong.id);
|
||||
} catch (error) {
|
||||
console.error('加载歌词失败:', error);
|
||||
}
|
||||
return song;
|
||||
})
|
||||
);
|
||||
// 加载下一首的歌词
|
||||
const nextSong = detailedSongs[0];
|
||||
if (!(nextSong.lyric && nextSong.lyric.lrcTimeArray.length > 0)) {
|
||||
nextSong.lyric = await loadLrc(nextSong.id);
|
||||
}
|
||||
}
|
||||
|
||||
// 更新播放列表中的歌曲详情
|
||||
detailedSongs.forEach((song, index) => {
|
||||
state.playList[startIndex + index] = song;
|
||||
});
|
||||
preloadNextSong(nextSong.playMusicUrl);
|
||||
// 更新播放列表中的歌曲详情
|
||||
detailedSongs.forEach((song, index) => {
|
||||
if (song && startIndex + index < state.playList.length) {
|
||||
state.playList[startIndex + index] = song;
|
||||
}
|
||||
});
|
||||
|
||||
// 只预加载下一首歌曲
|
||||
if (nextSong && nextSong.playMusicUrl) {
|
||||
preloadNextSong(nextSong.playMusicUrl);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取歌曲列表失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
const nextPlay = async (state: any) => {
|
||||
@@ -153,7 +202,7 @@ export const useMusicListHook = () => {
|
||||
const { lyrics, times } = parseLyrics(data.lrc.lyric);
|
||||
const tlyric: Record<string, string> = {};
|
||||
|
||||
if (data.tlyric.lyric) {
|
||||
if (data.tlyric && data.tlyric.lyric) {
|
||||
const { lyrics: tLyrics, times: tTimes } = parseLyrics(data.tlyric.lyric);
|
||||
tLyrics.forEach((lyric, index) => {
|
||||
tlyric[tTimes[index].toString()] = lyric.text;
|
||||
@@ -193,6 +242,12 @@ export const useMusicListHook = () => {
|
||||
audioService.getCurrentSound()?.pause();
|
||||
};
|
||||
|
||||
// 在组件卸载时清理预加载的音频
|
||||
onUnmounted(() => {
|
||||
preloadingSounds.value.forEach((sound) => sound.unload());
|
||||
preloadingSounds.value = [];
|
||||
});
|
||||
|
||||
return {
|
||||
handlePlayMusic,
|
||||
nextPlay,
|
||||
|
||||
@@ -11,7 +11,12 @@
|
||||
}
|
||||
|
||||
.n-slider-handle-indicator--top {
|
||||
@apply bg-transparent dark:text-[#ffffffdd] text-[#000000dd] text-2xl px-2 py-1 shadow-none mb-0 !important;
|
||||
@apply bg-transparent text-2xl px-2 py-1 shadow-none mb-0 dark:text-[#ffffffdd] text-[#000000dd] !important;
|
||||
mix-blend-mode: difference !important;
|
||||
}
|
||||
|
||||
.v-binder-follower-container:has(.n-slider-handle-indicator--top) {
|
||||
z-index: 999999999 !important;
|
||||
}
|
||||
|
||||
.text-el {
|
||||
@@ -56,3 +61,11 @@
|
||||
--text-color-300: #3d3d3d;
|
||||
--primary-color: #22c55e;
|
||||
}
|
||||
|
||||
:root {
|
||||
--text-color: #000000dd;
|
||||
}
|
||||
|
||||
:root[class='dark'] {
|
||||
--text-color: #ffffffdd;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
<meta name="apple-mobile-web-app-title" content="网抑云音乐" />
|
||||
<!-- 资源预加载 -->
|
||||
<link rel="preload" href="./assets/icon/iconfont.css" as="style" />
|
||||
<link rel="preload" href="./assets/css/animate.css" as="style" />
|
||||
<link rel="preload" href="./assets/css/base.css" as="style" />
|
||||
|
||||
<!-- 样式表 -->
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- 底部音乐播放 -->
|
||||
<play-bar v-if="isPlay" :style="isMobile && store.state.musicFull ? 'bottom: 0;' : ''" />
|
||||
<play-bar v-show="isPlay" :style="isMobile && store.state.musicFull ? 'bottom: 0;' : ''" />
|
||||
<!-- 下载管理抽屉 -->
|
||||
<download-drawer v-if="isElectron" />
|
||||
</div>
|
||||
|
||||
@@ -5,10 +5,31 @@
|
||||
placement="bottom"
|
||||
:style="{ background: currentBackground || background }"
|
||||
:to="`#layout-main`"
|
||||
:z-index="9998"
|
||||
>
|
||||
<div id="drawer-target">
|
||||
<div class="drawer-back"></div>
|
||||
<div id="drawer-target" :class="[config.theme]">
|
||||
<div
|
||||
class="control-btn absolute top-8 left-8"
|
||||
:class="{ 'pure-mode': config.pureModeEnabled }"
|
||||
@click="isVisible = false"
|
||||
>
|
||||
<i class="ri-arrow-down-s-line"></i>
|
||||
</div>
|
||||
|
||||
<n-popover trigger="click" placement="bottom">
|
||||
<template #trigger>
|
||||
<div
|
||||
class="control-btn absolute top-8 right-8"
|
||||
:class="{ 'pure-mode': config.pureModeEnabled }"
|
||||
>
|
||||
<i class="ri-settings-3-line"></i>
|
||||
</div>
|
||||
</template>
|
||||
<lyric-settings ref="lyricSettingsRef" />
|
||||
</n-popover>
|
||||
|
||||
<div
|
||||
v-show="!config.hideCover"
|
||||
class="music-img"
|
||||
:style="{ color: textColors.theme === 'dark' ? '#000000' : '#ffffff' }"
|
||||
>
|
||||
@@ -31,28 +52,51 @@
|
||||
}"
|
||||
>
|
||||
<span
|
||||
v-for="(item, index) in playMusic.ar || playMusic.song.artists"
|
||||
v-for="(item, index) in artistList"
|
||||
:key="index"
|
||||
class="cursor-pointer hover:text-green-500"
|
||||
@click="handleArtistClick(item.id)"
|
||||
>
|
||||
{{ item.name }}
|
||||
{{ index < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : '' }}
|
||||
{{ index < artistList.length - 1 ? ' / ' : '' }}
|
||||
</span>
|
||||
</n-ellipsis>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="music-content">
|
||||
<div class="music-content" :class="{ center: config.centerLyrics && config.hideCover }">
|
||||
<n-layout
|
||||
ref="lrcSider"
|
||||
class="music-lrc"
|
||||
style="height: 60vh"
|
||||
:style="{
|
||||
height: config.hidePlayBar ? '85vh' : '65vh',
|
||||
width: config.hideCover ? '50vw' : '500px'
|
||||
}"
|
||||
:native-scrollbar="false"
|
||||
@mouseover="mouseOverLayout"
|
||||
@mouseleave="mouseLeaveLayout"
|
||||
>
|
||||
<div ref="lrcContainer">
|
||||
<!-- 歌曲信息 -->
|
||||
|
||||
<div ref="lrcContainer" class="music-lrc-container">
|
||||
<div
|
||||
v-if="config.hideCover"
|
||||
class="music-info-header"
|
||||
:style="{ textAlign: config.centerLyrics ? 'center' : 'left' }"
|
||||
>
|
||||
<div class="music-info-name">{{ playMusic.name }}</div>
|
||||
<div class="music-info-singer">
|
||||
<span
|
||||
v-for="(item, index) in artistList"
|
||||
:key="index"
|
||||
class="cursor-pointer hover:text-green-500"
|
||||
@click="handleArtistClick(item.id)"
|
||||
>
|
||||
{{ item.name }}
|
||||
{{ index < artistList.length - 1 ? ' / ' : '' }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-for="(item, index) in lrcArray"
|
||||
:id="`music-lrc-text-${index}`"
|
||||
@@ -62,7 +106,9 @@
|
||||
@click="setAudioTime(index)"
|
||||
>
|
||||
<span :style="getLrcStyle(index)">{{ item.text }}</span>
|
||||
<div class="music-lrc-text-tr">{{ item.trText }}</div>
|
||||
<div v-show="config.showTranslation" class="music-lrc-text-tr">
|
||||
{{ item.trText }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 无歌词 -->
|
||||
@@ -83,10 +129,12 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { useDebounceFn } from '@vueuse/core';
|
||||
import { computed, onBeforeUnmount, ref, watch } from 'vue';
|
||||
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
||||
import { useStore } from 'vuex';
|
||||
|
||||
import LyricSettings from '@/components/lyric/LyricSettings.vue';
|
||||
import {
|
||||
artistList,
|
||||
lrcArray,
|
||||
nowIndex,
|
||||
playMusic,
|
||||
@@ -104,6 +152,56 @@ const lrcContainer = ref<HTMLElement | null>(null);
|
||||
const currentBackground = ref('');
|
||||
const animationFrame = ref<number | null>(null);
|
||||
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;
|
||||
}
|
||||
|
||||
// 移除 computed 配置
|
||||
const config = ref<LyricConfig>({
|
||||
hideCover: false,
|
||||
centerLyrics: false,
|
||||
fontSize: 22,
|
||||
letterSpacing: 0,
|
||||
lineHeight: 1.5,
|
||||
showTranslation: true,
|
||||
theme: 'default',
|
||||
hidePlayBar: false,
|
||||
pureModeEnabled: false
|
||||
});
|
||||
|
||||
// 监听设置组件的配置变化
|
||||
watch(
|
||||
() => lyricSettingsRef.value?.config,
|
||||
(newConfig) => {
|
||||
if (newConfig) {
|
||||
config.value = newConfig;
|
||||
}
|
||||
},
|
||||
{ deep: true, immediate: true }
|
||||
);
|
||||
|
||||
// 监听本地配置变化,保存到 localStorage
|
||||
watch(
|
||||
() => config.value,
|
||||
(newConfig) => {
|
||||
localStorage.setItem('music-full-config', JSON.stringify(newConfig));
|
||||
if (lyricSettingsRef.value) {
|
||||
lyricSettingsRef.value.config = newConfig;
|
||||
}
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: {
|
||||
@@ -116,6 +214,11 @@ const props = defineProps({
|
||||
}
|
||||
});
|
||||
|
||||
const themeMusic = {
|
||||
light: 'linear-gradient(to bottom, #ffffff, #f5f5f5)',
|
||||
dark: 'linear-gradient(to bottom, #1a1a1a, #000000)'
|
||||
};
|
||||
|
||||
const emit = defineEmits(['update:modelValue']);
|
||||
|
||||
const isVisible = computed({
|
||||
@@ -124,14 +227,17 @@ const isVisible = computed({
|
||||
});
|
||||
|
||||
// 歌词滚动方法
|
||||
const lrcScroll = (behavior = 'smooth') => {
|
||||
const nowEl = document.querySelector(`#music-lrc-text-${nowIndex.value}`);
|
||||
if (isVisible.value && !isMouse.value && nowEl && lrcContainer.value) {
|
||||
const containerRect = lrcContainer.value.getBoundingClientRect();
|
||||
const nowElRect = nowEl.getBoundingClientRect();
|
||||
const relativeTop = nowElRect.top - containerRect.top;
|
||||
const scrollTop = relativeTop - lrcSider.value.$el.getBoundingClientRect().height / 2;
|
||||
lrcSider.value.scrollTo({ top: scrollTop, behavior });
|
||||
const lrcScroll = (behavior: ScrollBehavior = 'smooth') => {
|
||||
const nowEl = document.querySelector(`#music-lrc-text-${nowIndex.value}`) as HTMLElement;
|
||||
if (isVisible.value && !isMouse.value && nowEl && lrcSider.value) {
|
||||
const containerHeight = lrcSider.value.$el.clientHeight;
|
||||
const elementTop = nowEl.offsetTop;
|
||||
const scrollTop = elementTop - containerHeight / 2 + nowEl.clientHeight / 2;
|
||||
|
||||
lrcSider.value.scrollTo({
|
||||
top: scrollTop,
|
||||
behavior
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
@@ -143,6 +249,7 @@ const mouseOverLayout = () => {
|
||||
}
|
||||
isMouse.value = true;
|
||||
};
|
||||
|
||||
const mouseLeaveLayout = () => {
|
||||
if (isMobile.value) {
|
||||
return;
|
||||
@@ -168,41 +275,51 @@ watch(
|
||||
}
|
||||
);
|
||||
|
||||
const setTextColors = (background: string) => {
|
||||
if (!background) {
|
||||
textColors.value = getTextColors();
|
||||
document.documentElement.style.setProperty('--hover-bg-color', getHoverBackgroundColor(false));
|
||||
document.documentElement.style.setProperty('--text-color-primary', textColors.value.primary);
|
||||
document.documentElement.style.setProperty('--text-color-active', textColors.value.active);
|
||||
return;
|
||||
}
|
||||
|
||||
// 更新文字颜色
|
||||
textColors.value = getTextColors(background);
|
||||
isDark.value = textColors.value.active === '#000000';
|
||||
|
||||
document.documentElement.style.setProperty(
|
||||
'--hover-bg-color',
|
||||
getHoverBackgroundColor(isDark.value)
|
||||
);
|
||||
document.documentElement.style.setProperty('--text-color-primary', textColors.value.primary);
|
||||
document.documentElement.style.setProperty('--text-color-active', textColors.value.active);
|
||||
|
||||
// 处理背景颜色动画
|
||||
if (currentBackground.value) {
|
||||
if (animationFrame.value) {
|
||||
cancelAnimationFrame(animationFrame.value);
|
||||
}
|
||||
const result = animateGradient(currentBackground.value, background, (gradient) => {
|
||||
currentBackground.value = gradient;
|
||||
});
|
||||
if (typeof result === 'number') {
|
||||
animationFrame.value = result;
|
||||
}
|
||||
} else {
|
||||
currentBackground.value = background;
|
||||
}
|
||||
};
|
||||
|
||||
// 监听背景变化
|
||||
watch(
|
||||
() => props.background,
|
||||
(newBg) => {
|
||||
if (!newBg) {
|
||||
textColors.value = getTextColors();
|
||||
document.documentElement.style.setProperty(
|
||||
'--hover-bg-color',
|
||||
getHoverBackgroundColor(false)
|
||||
);
|
||||
document.documentElement.style.setProperty('--text-color-primary', textColors.value.primary);
|
||||
document.documentElement.style.setProperty('--text-color-active', textColors.value.active);
|
||||
return;
|
||||
}
|
||||
|
||||
if (currentBackground.value) {
|
||||
if (animationFrame.value) {
|
||||
cancelAnimationFrame(animationFrame.value);
|
||||
}
|
||||
animationFrame.value = animateGradient(currentBackground.value, newBg, (gradient) => {
|
||||
currentBackground.value = gradient;
|
||||
});
|
||||
if (config.value.theme === 'default') {
|
||||
setTextColors(newBg);
|
||||
} else {
|
||||
currentBackground.value = newBg;
|
||||
setTextColors(themeMusic[config.value.theme] || props.background);
|
||||
}
|
||||
|
||||
textColors.value = getTextColors(newBg);
|
||||
isDark.value = textColors.value.active === '#000000';
|
||||
|
||||
document.documentElement.style.setProperty(
|
||||
'--hover-bg-color',
|
||||
getHoverBackgroundColor(isDark.value)
|
||||
);
|
||||
document.documentElement.style.setProperty('--text-color-primary', textColors.value.primary);
|
||||
document.documentElement.style.setProperty('--text-color-active', textColors.value.active);
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
@@ -247,8 +364,124 @@ const handleArtistClick = (id: number) => {
|
||||
store.commit('setCurrentArtistId', id);
|
||||
};
|
||||
|
||||
const setData = computed(() => store.state.setData);
|
||||
|
||||
// 监听字体变化并更新 CSS 变量
|
||||
watch(
|
||||
() => [setData.value.fontFamily, setData.value.fontScope],
|
||||
([newFont, fontScope]) => {
|
||||
const defaultFonts =
|
||||
'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif';
|
||||
|
||||
// 如果不是歌词模式或全局模式,使用默认字体
|
||||
if (fontScope !== 'lyric' && fontScope !== 'global') {
|
||||
document.documentElement.style.setProperty('--current-font-family', defaultFonts);
|
||||
return;
|
||||
}
|
||||
|
||||
if (newFont === 'system-ui') {
|
||||
document.documentElement.style.setProperty('--current-font-family', defaultFonts);
|
||||
} else {
|
||||
// 处理多个字体,确保每个字体名都被正确引用
|
||||
const fontList = newFont.split(',').map((font) => {
|
||||
const trimmedFont = font.trim();
|
||||
// 如果字体名包含空格或特殊字符,添加引号(如果还没有引号的话)
|
||||
return /[\s'"()]/.test(trimmedFont) && !/^['"].*['"]$/.test(trimmedFont)
|
||||
? `"${trimmedFont}"`
|
||||
: trimmedFont;
|
||||
});
|
||||
|
||||
// 将选择的字体和默认字体组合
|
||||
document.documentElement.style.setProperty(
|
||||
'--current-font-family',
|
||||
`${fontList.join(', ')}, ${defaultFonts}`
|
||||
);
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
// 监听配置变化并保存到本地存储
|
||||
watch(
|
||||
() => config.value,
|
||||
(newConfig) => {
|
||||
localStorage.setItem('music-full-config', JSON.stringify(newConfig));
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
// 监听滚动事件
|
||||
const handleScroll = () => {
|
||||
if (!lrcSider.value || !config.value.hideCover) return;
|
||||
const { scrollTop } = lrcSider.value.$el;
|
||||
showStickyHeader.value = scrollTop > 100;
|
||||
};
|
||||
|
||||
// 添加滚动监听
|
||||
onMounted(() => {
|
||||
if (lrcSider.value?.$el) {
|
||||
lrcSider.value.$el.addEventListener('scroll', handleScroll);
|
||||
}
|
||||
});
|
||||
|
||||
// 移除滚动监听
|
||||
onBeforeUnmount(() => {
|
||||
if (animationFrame.value) {
|
||||
cancelAnimationFrame(animationFrame.value);
|
||||
}
|
||||
if (lrcSider.value?.$el) {
|
||||
lrcSider.value.$el.removeEventListener('scroll', handleScroll);
|
||||
}
|
||||
});
|
||||
|
||||
// 监听字体大小变化
|
||||
watch(
|
||||
() => config.value.fontSize,
|
||||
(newSize) => {
|
||||
document.documentElement.style.setProperty('--lyric-font-size', `${newSize}px`);
|
||||
}
|
||||
);
|
||||
|
||||
// 监听主题变化
|
||||
watch(
|
||||
() => config.value.theme,
|
||||
(newTheme) => {
|
||||
const newBackground = themeMusic[newTheme] || props.background;
|
||||
setTextColors(newBackground);
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
// 添加文字间距监听
|
||||
watch(
|
||||
() => config.value.letterSpacing,
|
||||
(newSpacing) => {
|
||||
document.documentElement.style.setProperty('--lyric-letter-spacing', `${newSpacing}px`);
|
||||
}
|
||||
);
|
||||
|
||||
// 添加行高监听
|
||||
watch(
|
||||
() => config.value.lineHeight,
|
||||
(newLineHeight) => {
|
||||
document.documentElement.style.setProperty('--lyric-line-height', newLineHeight.toString());
|
||||
}
|
||||
);
|
||||
|
||||
// 加载保存的配置
|
||||
onMounted(() => {
|
||||
const savedConfig = localStorage.getItem('music-full-config');
|
||||
if (savedConfig) {
|
||||
config.value = { ...config.value, ...JSON.parse(savedConfig) };
|
||||
}
|
||||
if (lrcSider.value?.$el) {
|
||||
lrcSider.value.$el.addEventListener('scroll', handleScroll);
|
||||
}
|
||||
});
|
||||
|
||||
defineExpose({
|
||||
lrcScroll
|
||||
lrcScroll,
|
||||
config
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -275,7 +508,7 @@ defineExpose({
|
||||
}
|
||||
|
||||
#drawer-target {
|
||||
@apply top-0 left-0 absolute overflow-hidden rounded px-24 flex items-center justify-center w-full h-full pb-8;
|
||||
@apply top-0 left-0 absolute overflow-hidden rounded px-24 flex items-center justify-center w-full h-full py-8;
|
||||
animation-duration: 300ms;
|
||||
|
||||
.music-img {
|
||||
@@ -283,12 +516,23 @@ defineExpose({
|
||||
max-width: 360px;
|
||||
max-height: 360px;
|
||||
.img {
|
||||
@apply rounded-xl w-full h-full shadow-2xl;
|
||||
@apply rounded-xl w-full h-full shadow-2xl;
|
||||
}
|
||||
}
|
||||
|
||||
.music-content {
|
||||
@apply flex flex-col justify-center items-center relative;
|
||||
width: 500px;
|
||||
|
||||
&.center {
|
||||
@apply w-full;
|
||||
.music-lrc {
|
||||
@apply w-full max-w-3xl mx-auto;
|
||||
}
|
||||
.music-lrc-text {
|
||||
@apply text-center;
|
||||
}
|
||||
}
|
||||
|
||||
&-name {
|
||||
@apply font-bold text-2xl pb-1 pt-4;
|
||||
@@ -303,15 +547,46 @@ defineExpose({
|
||||
display: none;
|
||||
@apply flex justify-center items-center;
|
||||
}
|
||||
|
||||
.music-lrc-container {
|
||||
padding-top: 30vh;
|
||||
}
|
||||
|
||||
.music-lrc {
|
||||
background-color: inherit;
|
||||
width: 500px;
|
||||
height: 550px;
|
||||
position: relative;
|
||||
mask-image: linear-gradient(to bottom, transparent 0%, black 10%, black 90%, transparent 100%);
|
||||
-webkit-mask-image: linear-gradient(
|
||||
to bottom,
|
||||
transparent 0%,
|
||||
black 10%,
|
||||
black 90%,
|
||||
transparent 100%
|
||||
);
|
||||
|
||||
.music-info-header {
|
||||
@apply mb-8;
|
||||
|
||||
.music-info-name {
|
||||
@apply text-4xl font-bold mb-2;
|
||||
color: var(--text-color-active);
|
||||
}
|
||||
|
||||
.music-info-singer {
|
||||
@apply text-base;
|
||||
color: var(--text-color-primary);
|
||||
}
|
||||
}
|
||||
|
||||
&-text {
|
||||
@apply text-2xl cursor-pointer font-bold px-2 py-4;
|
||||
transition: all 0.3s ease;
|
||||
background-color: transparent;
|
||||
font-size: var(--lyric-font-size, 22px) !important;
|
||||
letter-spacing: var(--lyric-letter-spacing, 0) !important;
|
||||
line-height: var(--lyric-line-height, 2) !important;
|
||||
|
||||
span {
|
||||
background-clip: text !important;
|
||||
@@ -364,4 +639,57 @@ defineExpose({
|
||||
.music-drawer {
|
||||
transition: none; // 移除之前的过渡效果,现在使用 JS 动画
|
||||
}
|
||||
|
||||
// 添加全局字体样式
|
||||
:root {
|
||||
--current-font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
|
||||
'Helvetica Neue', Arial, sans-serif;
|
||||
}
|
||||
|
||||
#drawer-target {
|
||||
@apply top-0 left-0 absolute overflow-hidden rounded px-24 flex items-center justify-center w-full h-full py-8;
|
||||
animation-duration: 300ms;
|
||||
|
||||
.music-lrc-text {
|
||||
font-family: var(--current-font-family);
|
||||
}
|
||||
}
|
||||
|
||||
.close-btn {
|
||||
opacity: 0.3;
|
||||
transition: opacity 0.3s ease;
|
||||
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.control-btn {
|
||||
@apply w-9 h-9 flex items-center justify-center rounded cursor-pointer transition-all duration-300;
|
||||
background: rgba(142, 142, 142, 0.192);
|
||||
backdrop-filter: blur(12px);
|
||||
|
||||
i {
|
||||
@apply text-xl;
|
||||
color: var(--text-color-active);
|
||||
}
|
||||
|
||||
&.pure-mode {
|
||||
background: transparent;
|
||||
backdrop-filter: none;
|
||||
|
||||
&:not(:hover) {
|
||||
i {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: rgba(126, 121, 121, 0.2);
|
||||
i {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
<template>
|
||||
<!-- 展开全屏 -->
|
||||
<!-- 底部播放栏 -->
|
||||
|
||||
<div
|
||||
class="music-play-bar"
|
||||
:class="
|
||||
setAnimationClass('animate__bounceInUp') + ' ' + (musicFullVisible ? 'play-bar-opcity' : '')
|
||||
"
|
||||
:class="[
|
||||
setAnimationClass('animate__bounceInUp'),
|
||||
musicFullVisible ? 'play-bar-opcity' : '',
|
||||
musicFullVisible && MusicFullRef?.config?.hidePlayBar
|
||||
? 'animate__animated animate__slideOutDown'
|
||||
: ''
|
||||
]"
|
||||
:style="{
|
||||
color: musicFullVisible
|
||||
? textColors.theme === 'dark'
|
||||
@@ -28,7 +29,7 @@
|
||||
</div>
|
||||
<div class="play-bar-img-wrapper" @click="setMusicFull">
|
||||
<n-image
|
||||
:src="getImgUrl(playMusic?.picUrl, '500y500')"
|
||||
:src="getImgUrl(playMusic?.picUrl, '100y100')"
|
||||
class="play-bar-img"
|
||||
lazy
|
||||
preview-disabled
|
||||
@@ -60,13 +61,12 @@
|
||||
}"
|
||||
>
|
||||
<span
|
||||
v-for="(artists, artistsindex) in playMusic.ar || playMusic.song.artists"
|
||||
v-for="(artists, artistsindex) in artistList"
|
||||
:key="artistsindex"
|
||||
class="cursor-pointer hover:text-green-500"
|
||||
@click="handleArtistClick(artists.id)"
|
||||
>
|
||||
{{ artists.name
|
||||
}}{{ artistsindex < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : '' }}
|
||||
{{ artists.name }}{{ artistsindex < artistList.length - 1 ? ' / ' : '' }}
|
||||
</span>
|
||||
</n-ellipsis>
|
||||
</div>
|
||||
@@ -154,31 +154,34 @@
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { useThrottleFn } from '@vueuse/core';
|
||||
import { useTemplateRef } from 'vue';
|
||||
import { computed, ref, useTemplateRef, watch } from 'vue';
|
||||
import { useStore } from 'vuex';
|
||||
|
||||
import SongItem from '@/components/common/SongItem.vue';
|
||||
import {
|
||||
allTime,
|
||||
artistList,
|
||||
isLyricWindowOpen,
|
||||
nowTime,
|
||||
openLyric,
|
||||
playMusic,
|
||||
sound,
|
||||
textColors
|
||||
} from '@/hooks/MusicHook';
|
||||
import { audioService } from '@/services/audioService';
|
||||
import type { SongResult } from '@/type/music';
|
||||
import { getImgUrl, isElectron, isMobile, secondToMinute, setAnimationClass } from '@/utils';
|
||||
import { showShortcutToast } from '@/utils/shortcutToast';
|
||||
|
||||
import MusicFull from './MusicFull.vue';
|
||||
|
||||
const store = useStore();
|
||||
|
||||
// 播放的音乐信息
|
||||
const playMusic = computed(() => store.state.playMusic as SongResult);
|
||||
// 是否播放
|
||||
const play = computed(() => store.state.play as boolean);
|
||||
// 播放列表
|
||||
const playList = computed(() => store.state.playList as SongResult[]);
|
||||
|
||||
// 背景颜色
|
||||
const background = ref('#000');
|
||||
|
||||
watch(
|
||||
@@ -189,7 +192,7 @@ watch(
|
||||
{ immediate: true, deep: true }
|
||||
);
|
||||
|
||||
// 使用 useThrottleFn 创建节流版本的 seek 函数
|
||||
// 节流版本的 seek 函数
|
||||
const throttledSeek = useThrottleFn((value: number) => {
|
||||
if (!sound.value) return;
|
||||
sound.value.seek(value);
|
||||
@@ -284,16 +287,19 @@ const MusicFullRef = ref<any>(null);
|
||||
|
||||
// 播放暂停按钮事件
|
||||
const playMusicEvent = async () => {
|
||||
if (play.value) {
|
||||
if (sound.value) {
|
||||
sound.value.pause();
|
||||
try {
|
||||
if (play.value) {
|
||||
audioService.pause();
|
||||
store.commit('setPlayMusic', false);
|
||||
} else {
|
||||
audioService.play();
|
||||
store.commit('setPlayMusic', true);
|
||||
}
|
||||
store.commit('setPlayMusic', false);
|
||||
} else {
|
||||
if (sound.value) {
|
||||
sound.value.play();
|
||||
} catch (error) {
|
||||
console.log('error', error);
|
||||
if (play.value) {
|
||||
store.commit('nextPlay');
|
||||
}
|
||||
store.commit('setPlayMusic', true);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -338,6 +344,62 @@ const handleArtistClick = (id: number) => {
|
||||
musicFullVisible.value = false;
|
||||
store.commit('setCurrentArtistId', id);
|
||||
};
|
||||
|
||||
// 添加全局快捷键处理
|
||||
if (isElectron) {
|
||||
window.electron.ipcRenderer.on('global-shortcut', (_, action: string) => {
|
||||
console.log('action', action);
|
||||
switch (action) {
|
||||
case 'togglePlay':
|
||||
playMusicEvent();
|
||||
showShortcutToast(
|
||||
store.state.play ? '开始播放' : '暂停播放',
|
||||
store.state.play ? 'ri-pause-circle-line' : 'ri-play-circle-line'
|
||||
);
|
||||
break;
|
||||
case 'prevPlay':
|
||||
handlePrev();
|
||||
showShortcutToast('上一首', 'ri-skip-back-line');
|
||||
break;
|
||||
case 'nextPlay':
|
||||
handleNext();
|
||||
showShortcutToast('下一首', 'ri-skip-forward-line');
|
||||
break;
|
||||
case 'volumeUp':
|
||||
if (volumeSlider.value < 100) {
|
||||
volumeSlider.value = Math.min(volumeSlider.value + 10, 100);
|
||||
showShortcutToast(`音量${volumeSlider.value}%`, 'ri-volume-up-line');
|
||||
}
|
||||
break;
|
||||
case 'volumeDown':
|
||||
if (volumeSlider.value > 0) {
|
||||
volumeSlider.value = Math.max(volumeSlider.value - 10, 0);
|
||||
showShortcutToast(`音量${volumeSlider.value}%`, 'ri-volume-down-line');
|
||||
}
|
||||
break;
|
||||
case 'toggleFavorite':
|
||||
toggleFavorite(new Event('click'));
|
||||
showShortcutToast(
|
||||
isFavorite.value ? `已收藏${playMusic.value.name}` : `已取消收藏${playMusic.value.name}`,
|
||||
isFavorite.value ? 'ri-heart-fill' : 'ri-heart-line'
|
||||
);
|
||||
break;
|
||||
default:
|
||||
console.log('未知的快捷键动作:', action);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 监听播放栏显示状态
|
||||
watch(
|
||||
() => MusicFullRef.value?.config?.hidePlayBar,
|
||||
(newVal) => {
|
||||
if (newVal && musicFullVisible.value) {
|
||||
// 使用 animate.css 动画,不需要手动设置样式
|
||||
}
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -351,6 +413,16 @@ const handleArtistClick = (id: number) => {
|
||||
z-index: 9999;
|
||||
animation-duration: 0.5s !important;
|
||||
|
||||
&.play-bar-opcity {
|
||||
@apply bg-transparent !important;
|
||||
box-shadow: 0 0 20px 5px #0000001d;
|
||||
}
|
||||
|
||||
&.animate__slideOutDown {
|
||||
animation-duration: 0.3s !important;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.music-content {
|
||||
width: 160px;
|
||||
@apply ml-4;
|
||||
@@ -365,11 +437,6 @@ const handleArtistClick = (id: number) => {
|
||||
}
|
||||
}
|
||||
|
||||
.play-bar-opcity {
|
||||
@apply bg-transparent !important;
|
||||
box-shadow: 0 0 20px 5px #0000001d;
|
||||
}
|
||||
|
||||
.play-bar-img {
|
||||
@apply w-14 h-14 rounded-2xl;
|
||||
}
|
||||
@@ -395,7 +462,7 @@ const handleArtistClick = (id: number) => {
|
||||
|
||||
&-play {
|
||||
@apply flex justify-center items-center w-20 h-12 rounded-full mx-4 transition text-gray-500;
|
||||
@apply bg-gray-100 bg-opacity-60 hover:bg-gray-200;
|
||||
@apply bg-gray-100 bg-opacity-60 dark:bg-gray-800 dark:bg-opacity-60 hover:bg-gray-200;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
<div id="title-bar" @mousedown="drag">
|
||||
<div id="title">Alger Music</div>
|
||||
<div id="buttons">
|
||||
<button @click="minimize">
|
||||
<div class="button" @click="minimize">
|
||||
<i class="iconfont icon-minisize"></i>
|
||||
</button>
|
||||
<button @click="close">
|
||||
</div>
|
||||
<div class="button" @click="close">
|
||||
<i class="iconfont icon-close"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -107,7 +107,7 @@ const drag = (event: MouseEvent) => {
|
||||
-webkit-app-region: no-drag;
|
||||
}
|
||||
|
||||
button {
|
||||
.button {
|
||||
@apply text-gray-600 dark:text-gray-400 hover:text-green-500;
|
||||
}
|
||||
|
||||
|
||||
@@ -121,52 +121,83 @@ class AudioService {
|
||||
}
|
||||
|
||||
// 播放控制相关
|
||||
play(url: string, track: SongResult) {
|
||||
// Howler.unload();
|
||||
if (this.currentSound) {
|
||||
this.currentSound.unload();
|
||||
play(url?: string, track?: SongResult): Promise<Howl> {
|
||||
if (this.currentSound && !url && !track) {
|
||||
this.currentSound.play();
|
||||
return Promise.resolve(this.currentSound as Howl);
|
||||
}
|
||||
this.currentSound = null;
|
||||
this.currentTrack = track;
|
||||
return new Promise((resolve, reject) => {
|
||||
let retryCount = 0;
|
||||
const maxRetries = 1;
|
||||
|
||||
this.currentSound = new Howl({
|
||||
src: [url],
|
||||
html5: true,
|
||||
autoplay: true,
|
||||
volume: localStorage.getItem('volume')
|
||||
? parseFloat(localStorage.getItem('volume') as string)
|
||||
: 1
|
||||
const tryPlay = () => {
|
||||
if (this.currentSound) {
|
||||
this.currentSound.unload();
|
||||
}
|
||||
this.currentSound = null;
|
||||
this.currentTrack = track as SongResult;
|
||||
|
||||
this.currentSound = new Howl({
|
||||
src: [url as string],
|
||||
html5: true,
|
||||
autoplay: true,
|
||||
volume: localStorage.getItem('volume')
|
||||
? parseFloat(localStorage.getItem('volume') as string)
|
||||
: 1,
|
||||
onloaderror: () => {
|
||||
console.error('Audio load error');
|
||||
if (retryCount < maxRetries) {
|
||||
retryCount++;
|
||||
console.log(`Retrying playback (${retryCount}/${maxRetries})...`);
|
||||
setTimeout(tryPlay, 1000 * retryCount);
|
||||
} else {
|
||||
reject(new Error('音频加载失败,请尝试切换其他歌曲'));
|
||||
}
|
||||
},
|
||||
onplayerror: () => {
|
||||
console.error('Audio play error');
|
||||
if (retryCount < maxRetries) {
|
||||
retryCount++;
|
||||
console.log(`Retrying playback (${retryCount}/${maxRetries})...`);
|
||||
setTimeout(tryPlay, 1000 * retryCount);
|
||||
} else {
|
||||
reject(new Error('音频播放失败,请尝试切换其他歌曲'));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 更新媒体会话元数据
|
||||
this.updateMediaSessionMetadata(track as SongResult);
|
||||
|
||||
// 设置音频事件监听
|
||||
this.currentSound.on('play', () => {
|
||||
this.updateMediaSessionState(true);
|
||||
this.emit('play');
|
||||
});
|
||||
|
||||
this.currentSound.on('pause', () => {
|
||||
this.updateMediaSessionState(false);
|
||||
this.emit('pause');
|
||||
});
|
||||
|
||||
this.currentSound.on('end', () => {
|
||||
this.emit('end');
|
||||
});
|
||||
|
||||
this.currentSound.on('seek', () => {
|
||||
this.updateMediaSessionPositionState();
|
||||
this.emit('seek');
|
||||
});
|
||||
|
||||
this.currentSound.on('load', () => {
|
||||
this.updateMediaSessionPositionState();
|
||||
this.emit('load');
|
||||
resolve(this.currentSound as Howl);
|
||||
});
|
||||
};
|
||||
|
||||
tryPlay();
|
||||
});
|
||||
|
||||
// 更新媒体会话元数据
|
||||
this.updateMediaSessionMetadata(track);
|
||||
|
||||
// 设置音频事件监听
|
||||
this.currentSound.on('play', () => {
|
||||
this.updateMediaSessionState(true);
|
||||
this.emit('play');
|
||||
});
|
||||
|
||||
this.currentSound.on('pause', () => {
|
||||
this.updateMediaSessionState(false);
|
||||
this.emit('pause');
|
||||
});
|
||||
|
||||
this.currentSound.on('end', () => {
|
||||
this.emit('end');
|
||||
});
|
||||
|
||||
this.currentSound.on('seek', () => {
|
||||
this.updateMediaSessionPositionState();
|
||||
this.emit('seek');
|
||||
});
|
||||
|
||||
this.currentSound.on('load', () => {
|
||||
this.updateMediaSessionPositionState();
|
||||
this.emit('load');
|
||||
});
|
||||
|
||||
return this.currentSound;
|
||||
}
|
||||
|
||||
getCurrentSound() {
|
||||
@@ -202,6 +233,17 @@ class AudioService {
|
||||
this.updateMediaSessionPositionState();
|
||||
}
|
||||
}
|
||||
|
||||
pause() {
|
||||
if (this.currentSound) {
|
||||
this.currentSound.pause();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
clearAllListeners() {
|
||||
this.callbacks = {};
|
||||
}
|
||||
}
|
||||
|
||||
export const audioService = new AudioService();
|
||||
|
||||
@@ -37,6 +37,7 @@ export interface State {
|
||||
showUpdateModal: boolean;
|
||||
showArtistDrawer: boolean;
|
||||
currentArtistId: number | null;
|
||||
systemFonts: { label: string; value: string }[];
|
||||
}
|
||||
|
||||
const state: State = {
|
||||
@@ -59,7 +60,8 @@ const state: State = {
|
||||
musicFull: false,
|
||||
showUpdateModal: false,
|
||||
showArtistDrawer: false,
|
||||
currentArtistId: null
|
||||
currentArtistId: null,
|
||||
systemFonts: [{ label: '系统默认', value: 'system-ui' }]
|
||||
};
|
||||
|
||||
const { handlePlayMusic, nextPlay, prevPlay } = useMusicListHook();
|
||||
@@ -160,6 +162,15 @@ const mutations = {
|
||||
},
|
||||
setCurrentArtistId(state, id: number) {
|
||||
state.currentArtistId = id;
|
||||
},
|
||||
setSystemFonts(state, fonts: string[]) {
|
||||
state.systemFonts = [
|
||||
{ label: '系统默认', value: 'system-ui' },
|
||||
...fonts.map((font) => ({
|
||||
label: font,
|
||||
value: font
|
||||
}))
|
||||
];
|
||||
}
|
||||
};
|
||||
|
||||
@@ -167,7 +178,10 @@ const actions = {
|
||||
initializeSettings({ commit }: { commit: any }) {
|
||||
if (isElectron) {
|
||||
const setData = window.electron.ipcRenderer.sendSync('get-store-value', 'set');
|
||||
commit('setSetData', setData || defaultSettings);
|
||||
commit('setSetData', {
|
||||
...defaultSettings,
|
||||
...setData
|
||||
});
|
||||
} else {
|
||||
const savedSettings = localStorage.getItem('appSettings');
|
||||
if (savedSettings) {
|
||||
@@ -213,6 +227,17 @@ const actions = {
|
||||
},
|
||||
showArtist({ commit }, id: number) {
|
||||
commit('setCurrentArtistId', id);
|
||||
},
|
||||
async initializeSystemFonts({ commit, state }) {
|
||||
// 如果已经有字体列表(不只是默认字体),则不重复获取
|
||||
if (state.systemFonts.length > 1) return;
|
||||
|
||||
try {
|
||||
const fonts = await window.api.invoke('get-system-fonts');
|
||||
commit('setSystemFonts', fonts);
|
||||
} catch (error) {
|
||||
console.error('获取系统字体失败:', error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -160,7 +160,7 @@ interface Album {
|
||||
picId_str: string;
|
||||
}
|
||||
|
||||
interface Artist {
|
||||
export interface Artist {
|
||||
name: string;
|
||||
id: number;
|
||||
picId: number;
|
||||
|
||||
@@ -1,8 +1,17 @@
|
||||
import { useDebounceFn } from '@vueuse/core';
|
||||
import tinycolor from 'tinycolor2';
|
||||
|
||||
interface IColor {
|
||||
backgroundColor: string;
|
||||
primaryColor: string;
|
||||
}
|
||||
|
||||
interface ITextColors {
|
||||
primary: string;
|
||||
active: string;
|
||||
theme: string;
|
||||
}
|
||||
|
||||
export const getImageLinearBackground = async (imageSrc: string): Promise<IColor> => {
|
||||
try {
|
||||
const primaryColor = await getImagePrimaryColor(imageSrc);
|
||||
@@ -96,126 +105,43 @@ const getAverageColor = (data: Uint8ClampedArray): number[] => {
|
||||
};
|
||||
|
||||
const generateGradientBackground = (color: string): string => {
|
||||
const [r, g, b] = color.match(/\d+/g)?.map(Number) || [0, 0, 0];
|
||||
const [h, s, l] = rgbToHsl(r, g, b);
|
||||
const tc = tinycolor(color);
|
||||
const hsl = tc.toHsl();
|
||||
|
||||
// 增加亮度和暗度的差异
|
||||
const lightL = Math.min(l + 0.2, 0.95);
|
||||
const darkL = Math.max(l - 0.3, 0.05);
|
||||
const midL = (lightL + darkL) / 2;
|
||||
const lightColor = tinycolor({ h: hsl.h, s: hsl.s * 0.8, l: Math.min(hsl.l + 0.2, 0.95) });
|
||||
const midColor = tinycolor({ h: hsl.h, s: hsl.s, l: hsl.l });
|
||||
const darkColor = tinycolor({
|
||||
h: hsl.h,
|
||||
s: Math.min(hsl.s * 1.2, 1),
|
||||
l: Math.max(hsl.l - 0.3, 0.05)
|
||||
});
|
||||
|
||||
// 调整饱和度以增强效果
|
||||
const lightS = Math.min(s * 0.8, 1);
|
||||
const darkS = Math.min(s * 1.2, 1);
|
||||
|
||||
const [lightR, lightG, lightB] = hslToRgb(h, lightS, lightL);
|
||||
const [midR, midG, midB] = hslToRgb(h, s, midL);
|
||||
const [darkR, darkG, darkB] = hslToRgb(h, darkS, darkL);
|
||||
|
||||
const lightColor = `rgb(${lightR}, ${lightG}, ${lightB})`;
|
||||
const midColor = `rgb(${midR}, ${midG}, ${midB})`;
|
||||
const darkColor = `rgb(${darkR}, ${darkG}, ${darkB})`;
|
||||
|
||||
// 使用三个颜色点创建更丰富的渐变
|
||||
return `linear-gradient(to bottom, ${lightColor} 0%, ${midColor} 50%, ${darkColor} 100%)`;
|
||||
};
|
||||
|
||||
// Helper functions (unchanged)
|
||||
function rgbToHsl(r: number, g: number, b: number): [number, number, number] {
|
||||
r /= 255;
|
||||
g /= 255;
|
||||
b /= 255;
|
||||
const max = Math.max(r, g, b);
|
||||
const min = Math.min(r, g, b);
|
||||
let h = 0;
|
||||
let s;
|
||||
const l = (max + min) / 2;
|
||||
|
||||
if (max === min) {
|
||||
h = s = 0;
|
||||
} else {
|
||||
const d = max - min;
|
||||
s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
|
||||
switch (max) {
|
||||
case r:
|
||||
h = (g - b) / d + (g < b ? 6 : 0);
|
||||
break;
|
||||
case g:
|
||||
h = (b - r) / d + 2;
|
||||
break;
|
||||
case b:
|
||||
h = (r - g) / d + 4;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
h /= 6;
|
||||
}
|
||||
|
||||
return [h, s, l];
|
||||
}
|
||||
|
||||
function hslToRgb(h: number, s: number, l: number): [number, number, number] {
|
||||
let r;
|
||||
let g;
|
||||
let b;
|
||||
|
||||
if (s === 0) {
|
||||
r = g = b = l;
|
||||
} else {
|
||||
const hue2rgb = (p: number, q: number, t: number) => {
|
||||
if (t < 0) t += 1;
|
||||
if (t > 1) t -= 1;
|
||||
if (t < 1 / 6) return p + (q - p) * 6 * t;
|
||||
if (t < 1 / 2) return q;
|
||||
if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
|
||||
return p;
|
||||
};
|
||||
|
||||
const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
|
||||
const p = 2 * l - q;
|
||||
r = hue2rgb(p, q, h + 1 / 3);
|
||||
g = hue2rgb(p, q, h);
|
||||
b = hue2rgb(p, q, h - 1 / 3);
|
||||
}
|
||||
|
||||
return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
|
||||
}
|
||||
|
||||
// 添加新的接口
|
||||
interface ITextColors {
|
||||
primary: string;
|
||||
active: string;
|
||||
theme: string;
|
||||
}
|
||||
|
||||
// 添加新的函数
|
||||
export const calculateBrightness = (r: number, g: number, b: number): number => {
|
||||
return (0.299 * r + 0.587 * g + 0.114 * b) / 255;
|
||||
return `linear-gradient(to bottom, ${lightColor.toRgbString()} 0%, ${midColor.toRgbString()} 50%, ${darkColor.toRgbString()} 100%)`;
|
||||
};
|
||||
|
||||
export const parseGradient = (gradientStr: string) => {
|
||||
const matches = gradientStr.match(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/g);
|
||||
if (!matches) return [];
|
||||
return matches.map((rgb) => {
|
||||
const [r, g, b] = rgb.match(/\d+/g)!.map(Number);
|
||||
return { r, g, b };
|
||||
if (!gradientStr) return [];
|
||||
|
||||
// 处理非渐变色
|
||||
if (!gradientStr.startsWith('linear-gradient')) {
|
||||
const color = tinycolor(gradientStr);
|
||||
if (color.isValid()) {
|
||||
const rgb = color.toRgb();
|
||||
return [{ r: rgb.r, g: rgb.g, b: rgb.b }];
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
// 处理渐变色,支持 rgb、rgba 和十六进制颜色
|
||||
const colorMatches = gradientStr.match(/(?:(?:rgb|rgba)\([^)]+\)|#[0-9a-fA-F]{3,8})/g) || [];
|
||||
return colorMatches.map((color) => {
|
||||
const tc = tinycolor(color);
|
||||
const rgb = tc.toRgb();
|
||||
return { r: rgb.r, g: rgb.g, b: rgb.b };
|
||||
});
|
||||
};
|
||||
|
||||
export const interpolateRGB = (start: number, end: number, progress: number) => {
|
||||
return Math.round(start + (end - start) * progress);
|
||||
};
|
||||
|
||||
export const createGradientString = (
|
||||
colors: { r: number; g: number; b: number }[],
|
||||
percentages = [0, 50, 100]
|
||||
) => {
|
||||
return `linear-gradient(to bottom, ${colors
|
||||
.map((color, i) => `rgb(${color.r}, ${color.g}, ${color.b}) ${percentages[i]}%`)
|
||||
.join(', ')})`;
|
||||
};
|
||||
|
||||
export const getTextColors = (gradient: string = ''): ITextColors => {
|
||||
const defaultColors = {
|
||||
primary: 'rgba(255, 255, 255, 0.54)',
|
||||
@@ -226,11 +152,12 @@ export const getTextColors = (gradient: string = ''): ITextColors => {
|
||||
if (!gradient) return defaultColors;
|
||||
|
||||
const colors = parseGradient(gradient);
|
||||
console.log('colors', colors);
|
||||
if (!colors.length) return defaultColors;
|
||||
|
||||
const mainColor = colors[1] || colors[0];
|
||||
const brightness = calculateBrightness(mainColor.r, mainColor.g, mainColor.b);
|
||||
const isDark = brightness > 0.6;
|
||||
const mainColor = colors.length === 1 ? colors[0] : colors[1] || colors[0];
|
||||
const tc = tinycolor(mainColor);
|
||||
const isDark = tc.getBrightness() > 155; // tinycolor 的亮度范围是 0-255
|
||||
|
||||
return {
|
||||
primary: isDark ? 'rgba(0, 0, 0, 0.54)' : 'rgba(255, 255, 255, 0.54)',
|
||||
@@ -243,35 +170,130 @@ export const getHoverBackgroundColor = (isDark: boolean): string => {
|
||||
return isDark ? 'rgba(0, 0, 0, 0.08)' : 'rgba(255, 255, 255, 0.08)';
|
||||
};
|
||||
|
||||
export const animateGradient = (
|
||||
oldGradient: string,
|
||||
newGradient: string,
|
||||
onUpdate: (gradient: string) => void,
|
||||
duration = 1000
|
||||
) => {
|
||||
const startColors = parseGradient(oldGradient);
|
||||
const endColors = parseGradient(newGradient);
|
||||
if (startColors.length !== endColors.length) return null;
|
||||
export const animateGradient = (() => {
|
||||
let currentAnimation: number | null = null;
|
||||
let isAnimating = false;
|
||||
let lastProgress = 0;
|
||||
|
||||
const startTime = performance.now();
|
||||
|
||||
const animate = (currentTime: number) => {
|
||||
const elapsed = currentTime - startTime;
|
||||
const progress = Math.min(elapsed / duration, 1);
|
||||
|
||||
const currentColors = startColors.map((startColor, i) => ({
|
||||
r: interpolateRGB(startColor.r, endColors[i].r, progress),
|
||||
g: interpolateRGB(startColor.g, endColors[i].g, progress),
|
||||
b: interpolateRGB(startColor.b, endColors[i].b, progress)
|
||||
}));
|
||||
|
||||
onUpdate(createGradientString(currentColors));
|
||||
|
||||
if (progress < 1) {
|
||||
return requestAnimationFrame(animate);
|
||||
}
|
||||
return null;
|
||||
const validateColors = (colors: ReturnType<typeof parseGradient>) => {
|
||||
return colors.every(
|
||||
(color) =>
|
||||
typeof color.r === 'number' &&
|
||||
typeof color.g === 'number' &&
|
||||
typeof color.b === 'number' &&
|
||||
!Number.isNaN(color.r) &&
|
||||
!Number.isNaN(color.g) &&
|
||||
!Number.isNaN(color.b)
|
||||
);
|
||||
};
|
||||
|
||||
return requestAnimationFrame(animate);
|
||||
const easeInOutCubic = (x: number): number => {
|
||||
return x < 0.5 ? 4 * x * x * x : 1 - (-2 * x + 2) ** 3 / 2;
|
||||
};
|
||||
|
||||
const animate = (
|
||||
oldGradient: string,
|
||||
newGradient: string,
|
||||
onUpdate: (gradient: string) => void,
|
||||
duration = 300
|
||||
) => {
|
||||
// 如果新旧渐变色相同,不执行动画
|
||||
if (oldGradient === newGradient) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 如果正在动画中,取消当前动画
|
||||
if (currentAnimation !== null) {
|
||||
cancelAnimationFrame(currentAnimation);
|
||||
currentAnimation = null;
|
||||
}
|
||||
|
||||
// 解析颜色
|
||||
const startColors = parseGradient(oldGradient);
|
||||
const endColors = parseGradient(newGradient);
|
||||
|
||||
// 验证颜色数组
|
||||
if (
|
||||
!startColors.length ||
|
||||
!endColors.length ||
|
||||
!validateColors(startColors) ||
|
||||
!validateColors(endColors)
|
||||
) {
|
||||
console.warn('Invalid color values detected');
|
||||
onUpdate(newGradient); // 直接更新到目标颜色
|
||||
return null;
|
||||
}
|
||||
|
||||
// 如果颜色数量不匹配,直接更新到目标颜色
|
||||
if (startColors.length !== endColors.length) {
|
||||
onUpdate(newGradient);
|
||||
return null;
|
||||
}
|
||||
|
||||
isAnimating = true;
|
||||
const startTime = performance.now();
|
||||
|
||||
const animateFrame = (currentTime: number) => {
|
||||
if (!isAnimating) return null;
|
||||
|
||||
const elapsed = currentTime - startTime;
|
||||
const rawProgress = Math.min(elapsed / duration, 1);
|
||||
// 使用缓动函数使动画更平滑
|
||||
const progress = easeInOutCubic(rawProgress);
|
||||
|
||||
try {
|
||||
// 使用上一帧的进度来平滑过渡
|
||||
const effectiveProgress = lastProgress + (progress - lastProgress) * 0.6;
|
||||
lastProgress = effectiveProgress;
|
||||
|
||||
const currentColors = startColors.map((startColor, i) => {
|
||||
const start = tinycolor(startColor);
|
||||
const end = tinycolor(endColors[i]);
|
||||
return tinycolor.mix(start, end, effectiveProgress * 100);
|
||||
});
|
||||
|
||||
const gradientString = createGradientString(
|
||||
currentColors.map((c) => {
|
||||
const rgb = c.toRgb();
|
||||
return { r: rgb.r, g: rgb.g, b: rgb.b };
|
||||
})
|
||||
);
|
||||
|
||||
onUpdate(gradientString);
|
||||
|
||||
if (rawProgress < 1) {
|
||||
currentAnimation = requestAnimationFrame(animateFrame);
|
||||
return currentAnimation;
|
||||
}
|
||||
// 确保最终颜色正确
|
||||
onUpdate(newGradient);
|
||||
isAnimating = false;
|
||||
currentAnimation = null;
|
||||
lastProgress = 0;
|
||||
return null;
|
||||
} catch (error) {
|
||||
console.error('Animation error:', error);
|
||||
onUpdate(newGradient);
|
||||
isAnimating = false;
|
||||
currentAnimation = null;
|
||||
lastProgress = 0;
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
currentAnimation = requestAnimationFrame(animateFrame);
|
||||
return currentAnimation;
|
||||
};
|
||||
|
||||
// 使用更短的防抖时间
|
||||
return useDebounceFn(animate, 50);
|
||||
})();
|
||||
|
||||
export const createGradientString = (
|
||||
colors: { r: number; g: number; b: number }[],
|
||||
percentages = [0, 50, 100]
|
||||
) => {
|
||||
return `linear-gradient(to bottom, ${colors
|
||||
.map((color, i) => `rgb(${color.r}, ${color.g}, ${color.b}) ${percentages[i]}%`)
|
||||
.join(', ')})`;
|
||||
};
|
||||
|
||||
40
src/renderer/utils/shortcutToast.ts
Normal file
40
src/renderer/utils/shortcutToast.ts
Normal file
@@ -0,0 +1,40 @@
|
||||
import { createVNode, render } from 'vue';
|
||||
|
||||
import ShortcutToast from '@/components/ShortcutToast.vue';
|
||||
|
||||
let container: HTMLDivElement | null = null;
|
||||
let toastInstance: any = null;
|
||||
|
||||
export function showShortcutToast(message: string, iconName: string) {
|
||||
// 如果容器不存在,创建一个新的容器
|
||||
if (!container) {
|
||||
container = document.createElement('div');
|
||||
document.body.appendChild(container);
|
||||
}
|
||||
|
||||
// 如果已经有实例,先销毁它
|
||||
if (toastInstance) {
|
||||
render(null, container);
|
||||
toastInstance = null;
|
||||
}
|
||||
|
||||
// 创建新的 toast 实例
|
||||
const vnode = createVNode(ShortcutToast, {
|
||||
onDestroy: () => {
|
||||
if (container) {
|
||||
render(null, container);
|
||||
document.body.removeChild(container);
|
||||
container = null;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 渲染 toast
|
||||
render(vnode, container);
|
||||
toastInstance = vnode.component?.exposed;
|
||||
|
||||
// 显示 toast
|
||||
if (toastInstance) {
|
||||
toastInstance.show(message, iconName);
|
||||
}
|
||||
}
|
||||
@@ -1,276 +1,334 @@
|
||||
<template>
|
||||
<n-scrollbar>
|
||||
<div class="set-page">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">主题模式</div>
|
||||
<div class="set-item-content">切换日间/夜间主题</div>
|
||||
</div>
|
||||
<n-switch v-model:value="isDarkTheme">
|
||||
<template #checked>
|
||||
<i class="ri-moon-line"></i>
|
||||
</template>
|
||||
<template #unchecked>
|
||||
<i class="ri-sun-line"></i>
|
||||
</template>
|
||||
</n-switch>
|
||||
</div>
|
||||
<!-- <div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">代理</div>
|
||||
<div class="set-item-content">无法听音乐时打开</div>
|
||||
</div>
|
||||
<n-switch v-model:value="setData.isProxy" />
|
||||
</div> -->
|
||||
<div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">音乐API端口</div>
|
||||
<div class="set-item-content">修改后需要重启应用</div>
|
||||
</div>
|
||||
<n-input-number v-model:value="setData.musicApiPort" />
|
||||
</div>
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">动画速度</div>
|
||||
<div class="set-item-content">
|
||||
<div class="flex items-center gap-2">
|
||||
<n-switch v-model:value="setData.noAnimate">
|
||||
<template #checked>关闭</template>
|
||||
<template #unchecked>开启</template>
|
||||
</n-switch>
|
||||
<span>是否开启动画</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="text-sm text-gray-400">{{ setData.animationSpeed }}x</span>
|
||||
<div class="w-40">
|
||||
<n-slider
|
||||
v-model:value="setData.animationSpeed"
|
||||
:min="0.1"
|
||||
:max="3"
|
||||
:step="0.1"
|
||||
:marks="{
|
||||
0.1: '极慢',
|
||||
1: '正常',
|
||||
3: '极快'
|
||||
}"
|
||||
:disabled="setData.noAnimate"
|
||||
class="w-40"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">下载目录</div>
|
||||
<div class="set-item-content">
|
||||
{{ setData.downloadPath || '默认下载目录' }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-button size="small" @click="openDownloadPath">打开目录</n-button>
|
||||
<n-button size="small" @click="selectDownloadPath">修改目录</n-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">版本</div>
|
||||
<div class="set-item-content">
|
||||
{{ updateInfo.currentVersion }}
|
||||
<template v-if="updateInfo.hasUpdate">
|
||||
<n-tag type="success" class="ml-2">发现新版本 {{ updateInfo.latestVersion }}</n-tag>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-button
|
||||
:type="updateInfo.hasUpdate ? 'primary' : 'default'"
|
||||
size="small"
|
||||
:loading="checking"
|
||||
@click="checkForUpdates(true)"
|
||||
>
|
||||
{{ checking ? '检查中...' : '检查更新' }}
|
||||
</n-button>
|
||||
<n-button
|
||||
v-if="updateInfo.hasUpdate"
|
||||
type="success"
|
||||
size="small"
|
||||
@click="openReleasePage"
|
||||
>
|
||||
前往更新
|
||||
</n-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="settings-container">
|
||||
<!-- 左侧导航栏 -->
|
||||
<div class="settings-nav">
|
||||
<div
|
||||
class="set-item cursor-pointer hover:text-green-500 hover:bg-green-950 transition-all"
|
||||
@click="openAuthor"
|
||||
v-for="section in settingSections"
|
||||
:key="section.id"
|
||||
class="nav-item"
|
||||
:class="{ active: currentSection === section.id }"
|
||||
@click="scrollToSection(section.id)"
|
||||
>
|
||||
<div>
|
||||
<coffee>
|
||||
<div>
|
||||
<div class="set-item-title">作者</div>
|
||||
<div class="set-item-content">algerkong 点个star🌟呗</div>
|
||||
</div>
|
||||
</coffee>
|
||||
</div>
|
||||
<div>
|
||||
<n-button size="small" type="primary" @click="openAuthor"
|
||||
><i class="ri-github-line"></i>前往github</n-button
|
||||
>
|
||||
</div>
|
||||
{{ section.title }}
|
||||
</div>
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">音质设置</div>
|
||||
<div class="set-item-content">选择音乐播放音质(VIP)</div>
|
||||
</div>
|
||||
<n-select
|
||||
v-model:value="setData.musicQuality"
|
||||
:options="[
|
||||
{ label: '标准', value: 'standard' },
|
||||
{ label: '较高', value: 'higher' },
|
||||
{ label: '极高', value: 'exhigh' },
|
||||
{ label: '无损', value: 'lossless' },
|
||||
{ label: 'Hi-Res', value: 'hires' },
|
||||
{ label: '高清环绕声', value: 'jyeffect' },
|
||||
{ label: '沉浸环绕声', value: 'sky' },
|
||||
{ label: '杜比全景声', value: 'dolby' },
|
||||
{ label: '超清母带', value: 'jymaster' }
|
||||
]"
|
||||
style="width: 160px"
|
||||
/>
|
||||
</div>
|
||||
<div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">关闭行为</div>
|
||||
<div class="set-item-content">
|
||||
{{ closeActionLabels[setData.closeAction] || '每次询问' }}
|
||||
</div>
|
||||
</div>
|
||||
<n-select
|
||||
v-model:value="setData.closeAction"
|
||||
:options="[
|
||||
{ label: '每次询问', value: 'ask' },
|
||||
{ label: '最小化到托盘', value: 'minimize' },
|
||||
{ label: '直接退出', value: 'close' }
|
||||
]"
|
||||
style="width: 160px"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">重启</div>
|
||||
<div class="set-item-content">重启应用</div>
|
||||
</div>
|
||||
<n-button type="primary" size="small" @click="restartApp">重启</n-button>
|
||||
</div>
|
||||
<!-- 缓存管理 -->
|
||||
<!-- <n-card class="set-card" title="缓存管理">
|
||||
<n-space vertical>
|
||||
<n-button type="primary" @click="showClearCacheModal = true"> 清除缓存 </n-button>
|
||||
</n-space>
|
||||
</n-card> -->
|
||||
<div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">缓存管理</div>
|
||||
<div class="set-item-content">清除缓存</div>
|
||||
</div>
|
||||
<n-button type="primary" size="small" @click="showClearCacheModal = true">
|
||||
清除缓存
|
||||
</n-button>
|
||||
</div>
|
||||
<div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">代理设置</div>
|
||||
<div class="set-item-content">无法访问音乐时可以开启代理</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-switch v-model:value="setData.proxyConfig.enable">
|
||||
<template #checked>开启</template>
|
||||
<template #unchecked>关闭</template>
|
||||
</n-switch>
|
||||
<n-button size="small" @click="showProxyModal = true">配置</n-button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="isElectron" class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">realIP</div>
|
||||
<div class="set-item-content">
|
||||
由于限制,此项目在国外使用会受到限制可使用realIP参数,传进国内IP解决,如:116.25.146.177
|
||||
即可解决
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-switch v-model:value="setData.enableRealIP">
|
||||
<template #checked>开启</template>
|
||||
<template #unchecked>关闭</template>
|
||||
</n-switch>
|
||||
<n-input
|
||||
v-if="setData.enableRealIP"
|
||||
v-model:value="setData.realIP"
|
||||
placeholder="realIP"
|
||||
style="width: 200px"
|
||||
@blur="validateAndSaveRealIP"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="p-4 bg-light dark:bg-dark rounded-lg mb-4 border border-gray-200 dark:border-gray-700 rounded-lg"
|
||||
>
|
||||
<div class="flex justify-between items-center">
|
||||
<div>
|
||||
<div class="set-item-title">捐赠支持</div>
|
||||
<div class="set-item-content">感谢您的支持,让我有动力能够持续改进</div>
|
||||
</div>
|
||||
<n-button text @click="toggleDonationList">
|
||||
<template #icon>
|
||||
<i :class="isDonationListVisible ? 'ri-eye-line' : 'ri-eye-off-line'" />
|
||||
</template>
|
||||
{{ isDonationListVisible ? '隐藏列表' : '显示列表' }}
|
||||
</n-button>
|
||||
</div>
|
||||
<donation-list v-if="isDonationListVisible" />
|
||||
</div>
|
||||
|
||||
<!-- 清除缓存弹窗 -->
|
||||
<n-modal
|
||||
v-model:show="showClearCacheModal"
|
||||
preset="dialog"
|
||||
title="清除缓存"
|
||||
positive-text="确认"
|
||||
negative-text="取消"
|
||||
@positive-click="clearCache"
|
||||
@negative-click="
|
||||
() => {
|
||||
selectedCacheTypes = [];
|
||||
}
|
||||
"
|
||||
>
|
||||
<n-space vertical>
|
||||
<p>请选择要清除的缓存类型:</p>
|
||||
<n-checkbox-group v-model:value="selectedCacheTypes">
|
||||
<n-space vertical>
|
||||
<n-checkbox
|
||||
v-for="option in clearCacheOptions"
|
||||
:key="option.key"
|
||||
:value="option.key"
|
||||
:label="option.label"
|
||||
>
|
||||
<template #default>
|
||||
<div>
|
||||
<div>{{ option.label }}</div>
|
||||
<div class="text-gray-400 text-sm">{{ option.description }}</div>
|
||||
</div>
|
||||
</template>
|
||||
</n-checkbox>
|
||||
</n-space>
|
||||
</n-checkbox-group>
|
||||
</n-space>
|
||||
</n-modal>
|
||||
</div>
|
||||
<play-bottom />
|
||||
|
||||
<!-- 右侧内容区 -->
|
||||
<n-scrollbar ref="scrollbarRef" class="settings-content" @scroll="handleScroll">
|
||||
<div class="set-page">
|
||||
<!-- 基础设置 -->
|
||||
<div id="basic" ref="basicRef" class="settings-section">
|
||||
<div class="settings-section-title">基础设置</div>
|
||||
<div class="settings-section-content">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">主题模式</div>
|
||||
<div class="set-item-content">切换日间/夜间主题</div>
|
||||
</div>
|
||||
<n-switch v-model:value="isDarkTheme">
|
||||
<template #checked><i class="ri-moon-line"></i></template>
|
||||
<template #unchecked><i class="ri-sun-line"></i></template>
|
||||
</n-switch>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">字体设置</div>
|
||||
<div class="set-item-content">选择字体,优先使用排在前面的字体</div>
|
||||
</div>
|
||||
<div class="flex gap-2">
|
||||
<n-radio-group v-model:value="setData.fontScope" class="mt-2">
|
||||
<n-radio key="global" value="global">全局</n-radio>
|
||||
<n-radio key="lyric" value="lyric">仅歌词</n-radio>
|
||||
</n-radio-group>
|
||||
<n-select
|
||||
v-model:value="selectedFonts"
|
||||
:options="systemFonts"
|
||||
filterable
|
||||
multiple
|
||||
placeholder="选择字体"
|
||||
style="width: 300px"
|
||||
:render-label="renderFontLabel"
|
||||
>
|
||||
</n-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="selectedFonts.length > 0" class="font-preview-container">
|
||||
<div class="font-preview-title">字体预览</div>
|
||||
<div class="font-preview" :style="{ fontFamily: setData.fontFamily }">
|
||||
<div class="preview-item">
|
||||
<div class="preview-label">中文</div>
|
||||
<div class="preview-text">静夜思 床前明月光 疑是地上霜</div>
|
||||
</div>
|
||||
<div class="preview-item">
|
||||
<div class="preview-label">English</div>
|
||||
<div class="preview-text">The quick brown fox jumps over the lazy dog</div>
|
||||
</div>
|
||||
<div class="preview-item">
|
||||
<div class="preview-label">日本語</div>
|
||||
<div class="preview-text">あいうえお かきくけこ さしすせそ</div>
|
||||
</div>
|
||||
<div class="preview-item">
|
||||
<div class="preview-label">한국어</div>
|
||||
<div class="preview-text">가나다라마 바사아자차 카타파하</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">动画速度</div>
|
||||
<div class="set-item-content">
|
||||
<div class="flex items-center gap-2">
|
||||
<n-switch v-model:value="setData.noAnimate">
|
||||
<template #checked>关闭</template>
|
||||
<template #unchecked>开启</template>
|
||||
</n-switch>
|
||||
<span>是否开启动画</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="text-sm text-gray-400">{{ setData.animationSpeed }}x</span>
|
||||
<div class="w-40">
|
||||
<n-slider
|
||||
v-model:value="setData.animationSpeed"
|
||||
:min="0.1"
|
||||
:max="3"
|
||||
:step="0.1"
|
||||
:marks="{
|
||||
0.1: '极慢',
|
||||
1: '正常',
|
||||
3: '极快'
|
||||
}"
|
||||
:disabled="setData.noAnimate"
|
||||
class="w-40"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 播放设置 -->
|
||||
<div id="playback" ref="playbackRef" class="settings-section">
|
||||
<div class="settings-section-title">播放设置</div>
|
||||
<div class="settings-section-content">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">音质设置</div>
|
||||
<div class="set-item-content">选择音乐播放音质(VIP)</div>
|
||||
</div>
|
||||
<n-select
|
||||
v-model:value="setData.musicQuality"
|
||||
:options="[
|
||||
{ label: '标准', value: 'standard' },
|
||||
{ label: '较高', value: 'higher' },
|
||||
{ label: '极高', value: 'exhigh' },
|
||||
{ label: '无损', value: 'lossless' },
|
||||
{ label: 'Hi-Res', value: 'hires' },
|
||||
{ label: '高清环绕声', value: 'jyeffect' },
|
||||
{ label: '沉浸环绕声', value: 'sky' },
|
||||
{ label: '杜比全景声', value: 'dolby' },
|
||||
{ label: '超清母带', value: 'jymaster' }
|
||||
]"
|
||||
style="width: 160px"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 应用设置 -->
|
||||
<div v-if="isElectron" id="application" ref="applicationRef" class="settings-section">
|
||||
<div class="settings-section-title">应用设置</div>
|
||||
<div class="settings-section-content">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">关闭行为</div>
|
||||
<div class="set-item-content">
|
||||
{{ closeActionLabels[setData.closeAction] || '每次询问' }}
|
||||
</div>
|
||||
</div>
|
||||
<n-select
|
||||
v-model:value="setData.closeAction"
|
||||
:options="[
|
||||
{ label: '每次询问', value: 'ask' },
|
||||
{ label: '最小化到托盘', value: 'minimize' },
|
||||
{ label: '直接退出', value: 'close' }
|
||||
]"
|
||||
style="width: 160px"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">快捷键设置</div>
|
||||
<div class="set-item-content">自定义全局快捷键</div>
|
||||
</div>
|
||||
<n-button size="small" @click="showShortcutModal = true">配置</n-button>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">下载目录</div>
|
||||
<div class="set-item-content">
|
||||
{{ setData.downloadPath || '默认下载目录' }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-button size="small" @click="openDownloadPath">打开目录</n-button>
|
||||
<n-button size="small" @click="selectDownloadPath">修改目录</n-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 网络设置 -->
|
||||
<div v-if="isElectron" id="network" ref="networkRef" class="settings-section">
|
||||
<div class="settings-section-title">网络设置</div>
|
||||
<div class="settings-section-content">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">音乐API端口</div>
|
||||
<div class="set-item-content">修改后需要重启应用</div>
|
||||
</div>
|
||||
<n-input-number v-model:value="setData.musicApiPort" />
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">代理设置</div>
|
||||
<div class="set-item-content">无法访问音乐时可以开启代理</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-switch v-model:value="setData.proxyConfig.enable">
|
||||
<template #checked>开启</template>
|
||||
<template #unchecked>关闭</template>
|
||||
</n-switch>
|
||||
<n-button size="small" @click="showProxyModal = true">配置</n-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">realIP</div>
|
||||
<div class="set-item-content">
|
||||
由于限制,此项目在国外使用会受到限制可使用realIP参数,传进国内IP解决,如:116.25.146.177
|
||||
即可解决
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-switch v-model:value="setData.enableRealIP">
|
||||
<template #checked>开启</template>
|
||||
<template #unchecked>关闭</template>
|
||||
</n-switch>
|
||||
<n-input
|
||||
v-if="setData.enableRealIP"
|
||||
v-model:value="setData.realIP"
|
||||
placeholder="realIP"
|
||||
style="width: 200px"
|
||||
@blur="validateAndSaveRealIP"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 系统管理 -->
|
||||
<div v-if="isElectron" id="system" ref="systemRef" class="settings-section">
|
||||
<div class="settings-section-title">系统管理</div>
|
||||
<div class="settings-section-content">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">缓存管理</div>
|
||||
<div class="set-item-content">清除缓存</div>
|
||||
</div>
|
||||
<n-button size="small" @click="showClearCacheModal = true"> 清除缓存 </n-button>
|
||||
</div>
|
||||
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">重启</div>
|
||||
<div class="set-item-content">重启应用</div>
|
||||
</div>
|
||||
<n-button size="small" @click="restartApp">重启</n-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 关于 -->
|
||||
<div id="about" ref="aboutRef" class="settings-section">
|
||||
<div class="settings-section-title">关于</div>
|
||||
<div class="settings-section-content">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">版本</div>
|
||||
<div class="set-item-content">
|
||||
{{ updateInfo.currentVersion }}
|
||||
<template v-if="updateInfo.hasUpdate">
|
||||
<n-tag type="success" class="ml-2"
|
||||
>发现新版本 {{ updateInfo.latestVersion }}</n-tag
|
||||
>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<n-button size="small" :loading="checking" @click="checkForUpdates(true)">
|
||||
{{ checking ? '检查中...' : '检查更新' }}
|
||||
</n-button>
|
||||
<n-button v-if="updateInfo.hasUpdate" size="small" @click="openReleasePage">
|
||||
前往更新
|
||||
</n-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="set-item cursor-pointer hover:text-green-500 hover:bg-green-950 transition-all"
|
||||
@click="openAuthor"
|
||||
>
|
||||
<coffee>
|
||||
<div>
|
||||
<div class="set-item-title">作者</div>
|
||||
<div class="set-item-content">algerkong 点个star🌟呗</div>
|
||||
</div>
|
||||
</coffee>
|
||||
<div>
|
||||
<n-button size="small" @click="openAuthor">
|
||||
<i class="ri-github-line"></i>前往github
|
||||
</n-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 捐赠支持 -->
|
||||
<div id="donation" ref="donationRef" class="settings-section">
|
||||
<div class="settings-section-title">捐赠支持</div>
|
||||
<div class="settings-section-content">
|
||||
<div class="set-item">
|
||||
<div>
|
||||
<div class="set-item-title">捐赠支持</div>
|
||||
<div class="set-item-content">感谢您的支持,让我有动力能够持续改进</div>
|
||||
</div>
|
||||
<n-button text @click="toggleDonationList">
|
||||
<template #icon>
|
||||
<i :class="isDonationListVisible ? 'ri-eye-line' : 'ri-eye-off-line'" />
|
||||
</template>
|
||||
{{ isDonationListVisible ? '隐藏列表' : '显示列表' }}
|
||||
</n-button>
|
||||
</div>
|
||||
<donation-list v-if="isDonationListVisible" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<play-bottom />
|
||||
</n-scrollbar>
|
||||
|
||||
<!-- 快捷键设置弹窗 -->
|
||||
<shortcut-settings v-model:show="showShortcutModal" @change="handleShortcutsChange" />
|
||||
|
||||
<!-- 代理设置弹窗 -->
|
||||
<n-modal
|
||||
v-model:show="showProxyModal"
|
||||
preset="dialog"
|
||||
@@ -312,19 +370,55 @@
|
||||
</n-form-item>
|
||||
</n-form>
|
||||
</n-modal>
|
||||
</n-scrollbar>
|
||||
<!-- 清除缓存弹窗 -->
|
||||
<n-modal
|
||||
v-model:show="showClearCacheModal"
|
||||
preset="dialog"
|
||||
title="清除缓存"
|
||||
positive-text="确认"
|
||||
negative-text="取消"
|
||||
@positive-click="clearCache"
|
||||
@negative-click="
|
||||
() => {
|
||||
selectedCacheTypes = [];
|
||||
}
|
||||
"
|
||||
>
|
||||
<n-space vertical>
|
||||
<p>请选择要清除的缓存类型:</p>
|
||||
<n-checkbox-group v-model:value="selectedCacheTypes">
|
||||
<n-space vertical>
|
||||
<n-checkbox
|
||||
v-for="option in clearCacheOptions"
|
||||
:key="option.key"
|
||||
:value="option.key"
|
||||
:label="option.label"
|
||||
>
|
||||
<template #default>
|
||||
<div>
|
||||
<div>{{ option.label }}</div>
|
||||
<div class="text-gray-400 text-sm">{{ option.description }}</div>
|
||||
</div>
|
||||
</template>
|
||||
</n-checkbox>
|
||||
</n-space>
|
||||
</n-checkbox-group>
|
||||
</n-space>
|
||||
</n-modal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { FormRules } from 'naive-ui';
|
||||
import { useMessage } from 'naive-ui';
|
||||
import { computed, onMounted, ref, watch } from 'vue';
|
||||
import { computed, h, nextTick, onMounted, ref, watch } from 'vue';
|
||||
import { useStore } from 'vuex';
|
||||
|
||||
import localData from '@/../main/set.json';
|
||||
import Coffee from '@/components/Coffee.vue';
|
||||
import DonationList from '@/components/common/DonationList.vue';
|
||||
import PlayBottom from '@/components/common/PlayBottom.vue';
|
||||
import ShortcutSettings from '@/components/settings/ShortcutSettings.vue';
|
||||
import { isElectron } from '@/utils';
|
||||
import { openDirectory, selectDirectory } from '@/utils/fileOperation';
|
||||
import { checkUpdate, UpdateResult } from '@/utils/update';
|
||||
@@ -461,8 +555,55 @@ const proxyRules: FormRules = {
|
||||
}
|
||||
};
|
||||
|
||||
// 初始化时从store获取代理配置
|
||||
onMounted(() => {
|
||||
// 使用 store 中的字体列表
|
||||
const systemFonts = computed(() => store.state.systemFonts);
|
||||
|
||||
// 已选择的字体列表
|
||||
const selectedFonts = ref<string[]>([]);
|
||||
|
||||
// 自定义渲染函数
|
||||
const renderFontLabel = (option: { label: string; value: string }) => {
|
||||
return h('span', { style: { fontFamily: option.value } }, option.label);
|
||||
};
|
||||
|
||||
// 监听字体选择变化
|
||||
watch(
|
||||
selectedFonts,
|
||||
(newFonts) => {
|
||||
// 如果没有选择任何字体,使用系统默认字体
|
||||
if (newFonts.length === 0) {
|
||||
store.commit('setSetData', {
|
||||
...setData.value,
|
||||
fontFamily: 'system-ui'
|
||||
});
|
||||
return;
|
||||
}
|
||||
// 将选择的字体组合成字体列表
|
||||
store.commit('setSetData', {
|
||||
...setData.value,
|
||||
fontFamily: newFonts.join(',')
|
||||
});
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
// 初始化已选择的字体
|
||||
watch(
|
||||
() => setData.value.fontFamily,
|
||||
(newFont) => {
|
||||
if (newFont) {
|
||||
if (newFont === 'system-ui') {
|
||||
selectedFonts.value = [];
|
||||
} else {
|
||||
selectedFonts.value = newFont.split(',');
|
||||
}
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
// 初始化时从store获取配置
|
||||
onMounted(async () => {
|
||||
checkForUpdates();
|
||||
if (setData.value.proxyConfig) {
|
||||
proxyForm.value = { ...setData.value.proxyConfig };
|
||||
@@ -631,15 +772,150 @@ const clearCache = async () => {
|
||||
showClearCacheModal.value = false;
|
||||
selectedCacheTypes.value = [];
|
||||
};
|
||||
|
||||
const showShortcutModal = ref(false);
|
||||
|
||||
const handleShortcutsChange = (shortcuts: any) => {
|
||||
console.log('快捷键已更新:', shortcuts);
|
||||
};
|
||||
|
||||
// 定义设置分类
|
||||
const settingSections = [
|
||||
{ id: 'basic', title: '基础设置' },
|
||||
{ id: 'playback', title: '播放设置' },
|
||||
{ id: 'application', title: '应用设置', electron: true },
|
||||
{ id: 'network', title: '网络设置', electron: true },
|
||||
{ id: 'system', title: '系统管理', electron: true },
|
||||
{ id: 'about', title: '关于' },
|
||||
{ id: 'donation', title: '捐赠支持' }
|
||||
];
|
||||
|
||||
// 当前激活的分类
|
||||
const currentSection = ref('basic');
|
||||
const scrollbarRef = ref();
|
||||
|
||||
// 各个分类的ref
|
||||
const basicRef = ref();
|
||||
const playbackRef = ref();
|
||||
const applicationRef = ref();
|
||||
const networkRef = ref();
|
||||
const systemRef = ref();
|
||||
const aboutRef = ref();
|
||||
const donationRef = ref();
|
||||
|
||||
// 滚动到指定分类
|
||||
const scrollToSection = async (sectionId: string) => {
|
||||
currentSection.value = sectionId;
|
||||
const sectionRef = {
|
||||
basic: basicRef,
|
||||
playback: playbackRef,
|
||||
application: applicationRef,
|
||||
network: networkRef,
|
||||
system: systemRef,
|
||||
about: aboutRef,
|
||||
donation: donationRef
|
||||
}[sectionId];
|
||||
|
||||
if (sectionRef?.value) {
|
||||
await nextTick();
|
||||
scrollbarRef.value?.scrollTo({
|
||||
top: sectionRef.value.offsetTop - 20,
|
||||
behavior: 'smooth'
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 处理滚动,更新当前激活的分类
|
||||
const handleScroll = (e: any) => {
|
||||
const { scrollTop } = e.target;
|
||||
|
||||
const sections = [
|
||||
{ id: 'basic', ref: basicRef },
|
||||
{ id: 'playback', ref: playbackRef },
|
||||
{ id: 'application', ref: applicationRef },
|
||||
{ id: 'network', ref: networkRef },
|
||||
{ id: 'system', ref: systemRef },
|
||||
{ id: 'about', ref: aboutRef },
|
||||
{ id: 'donation', ref: donationRef }
|
||||
];
|
||||
|
||||
const activeSection = sections[0].id;
|
||||
let lastValidSection = activeSection;
|
||||
|
||||
for (const section of sections) {
|
||||
if (section.ref?.value) {
|
||||
const { offsetTop } = section.ref.value;
|
||||
if (scrollTop >= offsetTop - 100) {
|
||||
lastValidSection = section.id;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (lastValidSection !== currentSection.value) {
|
||||
currentSection.value = lastValidSection;
|
||||
}
|
||||
};
|
||||
|
||||
// 初始化时设置当前激活的分类
|
||||
onMounted(() => {
|
||||
// 延迟一帧等待 DOM 完全渲染
|
||||
nextTick(() => {
|
||||
handleScroll({ target: { scrollTop: 0 } });
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.settings-container {
|
||||
@apply flex h-full;
|
||||
}
|
||||
|
||||
.settings-nav {
|
||||
@apply w-32 h-full flex-shrink-0 border-r border-gray-200 dark:border-gray-700;
|
||||
@apply bg-light dark:bg-dark;
|
||||
|
||||
.nav-item {
|
||||
@apply px-4 py-2.5 cursor-pointer text-sm;
|
||||
@apply text-gray-600 dark:text-gray-400;
|
||||
@apply transition-colors duration-200;
|
||||
@apply border-l-2 border-transparent;
|
||||
|
||||
&:hover {
|
||||
@apply text-primary dark:text-white bg-gray-50 dark:bg-dark-100;
|
||||
@apply border-l-2 border-gray-200 dark:border-gray-200;
|
||||
}
|
||||
|
||||
&.active {
|
||||
@apply text-primary dark:text-white bg-gray-50 dark:bg-dark-100;
|
||||
@apply border-l-2 border-gray-200 dark:border-gray-200;
|
||||
@apply font-medium;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.settings-content {
|
||||
@apply flex-1 h-full;
|
||||
}
|
||||
|
||||
.set-page {
|
||||
@apply p-4 bg-light dark:bg-dark pb-20;
|
||||
@apply p-4 pb-20;
|
||||
}
|
||||
|
||||
.settings-section {
|
||||
@apply mb-6 scroll-mt-4;
|
||||
|
||||
&-title {
|
||||
@apply text-base font-medium mb-4;
|
||||
@apply text-gray-600 dark:text-white;
|
||||
}
|
||||
|
||||
&-content {
|
||||
@apply space-y-4;
|
||||
}
|
||||
}
|
||||
|
||||
.set-item {
|
||||
@apply flex items-center justify-between p-4 rounded-lg mb-4 transition-all;
|
||||
@apply flex items-center justify-between p-4 rounded-lg transition-all;
|
||||
@apply bg-light dark:bg-dark text-gray-900 dark:text-white;
|
||||
@apply border border-gray-200 dark:border-gray-700;
|
||||
|
||||
@@ -659,4 +935,34 @@ const clearCache = async () => {
|
||||
@apply text-green-500 bg-green-50 dark:bg-green-900;
|
||||
}
|
||||
}
|
||||
|
||||
.font-preview-container {
|
||||
@apply mt-4 p-4 rounded-lg;
|
||||
@apply bg-gray-50 dark:bg-dark-100;
|
||||
@apply border border-gray-200 dark:border-gray-700;
|
||||
|
||||
.font-preview-title {
|
||||
@apply text-sm font-medium mb-3;
|
||||
@apply text-gray-600 dark:text-gray-300;
|
||||
}
|
||||
|
||||
.font-preview {
|
||||
@apply space-y-3;
|
||||
|
||||
.preview-item {
|
||||
@apply flex flex-col gap-1;
|
||||
|
||||
.preview-label {
|
||||
@apply text-xs text-gray-500 dark:text-gray-400;
|
||||
}
|
||||
|
||||
.preview-text {
|
||||
@apply text-base text-gray-900 dark:text-gray-100;
|
||||
@apply p-2 rounded;
|
||||
@apply bg-white dark:bg-dark;
|
||||
@apply border border-gray-200 dark:border-gray-700;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -207,7 +207,6 @@ watch(
|
||||
// 页面挂载时检查登录状态
|
||||
onMounted(() => {
|
||||
checkLoginStatus();
|
||||
loadPage();
|
||||
});
|
||||
|
||||
// 展示歌单
|
||||
@@ -275,7 +274,7 @@ const handlePlay = () => {
|
||||
.record-list {
|
||||
@apply rounded-2xl;
|
||||
@apply bg-light dark:bg-black;
|
||||
height: calc(100% - 3.75rem);
|
||||
height: calc(100% - 100px);
|
||||
|
||||
.record-item {
|
||||
@apply flex items-center px-4;
|
||||
|
||||
Reference in New Issue
Block a user