6 Commits

Author SHA1 Message Date
alger
c6427aa3e1 feat: v3.6.0 2025-01-13 23:08:47 +08:00
alger
632cdb1239 feat: 优化页面样式 2025-01-13 22:55:46 +08:00
alger
8ffe472605 feat: 添加歌手详情抽屉 2025-01-13 22:13:46 +08:00
alger
8e86d378d0 feat: 优化音乐解析,添加搜索记录 添加搜索滚动加载更多 添加关闭动画功能 2025-01-13 22:13:21 +08:00
alger
744fd53fb1 feat: 添加歌词缓存功能 2025-01-12 20:59:36 +08:00
alger
3c64473dbb feat: 优化音乐播放 控制 系统控制功能 (#36,#16)
fixed #36,#16
2025-01-12 19:14:25 +08:00
33 changed files with 1398 additions and 202 deletions

View File

@@ -103,6 +103,7 @@ module.exports = {
{
files: ['*.ts', '*.tsx'],
rules: {
'max-classes-per-file': 'off',
'no-await-in-loop': 'off',
'dot-notation': 'off',
'constructor-super': 'off',

4
.gitignore vendored
View File

@@ -19,4 +19,6 @@ bun.lockb
.env.*.local
out
out
.cursorrules

View File

@@ -1,8 +1,23 @@
# 更新日志
## [v3.5.0] - 2025-01-12
## v3.6.0
### ✨ 新功能
- 添加下载管理 进度显示 播放下载的音乐
- 添加缓存管理 清理缓存
- 优化下载格式问题 支持下载其他格式 ps:其实之前只是后缀名问题
- 添加歌手详情功能
- 优化音乐解析(添加更多音源 减少歌曲不匹配问题)
- 添加搜索记录
- 添加关闭动画功能
- 添加歌词缓存功能
- 优化音乐播放控制和系统控制功能
### 🐞 Bug修复
- 修复下载文件类型问题
### 🎈 性能优化
- 优化页面样式
- 优化留言显示
## 咖啡☕️
| 微信 | | 支付宝 |
| :--------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------: |
| <img src="https://www.ghproxy.cn/https://raw.githubusercontent.com/algerkong/AlgerMusicPlayer/dev_electron/src/renderer/assets/wechat.png" alt="WeChat QRcode" width=200>| | <img src="https://www.ghproxy.cn/https://raw.githubusercontent.com/algerkong/AlgerMusicPlayer/dev_electron/src/renderer/assets/alipay.png" alt="Wechat QRcode" width=200> |

View File

@@ -1,6 +1,6 @@
{
"name": "AlgerMusicPlayer",
"version": "3.5.0",
"version": "3.6.0",
"description": "Alger Music Player",
"author": "Alger <algerkc@qq.com>",
"main": "./out/main/index.js",
@@ -62,7 +62,7 @@
"howler": "^2.2.4",
"lodash": "^4.17.21",
"marked": "^15.0.4",
"naive-ui": "^2.39.0",
"naive-ui": "^2.41.0",
"postcss": "^8.4.49",
"prettier": "^3.3.2",
"remixicon": "^4.2.0",

View File

@@ -3,6 +3,7 @@ import { app, globalShortcut, 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 { initializeTray } from './modules/tray';
@@ -23,16 +24,18 @@ let mainWindow: Electron.BrowserWindow;
// 初始化应用
function initialize() {
// 初始化各个模块
// 初始化配置管理
initializeConfig();
// 初始化缓存管理
initializeCacheManager();
// 初始化文件管理
initializeFileManager();
// 初始化窗口管理
initializeWindowManager();
// 创建主窗口
mainWindow = createMainWindow(icon);
// 初始化窗口管理
initializeWindowManager();
// 初始化托盘
initializeTray(iconPath, mainWindow);
@@ -57,7 +60,7 @@ app.whenReady().then(() => {
initialize();
// macOS 激活应用时的处理
app.on('activate', function () {
app.on('activate', () => {
if (mainWindow === null) initialize();
});
});

89
src/main/modules/cache.ts Normal file
View File

@@ -0,0 +1,89 @@
import { ipcMain } from 'electron';
import Store from 'electron-store';
interface LyricData {
id: number;
data: any;
timestamp: number;
}
interface StoreSchema {
lyrics: Record<number, LyricData>;
}
class CacheManager {
private store: Store<StoreSchema>;
constructor() {
this.store = new Store<StoreSchema>({
name: 'lyrics',
defaults: {
lyrics: {}
}
});
}
async cacheLyric(id: number, data: any) {
try {
const lyrics = this.store.get('lyrics');
lyrics[id] = {
id,
data,
timestamp: Date.now()
};
this.store.set('lyrics', lyrics);
return true;
} catch (error) {
console.error('Error caching lyric:', error);
return false;
}
}
async getCachedLyric(id: number) {
try {
const lyrics = this.store.get('lyrics');
const result = lyrics[id];
if (!result) return undefined;
// 检查缓存是否过期24小时
if (Date.now() - result.timestamp > 24 * 60 * 60 * 1000) {
delete lyrics[id];
this.store.set('lyrics', lyrics);
return undefined;
}
return result.data;
} catch (error) {
console.error('Error getting cached lyric:', error);
return undefined;
}
}
async clearLyricCache() {
try {
this.store.set('lyrics', {});
return true;
} catch (error) {
console.error('Error clearing lyric cache:', error);
return false;
}
}
}
export const cacheManager = new CacheManager();
export function initializeCacheManager() {
// 添加歌词缓存相关的 IPC 处理
ipcMain.handle('cache-lyric', async (_, id: number, lyricData: any) => {
return await cacheManager.cacheLyric(id, lyricData);
});
ipcMain.handle('get-cached-lyric', async (_, id: number) => {
return await cacheManager.getCachedLyric(id);
});
ipcMain.handle('clear-lyric-cache', async () => {
return await cacheManager.clearLyricCache();
});
}

View File

@@ -1,23 +1,162 @@
import match from '@unblockneteasemusic/server';
import Store from 'electron-store';
const unblockMusic = async (id: any, songData: any): Promise<any> => {
return new Promise((resolve, reject) => {
match(parseInt(id, 10), ['qq', 'migu', 'kugou', 'joox'], songData)
.then((data) => {
resolve({
data: {
data,
params: {
id,
type: 'song'
}
}
});
})
.catch((err) => {
reject(err);
});
type Platform = 'qq' | 'migu' | 'kugou' | 'pyncmd' | 'joox' | 'kuwo' | 'bilibili' | 'youtube';
interface SongData {
name: string;
artists: Array<{ name: string }>;
album?: { name: string };
}
interface ResponseData {
url: string;
br: number;
size: number;
md5?: string;
platform?: Platform;
gain?: number;
}
interface UnblockResult {
data: {
data: ResponseData;
params: {
id: number;
type: 'song';
};
};
}
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);
}
});
};
export { unblockMusic };
/**
* 音乐解析函数
* @param id 歌曲ID
* @param songData 歌曲信息
* @param retryCount 重试次数
* @returns Promise<UnblockResult>
*/
const unblockMusic = async (
id: number | string,
songData: SongData,
retryCount = 3
): Promise<UnblockResult> => {
// 检查缓存
const cachedData = getFromCache(id);
if (cachedData) {
return cachedData;
}
// 所有可用平台
const platforms: Platform[] = ['migu', 'kugou', 'pyncmd', 'joox', 'kuwo', 'bilibili', 'youtube'];
const retry = async (attempt: number): Promise<UnblockResult> => {
try {
const data = await match(parseInt(String(id), 10), platforms, songData);
const result: UnblockResult = {
data: {
data,
params: {
id: parseInt(String(id), 10),
type: 'song'
}
}
};
// 保存到缓存
saveToCache(id, result);
return result;
} catch (err) {
if (attempt < retryCount) {
// 延迟重试,每次重试增加延迟时间
await new Promise((resolve) => setTimeout(resolve, 1000 * attempt));
return retry(attempt + 1);
}
// 所有重试都失败后,抛出详细错误
throw new Error(
`音乐解析失败 (ID: ${id}): ${err instanceof Error ? err.message : '未知错误'}`
);
}
};
return retry(1);
};
// 定期清理过期缓存(每小时执行一次)
setInterval(cleanExpiredCache, 60 * 60 * 1000);
export {
cleanExpiredCache, // 导出清理缓存函数,以便手动调用
type Platform,
type ResponseData,
type SongData,
unblockMusic,
type UnblockResult
};

View File

@@ -13,6 +13,7 @@ declare global {
miniTray: () => void;
restart: () => void;
unblockMusic: (id: number, data: any) => Promise<any>;
invoke: (channel: string, ...args: any[]) => Promise<any>;
};
$message: any;
}

View File

@@ -11,7 +11,15 @@ const api = {
restart: () => ipcRenderer.send('restart'),
openLyric: () => ipcRenderer.send('open-lyric'),
sendLyric: (data) => ipcRenderer.send('send-lyric', data),
unblockMusic: (id) => ipcRenderer.invoke('unblock-music', id)
unblockMusic: (id) => ipcRenderer.invoke('unblock-music', id),
// 歌词缓存相关
invoke: (channel: string, ...args: any[]) => {
const validChannels = ['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}`));
}
};
// Use `contextBridge` APIs to expose Electron APIs to

View File

@@ -0,0 +1,21 @@
import request from '@/utils/request';
// 获取歌手详情
export const getArtistDetail = (id) => {
return request.get('/artist/detail', { params: { id } });
};
// 获取歌手热门歌曲
export const getArtistTopSongs = (params) => {
return request.get('/artist/songs', {
params: {
...params,
order: 'hot'
}
});
};
// 获取歌手专辑
export const getArtistAlbums = (params) => {
return request.get('/artist/album', { params });
};

View File

@@ -1,5 +1,5 @@
import store from '@/store';
import { ILyric } from '@/type/lyric';
import type { ILyric } from '@/type/lyric';
import { isElectron } from '@/utils';
import request from '@/utils/request';
import requestMusic from '@/utils/request_music';
@@ -36,8 +36,25 @@ export const getMusicDetail = (ids: Array<number>) => {
};
// 根据音乐Id获取音乐歌词
export const getMusicLrc = (id: number) => {
return request.get<ILyric>('/lyric', { params: { 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 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) => {

View File

@@ -3,6 +3,8 @@ import request from '@/utils/request';
interface IParams {
keywords: string;
type: number;
limit?: number;
offset?: number;
}
// 搜索内容
export const getSearch = (params: IParams) => {

View File

@@ -5,3 +5,7 @@ body {
.n-popover:has(.music-play) {
border-radius: 1.5rem !important;
}
.n-popover {
border-radius: 0.5rem !important;
overflow: hidden !important;
}

View File

@@ -11,7 +11,6 @@ declare module 'vue' {
NBadge: typeof import('naive-ui')['NBadge']
NButton: typeof import('naive-ui')['NButton']
NButtonGroup: typeof import('naive-ui')['NButtonGroup']
NCard: typeof import('naive-ui')['NCard']
NCheckbox: typeof import('naive-ui')['NCheckbox']
NCheckboxGroup: typeof import('naive-ui')['NCheckboxGroup']
NConfigProvider: typeof import('naive-ui')['NConfigProvider']
@@ -40,8 +39,6 @@ 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']
NVirtualList: typeof import('naive-ui')['NVirtualList']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
}

View File

@@ -7,6 +7,7 @@
mask-closable
:style="{ backgroundColor: 'transparent' }"
:to="`#layout-main`"
:z-index="9998"
@mask-click="close"
>
<div class="music-page">
@@ -17,7 +18,7 @@
</div>
</n-ellipsis>
<div class="music-close">
<i class="icon iconfont icon-icon_error" @click="close"></i>
<i class="icon iconfont ri-close-line" @click="close"></i>
</div>
</div>
<div class="music-content">
@@ -234,7 +235,7 @@ watch(
}
&-close {
@apply cursor-pointer text-gray-900 dark:text-white flex gap-2 items-center;
@apply cursor-pointer text-gray-500 dark:text-white hover:text-gray-900 dark:hover:text-gray-300 flex gap-2 items-center transition;
.icon {
@apply text-3xl;
}

View File

@@ -0,0 +1,316 @@
<template>
<n-drawer
v-model:show="modelValue"
:width="800"
placement="right"
:mask-closable="true"
:z-index="9997"
>
<div v-loading="loading" class="artist-drawer">
<div class="close-btn">
<i class="ri-close-line" @click="modelValue = false"></i>
</div>
<!-- 歌手信息头部 -->
<div class="artist-header">
<div class="artist-cover">
<n-image
:src="getImgUrl(artistInfo?.avatar, '300y300')"
class="w-48 h-48 rounded-2xl object-cover"
preview-disabled
/>
</div>
<div class="artist-info">
<h1 class="artist-name">{{ artistInfo?.name }}</h1>
<div v-if="artistInfo?.alias?.length" class="artist-alias">
{{ artistInfo.alias.join(' / ') }}
</div>
<div v-if="artistInfo?.briefDesc" class="artist-desc">
{{ artistInfo.briefDesc }}
</div>
</div>
</div>
<!-- 标签页切换 -->
<n-tabs v-model:value="activeTab" class="flex-1" type="line" animated>
<n-tab-pane name="songs" tab="热门歌曲">
<div ref="songListRef" class="songs-list">
<n-scrollbar style="max-height: 61vh" :size="5" @scroll="handleSongScroll">
<div class="song-list-content">
<song-item
v-for="song in songs"
:key="song.id"
:item="song"
:list="true"
@play="handlePlay"
/>
<div v-if="songLoading" class="loading-more">加载中...</div>
</div>
<play-bottom />
</n-scrollbar>
</div>
</n-tab-pane>
<n-tab-pane name="albums" tab="专辑">
<div ref="albumListRef" class="albums-list">
<n-scrollbar style="max-height: 61vh" :size="5" @scroll="handleAlbumScroll">
<div class="albums-grid">
<search-item
v-for="album in albums"
:key="album.id"
shape="square"
:item="{
id: album.id,
picUrl: album.picUrl,
name: album.name,
desc: formatPublishTime(album.publishTime),
size: album.size,
type: '专辑'
}"
/>
<div v-if="albumLoading" class="loading-more">加载中...</div>
</div>
<play-bottom />
</n-scrollbar>
</div>
</n-tab-pane>
<n-tab-pane name="about" tab="艺人介绍">
<div class="artist-description">
<n-scrollbar style="max-height: 60vh">
<div class="description-content" v-html="artistInfo?.briefDesc"></div>
</n-scrollbar>
</div>
</n-tab-pane>
</n-tabs>
</div>
</n-drawer>
</template>
<script setup lang="ts">
import { useDateFormat } from '@vueuse/core';
import { ref, watch } from 'vue';
import { useStore } from 'vuex';
import { getArtistAlbums, getArtistDetail, getArtistTopSongs } from '@/api/artist';
import { getMusicDetail } from '@/api/music';
import SearchItem from '@/components/common/SearchItem.vue';
import SongItem from '@/components/common/SongItem.vue';
import { IArtist } from '@/type/artist';
import { getImgUrl } from '@/utils';
import PlayBottom from './PlayBottom.vue';
const modelValue = defineModel<boolean>('show', { required: true });
const store = useStore();
const activeTab = ref('songs');
const currentArtistId = ref<number>();
// 歌手信息
const artistInfo = ref<IArtist>();
const songs = ref<any[]>([]);
const albums = ref<any[]>([]);
// 加载状态
const songLoading = ref(false);
const albumLoading = ref(false);
// 分页参数
const songPage = ref({
page: 1,
pageSize: 30,
hasMore: true
});
const albumPage = ref({
page: 1,
pageSize: 30,
hasMore: true
});
watch(modelValue, (newVal) => {
store.commit('setShowArtistDrawer', newVal);
});
const loading = ref(false);
// 加载歌手信息
const loadArtistInfo = async (id: number) => {
if (currentArtistId.value === id) return;
activeTab.value = 'songs';
loading.value = true;
currentArtistId.value = id;
try {
const info = await getArtistDetail(id);
if (info.data?.data?.artist) {
artistInfo.value = info.data.data.artist;
}
// 重置分页并加载初始数据
resetPagination();
await Promise.all([loadSongs(), loadAlbums()]);
} catch (error) {
console.error('加载歌手信息失败:', error);
} finally {
loading.value = false;
}
};
// 重置分页
const resetPagination = () => {
songPage.value = {
page: 1,
pageSize: 30,
hasMore: true
};
albumPage.value = {
page: 1,
pageSize: 30,
hasMore: true
};
songs.value = [];
albums.value = [];
};
// 加载歌曲
const loadSongs = async () => {
if (!currentArtistId.value || !songPage.value.hasMore || songLoading.value) return;
try {
songLoading.value = true;
const { page, pageSize } = songPage.value;
const res = await getArtistTopSongs({
id: currentArtistId.value,
limit: pageSize,
offset: (page - 1) * pageSize
});
const ids = res.data.songs.map((item) => item.id);
const songsDetail = await getMusicDetail(ids);
if (songsDetail.data?.songs) {
const newSongs = songsDetail.data.songs.map((item) => {
return {
...item,
picUrl: item.al.picUrl,
song: {
artists: item.ar,
name: item.name,
id: item.id
}
};
});
songs.value = page === 1 ? newSongs : [...songs.value, ...newSongs];
songPage.value.hasMore = newSongs.length === pageSize;
songPage.value.page++;
}
} catch (error) {
console.error('加载歌曲失败:', error);
} finally {
songLoading.value = false;
}
};
// 加载专辑
const loadAlbums = async () => {
if (!currentArtistId.value || !albumPage.value.hasMore || albumLoading.value) return;
try {
albumLoading.value = true;
const { page, pageSize } = albumPage.value;
const res = await getArtistAlbums({
id: currentArtistId.value,
limit: pageSize,
offset: (page - 1) * pageSize
});
if (res.data?.hotAlbums) {
const newAlbums = res.data.hotAlbums;
albums.value = page === 1 ? newAlbums : [...albums.value, ...newAlbums];
albumPage.value.hasMore = newAlbums.length === pageSize;
albumPage.value.page++;
}
} catch (error) {
console.error('加载专辑失败:', error);
} finally {
albumLoading.value = false;
}
};
// 处理滚动加载
const handleSongScroll = (e: { target: any }) => {
const { scrollTop, scrollHeight, clientHeight } = e.target;
if (scrollHeight - scrollTop - clientHeight < 50) {
loadSongs();
}
};
const handleAlbumScroll = (e: { target: any }) => {
const { scrollTop, scrollHeight, clientHeight } = e.target;
if (scrollHeight - scrollTop - clientHeight < 50) {
loadAlbums();
}
};
// 格式化发布时间
const formatPublishTime = (time: number) => {
return useDateFormat(time, 'YYYY-MM-DD').value;
};
const handlePlay = () => {
store.commit(
'setPlayList',
songs.value.map((item) => ({
...item,
picUrl: item.al.picUrl
}))
);
};
// 暴露方法给父组件
defineExpose({
loadArtistInfo
});
</script>
<style lang="scss" scoped>
.artist-drawer {
@apply h-full bg-light dark:bg-dark px-6 overflow-hidden flex flex-col;
.close-btn {
@apply absolute top-4 right-4 text-gray-500 dark:text-gray-400 hover:text-green-500 text-2xl cursor-pointer p-2;
}
.artist-header {
@apply flex gap-6 pt-6;
.artist-info {
@apply flex-1;
.artist-name {
@apply text-4xl font-bold mb-2;
}
.artist-alias {
@apply text-gray-500 dark:text-gray-400 mb-2;
}
.artist-desc {
@apply text-sm text-gray-600 dark:text-gray-300 line-clamp-3;
}
}
}
.albums-grid {
@apply grid gap-4 grid-cols-5;
}
.loading-more {
@apply text-center py-4 text-gray-500 dark:text-gray-400;
}
.artist-description {
.description-content {
@apply text-sm leading-relaxed whitespace-pre-wrap;
}
}
}
</style>

View File

@@ -77,6 +77,10 @@
</div>
<div class="p-6 rounded-lg shadow-lg bg-light dark:bg-gray-800">
<div class="description text-center text-sm text-gray-700 dark:text-gray-200">
<p>您的捐赠将用于支持开发和维护工作包括但不限于服务器维护域名续费等</p>
<p>留言时可留下您的邮箱或 github名称</p>
</div>
<div class="flex justify-between">
<div class="flex flex-col items-center gap-2">
<n-image

View File

@@ -1,40 +0,0 @@
<script lang="ts" setup>
import { setAnimationClass } from '@/utils';
const props = defineProps({
showPop: {
type: Boolean,
default: false
},
showClose: {
type: Boolean,
default: true
}
});
const musicFullClass = computed(() => {
if (props.showPop) {
return setAnimationClass('animate__fadeInUp');
}
return setAnimationClass('animate__fadeOutDown');
});
</script>
<template>
<div v-show="props.showPop" class="pop-page" :class="musicFullClass">
<i v-if="props.showClose" class="iconfont icon-icon_error close"></i>
<img src="http://code.myalger.top/2000*2000.jpg,f054f0,0f2255" />
<slot></slot>
</div>
</template>
<style lang="scss" scoped>
.pop-page {
height: 800px;
@apply absolute top-4 left-0 w-full;
background-color: #000000f0;
.close {
@apply absolute top-4 right-4 cursor-pointer text-white text-3xl;
}
}
</style>

View File

@@ -1,8 +1,9 @@
<template>
<div class="search-item" :class="item.type" @click="handleClick">
<div class="search-item" :class="[item.type, shape]" @click="handleClick">
<div class="search-item-img">
<n-image
:src="getImgUrl(item.picUrl, item.type === 'mv' ? '320y180' : '100y100')"
class="w-full h-full"
:src="getImgUrl(item.picUrl, item.type === 'mv' ? '320y180' : '200y200')"
lazy
preview-disabled
/>
@@ -15,6 +16,11 @@
<p class="search-item-artist">{{ item.desc }}</p>
</div>
<div v-if="item.type === '专辑'" class="search-item-size">
<i class="ri-music-2-line"></i>
<span>{{ item.size }}</span>
</div>
<music-list
v-if="['专辑', 'playlist'].includes(item.type)"
v-model:show="showPop"
@@ -43,15 +49,21 @@ import { getImgUrl } from '@/utils';
import MusicList from '../MusicList.vue';
const props = defineProps<{
item: {
picUrl: string;
name: string;
desc: string;
type: string;
[key: string]: any;
};
}>();
const props = withDefaults(
defineProps<{
shape?: 'square' | 'rectangle';
item: {
picUrl: string;
name: string;
desc: string;
type: string;
[key: string]: any;
};
}>(),
{
shape: 'rectangle'
}
);
const songList = ref<any[]>([]);
@@ -104,11 +116,45 @@ const handleClick = async () => {
<style scoped lang="scss">
.search-item {
@apply rounded-3xl p-3 flex items-center hover:bg-light-200 dark:hover:bg-gray-800 transition cursor-pointer;
margin: 0 10px;
.search-item-img {
@apply w-12 h-12 mr-4 rounded-2xl overflow-hidden;
@apply rounded-lg p-0 flex items-center hover:bg-transparent transition cursor-pointer border-none;
&.square {
@apply flex-col relative;
.search-item-img {
@apply w-full aspect-square mb-2 mr-0 rounded-lg overflow-hidden hover:shadow-xl transition-all duration-300 shadow-sm shadow-black/20 dark:shadow-white/20;
img {
@apply object-cover w-full h-full transition-transform duration-500;
}
}
.search-item-info {
@apply w-full text-left px-0;
.search-item-name {
@apply truncate mb-1 font-medium text-base text-gray-800 dark:text-gray-200;
}
.search-item-artist {
@apply truncate text-sm text-gray-500 dark:text-gray-400;
}
}
.search-item-size {
@apply absolute top-2 right-2 text-xs text-white px-2 py-1 rounded-full bg-black/30 backdrop-blur-sm;
i {
@apply text-xs;
}
}
}
&.rectangle {
@apply hover:bg-light-200 dark:hover:bg-dark-200 p-3;
.search-item-img {
@apply w-12 h-12 mr-4 rounded-lg overflow-hidden;
}
}
.search-item-info {
@apply flex-1 overflow-hidden;
&-name {
@@ -138,4 +184,8 @@ const handleClick = async () => {
}
}
}
.search-item-size {
@apply flex items-center gap-2 text-gray-400;
}
</style>

View File

@@ -25,10 +25,14 @@
}}</n-ellipsis>
<div class="song-item-content-divider">-</div>
<n-ellipsis class="song-item-content-name text-ellipsis" line-clamp="1">
<span v-for="(artists, artistsindex) in item.ar || item.song.artists" :key="artistsindex"
>{{ artists.name
}}{{ artistsindex < (item.ar || item.song.artists).length - 1 ? ' / ' : '' }}</span
>
<template v-for="(artist, index) in artists" :key="index">
<span
class="cursor-pointer hover:text-green-500"
@click.stop="handleArtistClick(artist.id)"
>{{ artist.name }}</span
>
<span v-if="index < artists.length - 1"> / </span>
</template>
</n-ellipsis>
</div>
<template v-else>
@@ -37,12 +41,14 @@
</div>
<div class="song-item-content-name">
<n-ellipsis class="text-ellipsis" line-clamp="1">
<span
v-for="(artists, artistsindex) in item.ar || item.song.artists"
:key="artistsindex"
>{{ artists.name
}}{{ artistsindex < (item.ar || item.song.artists).length - 1 ? ' / ' : '' }}</span
>
<template v-for="(artist, index) in artists" :key="index">
<span
class="cursor-pointer hover:text-green-500"
@click.stop="handleArtistClick(artist.id)"
>{{ artist.name }}</span
>
<span v-if="index < artists.length - 1"> / </span>
</template>
</n-ellipsis>
</div>
</template>
@@ -266,6 +272,15 @@ const toggleFavorite = async (e: Event) => {
const toggleSelect = () => {
emits('select', props.item.id, !props.selected);
};
const handleArtistClick = (id: number) => {
store.commit('setCurrentArtistId', id);
};
// 获取歌手列表最多显示5个
const artists = computed(() => {
return (props.item.ar || props.item.song?.artists)?.slice(0, 4) || [];
});
</script>
<style lang="scss" scoped>

View File

@@ -1,4 +1,4 @@
import { computed, ref } from 'vue';
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
import { audioService } from '@/services/audioService';
import store from '@/store';
@@ -44,10 +44,9 @@ document.onkeyup = (e) => {
watch(
() => store.state.playMusicUrl,
(newVal) => {
if (newVal) {
audioService.play(newVal);
sound.value = audioService.getCurrentSound();
audioServiceOn(audioService);
if (newVal && playMusic.value) {
sound.value = audioService.play(newVal, playMusic.value);
setupAudioListeners();
}
}
);
@@ -70,11 +69,11 @@ watch(
}
);
export const audioServiceOn = (audio: typeof audioService) => {
const setupAudioListeners = () => {
let interval: any = null;
// 监听播放
audio.onPlay(() => {
audioService.on('play', () => {
store.commit('setPlayMusic', true);
interval = setInterval(() => {
nowTime.value = sound.value?.seek() as number;
@@ -83,12 +82,10 @@ export const audioServiceOn = (audio: typeof audioService) => {
if (newIndex !== nowIndex.value) {
nowIndex.value = newIndex;
currentLrcProgress.value = 0;
// 当歌词索引更新时,发送歌词数据
if (isElectron && isLyricWindowOpen.value) {
sendLyricToWin();
}
}
// 定期发送歌词数据更新
if (isElectron && isLyricWindowOpen.value) {
sendLyricToWin();
}
@@ -96,33 +93,29 @@ export const audioServiceOn = (audio: typeof audioService) => {
});
// 监听暂停
audio.onPause(() => {
audioService.on('pause', () => {
store.commit('setPlayMusic', false);
clearInterval(interval);
// 暂停时也发送一次状态更新
if (isElectron && isLyricWindowOpen.value) {
sendLyricToWin();
}
});
// 监听结束
audio.onEnd(() => {
audioService.on('end', () => {
if (store.state.playMode === 1) {
// 单曲循环模式
audio.getCurrentSound()?.play();
sound.value?.play();
} else if (store.state.playMode === 2) {
// 随机播放模式
const { playList } = store.state;
if (playList.length <= 1) {
// 如果播放列表只有一首歌或为空,则重新播放当前歌曲
audio.getCurrentSound()?.play();
sound.value?.play();
} else {
// 随机选择一首不同的歌
let randomIndex;
do {
randomIndex = Math.floor(Math.random() * playList.length);
} while (randomIndex === store.state.playListIndex && playList.length > 1);
store.state.playListIndex = randomIndex;
store.commit('setPlay', playList[randomIndex]);
}
@@ -131,6 +124,15 @@ export const audioServiceOn = (audio: typeof audioService) => {
store.commit('nextPlay');
}
});
// 监听上一曲/下一曲控制
audioService.on('previoustrack', () => {
store.commit('prevPlay');
});
audioService.on('nexttrack', () => {
store.commit('nextPlay');
});
};
export const play = () => {
@@ -357,3 +359,15 @@ if (isElectron) {
}
});
}
// 在组件挂载时设置监听器
onMounted(() => {
if (isPlaying.value) {
useLyricProgress();
}
});
// 在组件卸载时清理
onUnmounted(() => {
audioService.stop();
});

View File

@@ -13,13 +13,11 @@ const musicHistory = useMusicHistory();
// 获取歌曲url
export const getSongUrl = async (id: number, songData: any, isDownloaded: boolean = false) => {
const { data } = await getMusicUrl(id);
console.log('data', data);
let url = '';
let songDetail = null;
try {
if (data.data[0].freeTrialInfo || !data.data[0].url) {
const res = await getParsingMusicUrl(id, songData);
console.log('res', res);
url = res.data.data.url;
songDetail = res.data.data;
} else {
@@ -52,7 +50,6 @@ const getSongDetail = async (playMusic: SongResult) => {
export const useMusicListHook = () => {
const handlePlayMusic = async (state: any, playMusic: SongResult) => {
const updatedPlayMusic = await getSongDetail(playMusic);
console.log('updatedPlayMusic', updatedPlayMusic);
state.playMusic = updatedPlayMusic;
state.playMusicUrl = updatedPlayMusic.playMusicUrl;
state.play = true;

View File

@@ -31,11 +31,12 @@
</div>
<install-app-modal v-if="!isElectron"></install-app-modal>
<update-modal v-if="isElectron" />
<artist-drawer ref="artistDrawerRef" :show="artistDrawerShow" />
</div>
</template>
<script lang="ts" setup>
import { computed, defineAsyncComponent, onMounted } from 'vue';
import { computed, defineAsyncComponent, nextTick, onMounted, ref, watch } from 'vue';
import { useRoute } from 'vue-router';
import { useStore } from 'vuex';
@@ -61,6 +62,8 @@ const PlayBar = defineAsyncComponent(() => import('./components/PlayBar.vue'));
const SearchBar = defineAsyncComponent(() => import('./components/SearchBar.vue'));
const TitleBar = defineAsyncComponent(() => import('./components/TitleBar.vue'));
const ArtistDrawer = defineAsyncComponent(() => import('@/components/common/ArtistDrawer.vue'));
const store = useStore();
const isPlay = computed(() => store.state.isPlay as boolean);
@@ -71,6 +74,25 @@ onMounted(() => {
store.dispatch('initializeSettings');
store.dispatch('initializeTheme');
});
const artistDrawerRef = ref<InstanceType<typeof ArtistDrawer>>();
const artistDrawerShow = computed({
get: () => store.state.showArtistDrawer,
set: (val) => store.commit('setShowArtistDrawer', val)
});
// 监听歌手ID变化
watch(
() => store.state.currentArtistId,
(newId) => {
if (newId) {
artistDrawerShow.value = true;
nextTick(() => {
artistDrawerRef.value?.loadArtistInfo(newId);
});
}
}
);
</script>
<style lang="scss" scoped>

View File

@@ -1,6 +1,6 @@
<template>
<n-drawer
:show="musicFull"
v-model:show="isVisible"
height="100%"
placement="bottom"
:style="{ background: currentBackground || background }"
@@ -22,10 +22,24 @@
<div>
<div class="music-content-name">{{ playMusic.name }}</div>
<div class="music-content-singer">
<span v-for="(item, index) in playMusic.ar || playMusic.song.artists" :key="index">
{{ item.name
}}{{ index < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : '' }}
</span>
<n-ellipsis
class="text-ellipsis"
line-clamp="2"
:tooltip="{
contentStyle: { maxWidth: '600px' },
zIndex: 99999
}"
>
<span
v-for="(item, index) in playMusic.ar || playMusic.song.artists"
:key="index"
class="cursor-pointer hover:text-green-500"
@click="handleArtistClick(item.id)"
>
{{ item.name }}
{{ index < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : '' }}
</span>
</n-ellipsis>
</div>
</div>
</div>
@@ -69,7 +83,8 @@
<script setup lang="ts">
import { useDebounceFn } from '@vueuse/core';
import { onBeforeUnmount, ref, watch } from 'vue';
import { computed, onBeforeUnmount, ref, watch } from 'vue';
import { useStore } from 'vuex';
import {
lrcArray,
@@ -91,7 +106,7 @@ const animationFrame = ref<number | null>(null);
const isDark = ref(false);
const props = defineProps({
musicFull: {
modelValue: {
type: Boolean,
default: false
},
@@ -101,10 +116,17 @@ const props = defineProps({
}
});
const emit = defineEmits(['update:modelValue']);
const isVisible = computed({
get: () => props.modelValue,
set: (value) => emit('update:modelValue', value)
});
// 歌词滚动方法
const lrcScroll = (behavior = 'smooth') => {
const nowEl = document.querySelector(`#music-lrc-text-${nowIndex.value}`);
if (props.musicFull && !isMouse.value && nowEl && lrcContainer.value) {
if (isVisible.value && !isMouse.value && nowEl && lrcContainer.value) {
const containerRect = lrcContainer.value.getBoundingClientRect();
const nowElRect = nowEl.getBoundingClientRect();
const relativeTop = nowElRect.top - containerRect.top;
@@ -136,9 +158,9 @@ watch(nowIndex, () => {
});
watch(
() => props.musicFull,
() => isVisible.value,
() => {
if (props.musicFull) {
if (isVisible.value) {
nextTick(() => {
lrcScroll('instant');
});
@@ -219,6 +241,12 @@ onBeforeUnmount(() => {
}
});
const store = useStore();
const handleArtistClick = (id: number) => {
isVisible.value = false;
store.commit('setCurrentArtistId', id);
};
defineExpose({
lrcScroll
});
@@ -263,7 +291,7 @@ defineExpose({
@apply flex flex-col justify-center items-center relative;
&-name {
@apply font-bold text-xl pb-1 pt-4;
@apply font-bold text-2xl pb-1 pt-4;
}
&-singer {

View File

@@ -51,15 +51,23 @@
</n-ellipsis>
</div>
<div class="music-content-name">
<n-ellipsis class="text-ellipsis" line-clamp="1">
<n-ellipsis
class="text-ellipsis"
line-clamp="1"
:tooltip="{
contentStyle: { maxWidth: '600px' },
zIndex: 99999
}"
>
<span
v-for="(artists, artistsindex) in playMusic.ar || playMusic.song.artists"
:key="artistsindex"
>{{ artists.name
}}{{
artistsindex < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : ''
}}</span
class="cursor-pointer hover:text-green-500"
@click="handleArtistClick(artists.id)"
>
{{ artists.name
}}{{ artistsindex < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : '' }}
</span>
</n-ellipsis>
</div>
</div>
@@ -140,7 +148,7 @@
</n-popover>
</div>
<!-- 播放音乐 -->
<music-full ref="MusicFullRef" v-model:music-full="musicFullVisible" :background="background" />
<music-full ref="MusicFullRef" v-model="musicFullVisible" :background="background" />
</div>
</template>
@@ -295,6 +303,9 @@ const musicFullVisible = ref(false);
const setMusicFull = () => {
musicFullVisible.value = !musicFullVisible.value;
store.commit('setMusicFull', musicFullVisible.value);
if (musicFullVisible.value) {
store.commit('setShowArtistDrawer', false);
}
};
const palyListRef = useTemplateRef('palyListRef');
@@ -322,6 +333,11 @@ const toggleFavorite = async (e: Event) => {
const openLyricWindow = () => {
openLyric();
};
const handleArtistClick = (id: number) => {
musicFullVisible.value = false;
store.commit('setCurrentArtistId', id);
};
</script>
<style lang="scss" scoped>

View File

@@ -73,8 +73,12 @@
<i class="iconfont ri-restart-line"></i>
<span>重启</span>
</div>
<div class="menu-item" @click="toGithubRelease">
<div class="menu-item" @click="selectItem('refresh')">
<i class="iconfont ri-refresh-line"></i>
<span>刷新</span>
</div>
<div class="menu-item" @click="toGithubRelease">
<i class="iconfont ri-github-fill"></i>
<span>当前版本</span>
<div class="version-info">
<span class="version-number">{{ updateInfo.currentVersion }}</span>
@@ -212,6 +216,9 @@ const selectItem = async (key: string) => {
case 'user':
router.push('/user');
break;
case 'refresh':
window.location.reload();
break;
default:
}
};
@@ -286,7 +293,7 @@ const toGithubRelease = () => {
}
.user-popover {
@apply min-w-[280px] p-0 rounded-xl overflow-hidden;
@apply min-w-[220px] p-0 rounded-xl overflow-hidden;
@apply bg-light dark:bg-black;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
@@ -303,7 +310,7 @@ const toGithubRelease = () => {
@apply py-1;
.menu-item {
@apply flex items-center px-3 py-2 text-sm cursor-pointer;
@apply flex items-center px-3 py-1 text-sm cursor-pointer;
@apply text-gray-700 dark:text-gray-300;
transition: background-color 0.2s;

View File

@@ -99,7 +99,7 @@ const drag = (event: MouseEvent) => {
-webkit-app-region: drag;
@apply flex justify-between px-6 py-2 select-none relative;
@apply text-dark dark:text-white;
z-index: 9999999;
z-index: 3000;
}
#buttons {

View File

@@ -1,13 +1,134 @@
import { Howl } from 'howler';
import type { SongResult } from '@/type/music';
class AudioService {
private currentSound: Howl | null = null;
play(url: string) {
private currentTrack: SongResult | null = null;
constructor() {
if ('mediaSession' in navigator) {
this.initMediaSession();
}
}
private initMediaSession() {
navigator.mediaSession.setActionHandler('play', () => {
this.currentSound?.play();
});
navigator.mediaSession.setActionHandler('pause', () => {
this.currentSound?.pause();
});
navigator.mediaSession.setActionHandler('stop', () => {
this.stop();
});
navigator.mediaSession.setActionHandler('seekto', (event) => {
if (event.seekTime && this.currentSound) {
this.currentSound.seek(event.seekTime);
}
});
navigator.mediaSession.setActionHandler('seekbackward', (event) => {
if (this.currentSound) {
const currentTime = this.currentSound.seek() as number;
this.currentSound.seek(currentTime - (event.seekOffset || 10));
}
});
navigator.mediaSession.setActionHandler('seekforward', (event) => {
if (this.currentSound) {
const currentTime = this.currentSound.seek() as number;
this.currentSound.seek(currentTime + (event.seekOffset || 10));
}
});
navigator.mediaSession.setActionHandler('previoustrack', () => {
// 这里需要通过回调通知外部
this.emit('previoustrack');
});
navigator.mediaSession.setActionHandler('nexttrack', () => {
// 这里需要通过回调通知外部
this.emit('nexttrack');
});
}
private updateMediaSessionMetadata(track: SongResult) {
if (!('mediaSession' in navigator)) return;
const artists = track.ar ? track.ar.map((a) => a.name) : track.song.artists?.map((a) => a.name);
const album = track.al ? track.al.name : track.song.album.name;
const artwork = ['96', '128', '192', '256', '384', '512'].map((size) => ({
src: `${track.picUrl}?param=${size}y${size}`,
type: 'image/jpg',
sizes: `${size}x${size}`
}));
const metadata = {
title: track.name || '',
artist: artists ? artists.join(',') : '',
album: album || '',
artwork
};
navigator.mediaSession.metadata = new window.MediaMetadata(metadata);
}
private updateMediaSessionState(isPlaying: boolean) {
if (!('mediaSession' in navigator)) return;
navigator.mediaSession.playbackState = isPlaying ? 'playing' : 'paused';
this.updateMediaSessionPositionState();
}
private updateMediaSessionPositionState() {
if (!this.currentSound || !('mediaSession' in navigator)) return;
if ('setPositionState' in navigator.mediaSession) {
navigator.mediaSession.setPositionState({
duration: this.currentSound.duration(),
playbackRate: 1.0,
position: this.currentSound.seek() as number
});
}
}
// 事件处理相关
private callbacks: { [key: string]: Function[] } = {};
private emit(event: string, ...args: any[]) {
const eventCallbacks = this.callbacks[event];
if (eventCallbacks) {
eventCallbacks.forEach((callback) => callback(...args));
}
}
on(event: string, callback: Function) {
if (!this.callbacks[event]) {
this.callbacks[event] = [];
}
this.callbacks[event].push(callback);
}
off(event: string, callback: Function) {
const eventCallbacks = this.callbacks[event];
if (eventCallbacks) {
this.callbacks[event] = eventCallbacks.filter((cb) => cb !== callback);
}
}
// 播放控制相关
play(url: string, track: SongResult) {
// Howler.unload();
if (this.currentSound) {
this.currentSound.unload();
}
this.currentSound = null;
this.currentTrack = track;
this.currentSound = new Howl({
src: [url],
html5: true,
@@ -17,6 +138,34 @@ class AudioService {
: 1
});
// 更新媒体会话元数据
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;
}
@@ -24,32 +173,33 @@ class AudioService {
return this.currentSound;
}
getCurrentTrack() {
return this.currentTrack;
}
stop() {
if (this.currentSound) {
this.currentSound.stop();
this.currentSound.unload();
this.currentSound = null;
}
}
// 监听播放
onPlay(callback: () => void) {
if (this.currentSound) {
this.currentSound.on('play', callback);
this.currentTrack = null;
if ('mediaSession' in navigator) {
navigator.mediaSession.playbackState = 'none';
}
}
// 监听暂停
onPause(callback: () => void) {
setVolume(volume: number) {
if (this.currentSound) {
this.currentSound.on('pause', callback);
this.currentSound.volume(volume);
localStorage.setItem('volume', volume.toString());
}
}
// 监听结束
onEnd(callback: () => void) {
seek(time: number) {
if (this.currentSound) {
this.currentSound.on('end', callback);
this.currentSound.seek(time);
this.updateMediaSessionPositionState();
}
}
}

View File

@@ -16,7 +16,7 @@ function getLocalStorageItem<T>(key: string, defaultValue: T): T {
return item ? JSON.parse(item) : defaultValue;
}
interface State {
export interface State {
menus: any[];
play: boolean;
isPlay: boolean;
@@ -35,6 +35,8 @@ interface State {
theme: ThemeType;
musicFull: boolean;
showUpdateModal: boolean;
showArtistDrawer: boolean;
currentArtistId: number | null;
}
const state: State = {
@@ -55,7 +57,9 @@ const state: State = {
playMode: getLocalStorageItem('playMode', 0),
theme: getCurrentTheme(),
musicFull: false,
showUpdateModal: false
showUpdateModal: false,
showArtistDrawer: false,
currentArtistId: null
};
const { handlePlayMusic, nextPlay, prevPlay } = useMusicListHook();
@@ -147,6 +151,15 @@ const mutations = {
state.user = null;
localStorage.removeItem('user');
localStorage.removeItem('token');
},
setShowArtistDrawer(state, show: boolean) {
state.showArtistDrawer = show;
if (!show) {
state.currentArtistId = null;
}
},
setCurrentArtistId(state, id: number) {
state.currentArtistId = id;
}
};
@@ -197,6 +210,9 @@ const actions = {
// 更新本地存储
localStorage.setItem('favoriteList', JSON.stringify(state.favoriteList));
},
showArtist({ commit }, id: number) {
commit('setCurrentArtistId', id);
}
};

110
src/renderer/type/artist.ts Normal file
View File

@@ -0,0 +1,110 @@
export interface IArtistDetail {
videoCount: number;
vipRights: VipRights;
identify: Identify;
artist: IArtist;
blacklist: boolean;
preferShow: number;
showPriMsg: boolean;
secondaryExpertIdentiy: SecondaryExpertIdentiy[];
eventCount: number;
user: User;
}
interface User {
backgroundUrl: string;
birthday: number;
detailDescription: string;
authenticated: boolean;
gender: number;
city: number;
signature: null;
description: string;
remarkName: null;
shortUserName: string;
accountStatus: number;
locationStatus: number;
avatarImgId: number;
defaultAvatar: boolean;
province: number;
nickname: string;
expertTags: null;
djStatus: number;
avatarUrl: string;
accountType: number;
authStatus: number;
vipType: number;
userName: string;
followed: boolean;
userId: number;
lastLoginIP: string;
lastLoginTime: number;
authenticationTypes: number;
mutual: boolean;
createTime: number;
anchor: boolean;
authority: number;
backgroundImgId: number;
userType: number;
experts: null;
avatarDetail: AvatarDetail;
}
interface AvatarDetail {
userType: number;
identityLevel: number;
identityIconUrl: string;
}
interface SecondaryExpertIdentiy {
expertIdentiyId: number;
expertIdentiyName: string;
expertIdentiyCount: number;
}
export interface IArtist {
id: number;
cover: string;
avatar: string;
name: string;
transNames: any[];
alias: any[];
identities: any[];
identifyTag: string[];
briefDesc: string;
rank: Rank;
albumSize: number;
musicSize: number;
mvSize: number;
}
interface Rank {
rank: number;
type: number;
}
interface Identify {
imageUrl: string;
imageDesc: string;
actionUrl: string;
}
interface VipRights {
rightsInfoDetailDtoList: RightsInfoDetailDtoList[];
oldProtocol: boolean;
redVipAnnualCount: number;
redVipLevel: number;
now: number;
}
interface RightsInfoDetailDtoList {
vipCode: number;
expireTime: number;
iconUrl: null;
dynamicIconUrl: null;
vipLevel: number;
signIap: boolean;
signDeduct: boolean;
signIapDeduct: boolean;
sign: boolean;
}

View File

@@ -23,6 +23,9 @@ export const setAnimationClass = (type: String) => {
};
// 设置动画延时
export const setAnimationDelay = (index: number = 6, time: number = 50) => {
if (store.state.setData?.noAnimate) {
return '';
}
const speed = store.state.setData?.animationSpeed || 1;
return `animation-delay:${(index * time) / (speed * 2)}ms`;
};

View File

@@ -27,10 +27,17 @@
<n-layout
v-if="isMobile ? searchDetail : true"
class="search-list"
:class="setAnimationClass('animate__fadeInUp')"
:class="setAnimationClass('animate__fadeInDown')"
:native-scrollbar="false"
@scroll="handleScroll"
>
<div class="title">{{ hotKeyword }}</div>
<div v-if="searchDetail" class="title">
<i
class="ri-arrow-left-s-line mr-1 cursor-pointer hover:text-gray-500 hover:scale-110"
@click="searchDetail = null"
></i>
{{ hotKeyword }}
</div>
<div v-loading="searchDetailLoading" class="search-list-box">
<template v-if="searchDetail">
<div
@@ -46,6 +53,7 @@
<div
v-for="(item, index) in list"
:key="item.id"
class="mb-3"
:class="setAnimationClass('animate__bounceInRight')"
:style="setAnimationDelay(index, 50)"
>
@@ -53,6 +61,41 @@
</div>
</template>
</template>
<!-- 加载状态 -->
<div v-if="isLoadingMore" class="loading-more">
<n-spin size="small" />
<span class="ml-2">加载中...</span>
</div>
<div v-if="!hasMore && searchDetail" class="no-more">没有更多了</div>
</template>
<!-- 搜索历史 -->
<template v-else>
<div class="search-history">
<div class="search-history-header title">
<span>搜索历史</span>
<n-button text type="error" @click="clearSearchHistory">
<template #icon>
<i class="ri-delete-bin-line"></i>
</template>
清空
</n-button>
</div>
<div class="search-history-list">
<n-tag
v-for="(item, index) in searchHistory"
:key="index"
:class="setAnimationClass('animate__bounceIn')"
:style="setAnimationDelay(index, 50)"
class="search-history-item"
round
closable
@click="handleSearchHistory(item)"
@close="handleCloseSearchHistory(item)"
>
{{ item }}
</n-tag>
</div>
</div>
</template>
</div>
</n-layout>
@@ -82,6 +125,51 @@ const store = useStore();
const searchDetail = ref<any>();
const searchType = computed(() => store.state.searchType as number);
const searchDetailLoading = ref(false);
const searchHistory = ref<string[]>([]);
// 添加分页相关的状态
const ITEMS_PER_PAGE = 30; // 每页数量
const page = ref(0);
const hasMore = ref(true);
const isLoadingMore = ref(false);
const currentKeyword = ref('');
// 从 localStorage 加载搜索历史
const loadSearchHistory = () => {
const history = localStorage.getItem('searchHistory');
searchHistory.value = history ? JSON.parse(history) : [];
};
// 保存搜索历史
const saveSearchHistory = (keyword: string) => {
if (!keyword) return;
const history = searchHistory.value;
// 移除重复的关键词
const index = history.indexOf(keyword);
if (index > -1) {
history.splice(index, 1);
}
// 添加到开头
history.unshift(keyword);
// 只保留最近的20条记录
if (history.length > 20) {
history.pop();
}
searchHistory.value = history;
localStorage.setItem('searchHistory', JSON.stringify(history));
};
// 清空搜索历史
const clearSearchHistory = () => {
searchHistory.value = [];
localStorage.removeItem('searchHistory');
};
// 删除搜索历史
const handleCloseSearchHistory = (keyword: string) => {
searchHistory.value = searchHistory.value.filter((item) => item !== keyword);
localStorage.setItem('searchHistory', JSON.stringify(searchHistory.value));
};
// 热搜列表
const hotSearchData = ref<IHotSearch>();
@@ -92,6 +180,7 @@ const loadHotSearch = async () => {
onMounted(() => {
loadHotSearch();
loadSearchHistory();
loadSearch(route.query.keyword);
});
@@ -114,48 +203,103 @@ watch(
);
const dateFormat = (time: any) => useDateFormat(time, 'YYYY.MM.DD').value;
const loadSearch = async (keywords: any, type: any = null) => {
hotKeyword.value = keywords;
searchDetail.value = undefined;
const loadSearch = async (keywords: any, type: any = null, isLoadMore = false) => {
if (!keywords) return;
searchDetailLoading.value = true;
const { data } = await getSearch({ keywords, type: type || searchType.value });
if (!isLoadMore) {
hotKeyword.value = keywords;
searchDetail.value = undefined;
page.value = 0;
hasMore.value = true;
currentKeyword.value = keywords;
} else if (isLoadingMore.value || !hasMore.value) {
return;
}
const songs = data.result.songs || [];
const albums = data.result.albums || [];
const mvs = (data.result.mvs || []).map((item: any) => ({
...item,
picUrl: item.cover,
playCount: item.playCount,
desc: item.artists.map((artist: any) => artist.name).join('/'),
type: 'mv'
}));
// 保存搜索历史
if (!isLoadMore) {
saveSearchHistory(keywords);
}
const playlists = (data.result.playlists || []).map((item: any) => ({
...item,
picUrl: item.coverImgUrl,
playCount: item.playCount,
desc: item.creator.nickname,
type: 'playlist'
}));
if (isLoadMore) {
isLoadingMore.value = true;
} else {
searchDetailLoading.value = true;
}
// songs map 替换属性
songs.forEach((item: any) => {
item.picUrl = item.al.picUrl;
item.artists = item.ar;
});
albums.forEach((item: any) => {
item.desc = `${item.artist.name} ${item.company} ${dateFormat(item.publishTime)}`;
});
searchDetail.value = {
songs,
albums,
mvs,
playlists
};
try {
const { data } = await getSearch({
keywords: currentKeyword.value,
type: type || searchType.value,
limit: ITEMS_PER_PAGE,
offset: page.value * ITEMS_PER_PAGE
});
searchDetailLoading.value = false;
const songs = data.result.songs || [];
const albums = data.result.albums || [];
const mvs = (data.result.mvs || []).map((item: any) => ({
...item,
picUrl: item.cover,
playCount: item.playCount,
desc: item.artists.map((artist: any) => artist.name).join('/'),
type: 'mv'
}));
const playlists = (data.result.playlists || []).map((item: any) => ({
...item,
picUrl: item.coverImgUrl,
playCount: item.playCount,
desc: item.creator.nickname,
type: 'playlist'
}));
// songs map 替换属性
songs.forEach((item: any) => {
item.picUrl = item.al.picUrl;
item.artists = item.ar;
});
albums.forEach((item: any) => {
item.desc = `${item.artist.name} ${item.company} ${dateFormat(item.publishTime)}`;
});
if (isLoadMore && searchDetail.value) {
// 合并数据
searchDetail.value.songs = [...searchDetail.value.songs, ...songs];
searchDetail.value.albums = [...searchDetail.value.albums, ...albums];
searchDetail.value.mvs = [...searchDetail.value.mvs, ...mvs];
searchDetail.value.playlists = [...searchDetail.value.playlists, ...playlists];
} else {
searchDetail.value = {
songs,
albums,
mvs,
playlists
};
}
// 判断是否还有更多数据
hasMore.value =
songs.length === ITEMS_PER_PAGE ||
albums.length === ITEMS_PER_PAGE ||
mvs.length === ITEMS_PER_PAGE ||
playlists.length === ITEMS_PER_PAGE;
page.value++;
} catch (error) {
console.error('搜索失败:', error);
} finally {
searchDetailLoading.value = false;
isLoadingMore.value = false;
}
};
// 添加滚动处理函数
const handleScroll = (e: any) => {
const { scrollTop, scrollHeight, clientHeight } = e.target;
// 距离底部100px时加载更多
if (scrollTop + clientHeight >= scrollHeight - 100 && !isLoadingMore.value && hasMore.value) {
loadSearch(currentKeyword.value, null, true);
}
};
watch(
@@ -171,6 +315,11 @@ const handlePlay = () => {
const tracks = searchDetail.value?.songs || [];
store.commit('setPlayList', tracks);
};
// 点击搜索历史
const handleSearchHistory = (keyword: string) => {
loadSearch(keyword, 1);
};
</script>
<style lang="scss" scoped>
@@ -214,6 +363,7 @@ const handlePlay = () => {
@apply flex-1 rounded-xl;
@apply bg-light-100 dark:bg-dark-100;
height: 100%;
animation-duration: 0.2s;
&-box {
@apply pb-28;
@@ -225,9 +375,35 @@ const handlePlay = () => {
@apply text-gray-900 dark:text-white;
}
.search-history {
&-header {
@apply flex justify-between items-center mb-4;
@apply text-gray-900 dark:text-white;
}
&-list {
@apply flex flex-wrap gap-2 px-4;
}
&-item {
@apply cursor-pointer;
animation-duration: 0.2s;
}
}
.mobile {
.hot-search {
@apply mr-0 w-full;
}
}
.loading-more {
@apply flex justify-center items-center py-4;
@apply text-gray-500 dark:text-gray-400;
}
.no-more {
@apply text-center py-4;
@apply text-gray-500 dark:text-gray-400;
}
</style>

View File

@@ -32,7 +32,15 @@
<div class="set-item">
<div>
<div class="set-item-title">动画速度</div>
<div class="set-item-content">调节动画播放速度</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>
@@ -552,7 +560,8 @@ const clearCacheOptions = ref([
{ label: '用户数据', key: 'user', description: '清除登录信息和用户相关数据' },
{ label: '应用设置', key: 'settings', description: '清除应用的所有自定义设置' },
{ label: '下载记录', key: 'downloads', description: '清除下载历史记录(不会删除已下载的文件)' },
{ label: '音乐资源', key: 'resources', description: '清除已加载的音乐文件、歌词等资源缓存' }
{ label: '音乐资源', key: 'resources', description: '清除已加载的音乐文件、歌词等资源缓存' },
{ label: '歌词资源', key: 'lyrics', description: '清除已加载的歌词资源缓存' }
]);
const selectedCacheTypes = ref<string[]>([]);
@@ -609,6 +618,9 @@ const clearCache = async () => {
}
}
break;
case 'lyrics':
window.api.invoke('clear-lyrics-cache');
break;
default:
break;
}