From 2e06711600132ad18a067a7f80bd1f345b261b05 Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Wed, 22 Jan 2025 22:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=B7=BB=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=92=AD=E6=94=BE=20=E5=92=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=AD=A3=E5=9C=A8=E6=92=AD=E6=94=BE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/set.json                          |   4 +-
 src/renderer/App.vue                       |   3 +-
 src/renderer/layout/components/PlayBar.vue |  29 +++-
 src/renderer/services/audioService.ts      | 147 ++++++++++++---------
 src/renderer/store/index.ts                | 108 ++++++++++++++-
 src/renderer/views/set/index.vue           |  11 ++
 6 files changed, 224 insertions(+), 78 deletions(-)

diff --git a/src/main/set.json b/src/main/set.json
index 01421db..05dbb39 100644
--- a/src/main/set.json
+++ b/src/main/set.json
@@ -16,5 +16,7 @@
   "closeAction": "ask",
   "musicQuality": "higher",
   "fontFamily": "system-ui",
-  "fontScope": "global"
+  "fontScope": "global",
+  "autoPlay": false,
+  "downloadPath": ""
 }
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index ff2c21f..c13b349 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -63,6 +63,7 @@ onMounted(() => {
   store.dispatch('initializeSettings');
   store.dispatch('initializeTheme');
   store.dispatch('initializeSystemFonts');
+  store.dispatch('initializePlayState');
   if (isMobile.value) {
     store.commit(
       'setMenus',
@@ -72,7 +73,7 @@ onMounted(() => {
 });
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .app-container {
   @apply h-full w-full;
   user-select: none;
diff --git a/src/renderer/layout/components/PlayBar.vue b/src/renderer/layout/components/PlayBar.vue
index 7b49a60..ad629f4 100644
--- a/src/renderer/layout/components/PlayBar.vue
+++ b/src/renderer/layout/components/PlayBar.vue
@@ -288,18 +288,33 @@ const MusicFullRef = ref<any>(null);
 // 播放暂停按钮事件
 const playMusicEvent = async () => {
   try {
+    // 检查是否有有效的音乐对象和 URL
+    if (!playMusic.value?.id || !store.state.playMusicUrl) {
+      console.warn('No valid music or URL available');
+      store.commit('setPlay', playMusic.value);
+      return;
+    }
+
     if (play.value) {
-      audioService.pause();
-      store.commit('setPlayMusic', false);
+      // 暂停播放
+      if (audioService.getCurrentSound()) {
+        audioService.pause();
+        store.commit('setPlayMusic', false);
+      }
     } else {
-      audioService.play();
+      // 开始播放
+      if (audioService.getCurrentSound()) {
+        // 如果已经有音频实例，直接播放
+        audioService.play();
+      } else {
+        // 如果没有音频实例，重新创建并播放
+        await audioService.play(store.state.playMusicUrl, playMusic.value);
+      }
       store.commit('setPlayMusic', true);
     }
   } catch (error) {
-    console.log('error', error);
-    if (play.value) {
-      store.commit('nextPlay');
-    }
+    console.error('播放出错:', error);
+    store.commit('nextPlay');
   }
 };
 
diff --git a/src/renderer/services/audioService.ts b/src/renderer/services/audioService.ts
index 432332b..130618c 100644
--- a/src/renderer/services/audioService.ts
+++ b/src/renderer/services/audioService.ts
@@ -122,78 +122,94 @@ class AudioService {
 
   // 播放控制相关
   play(url?: string, track?: SongResult): Promise<Howl> {
+    // 如果没有提供新的 URL 和 track，且当前有音频实例，则继续播放
     if (this.currentSound && !url && !track) {
       this.currentSound.play();
-      return Promise.resolve(this.currentSound as Howl);
+      return Promise.resolve(this.currentSound);
     }
+
+    // 如果没有提供必要的参数，返回错误
+    if (!url || !track) {
+      return Promise.reject(new Error('Missing required parameters: url and track'));
+    }
+
     return new Promise((resolve, reject) => {
       let retryCount = 0;
       const maxRetries = 1;
 
       const tryPlay = () => {
+        // 清理现有的音频实例
         if (this.currentSound) {
           this.currentSound.unload();
+          this.currentSound = null;
         }
-        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('音频播放失败，请尝试切换其他歌曲'));
+        try {
+          this.currentTrack = track;
+          this.currentSound = new Howl({
+            src: [url],
+            html5: true,
+            autoplay: true,
+            volume: localStorage.getItem('volume')
+              ? parseFloat(localStorage.getItem('volume') as string)
+              : 1,
+            format: ['mp3', 'aac'],
+            onloaderror: (id, error) => {
+              console.error('Audio load error:', error);
+              if (retryCount < maxRetries) {
+                retryCount++;
+                console.log(`Retrying playback (${retryCount}/${maxRetries})...`);
+                setTimeout(tryPlay, 1000 * retryCount);
+              } else {
+                reject(new Error('音频加载失败，请尝试切换其他歌曲'));
+              }
+            },
+            onplayerror: (id, error) => {
+              console.error('Audio play error:', error);
+              if (retryCount < maxRetries) {
+                retryCount++;
+                console.log(`Retrying playback (${retryCount}/${maxRetries})...`);
+                setTimeout(tryPlay, 1000 * retryCount);
+              } else {
+                reject(new Error('音频播放失败，请尝试切换其他歌曲'));
+              }
+            },
+            onload: () => {
+              // 音频加载成功后更新媒体会话
+              if (track && this.currentSound) {
+                this.updateMediaSessionMetadata(track);
+                this.updateMediaSessionPositionState();
+                this.emit('load');
+                resolve(this.currentSound);
+              }
             }
+          });
+
+          // 设置音频事件监听
+          if (this.currentSound) {
+            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.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);
-        });
+        } catch (error) {
+          console.error('Error creating audio instance:', error);
+          reject(error);
+        }
       };
 
       tryPlay();
@@ -210,8 +226,12 @@ class AudioService {
 
   stop() {
     if (this.currentSound) {
-      this.currentSound.stop();
-      this.currentSound.unload();
+      try {
+        this.currentSound.stop();
+        this.currentSound.unload();
+      } catch (error) {
+        console.error('Error stopping audio:', error);
+      }
       this.currentSound = null;
     }
     this.currentTrack = null;
@@ -236,10 +256,13 @@ class AudioService {
 
   pause() {
     if (this.currentSound) {
-      this.currentSound.pause();
+      try {
+        this.currentSound.pause();
+      } catch (error) {
+        console.error('Error pausing audio:', error);
+      }
     }
   }
-  
 
   clearAllListeners() {
     this.callbacks = {};
diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts
index dab1056..ed951eb 100644
--- a/src/renderer/store/index.ts
+++ b/src/renderer/store/index.ts
@@ -4,6 +4,7 @@ import setData from '@/../main/set.json';
 import { getLikedList, likeSong } from '@/api/music';
 import { useMusicListHook } from '@/hooks/MusicListHook';
 import homeRouter from '@/router/home';
+import { audioService } from '@/services/audioService';
 import type { SongResult } from '@/type/music';
 import { isElectron } from '@/utils';
 import { applyTheme, getCurrentTheme, ThemeType } from '@/utils/theme';
@@ -11,9 +12,63 @@ import { applyTheme, getCurrentTheme, ThemeType } from '@/utils/theme';
 // 默认设置
 const defaultSettings = setData;
 
+function isValidUrl(urlString: string): boolean {
+  try {
+    return Boolean(new URL(urlString));
+  } catch (e) {
+    return false;
+  }
+}
+
 function getLocalStorageItem<T>(key: string, defaultValue: T): T {
-  const item = localStorage.getItem(key);
-  return item ? JSON.parse(item) : defaultValue;
+  try {
+    const item = localStorage.getItem(key);
+    if (!item) return defaultValue;
+
+    // 尝试解析 JSON
+    const parsedItem = JSON.parse(item);
+
+    // 对于音乐 URL，检查是否是有效的 URL 格式或本地文件路径
+    if (key === 'currentPlayMusicUrl' && typeof parsedItem === 'string') {
+      if (!parsedItem.startsWith('local://') && !isValidUrl(parsedItem)) {
+        console.warn(`Invalid URL in localStorage for key ${key}, using default value`);
+        localStorage.removeItem(key);
+        return defaultValue;
+      }
+    }
+
+    // 对于播放列表，检查是否是数组且每个项都有必要的字段
+    if (key === 'playList') {
+      if (!Array.isArray(parsedItem)) {
+        console.warn(`Invalid playList format in localStorage, using default value`);
+        localStorage.removeItem(key);
+        return defaultValue;
+      }
+      // 检查每个歌曲对象是否有必要的字段
+      const isValid = parsedItem.every((item) => item && typeof item === 'object' && 'id' in item);
+      if (!isValid) {
+        console.warn(`Invalid song objects in playList, using default value`);
+        localStorage.removeItem(key);
+        return defaultValue;
+      }
+    }
+
+    // 对于当前播放音乐，检查是否是对象且包含必要的字段
+    if (key === 'currentPlayMusic') {
+      if (!parsedItem || typeof parsedItem !== 'object' || !('id' in parsedItem)) {
+        console.warn(`Invalid currentPlayMusic format in localStorage, using default value`);
+        localStorage.removeItem(key);
+        return defaultValue;
+      }
+    }
+
+    return parsedItem;
+  } catch (error) {
+    console.warn(`Error parsing localStorage item for key ${key}:`, error);
+    // 如果解析失败，删除可能损坏的数据
+    localStorage.removeItem(key);
+    return defaultValue;
+  }
 }
 
 export interface State {
@@ -44,11 +99,11 @@ const state: State = {
   menus: homeRouter,
   play: false,
   isPlay: false,
-  playMusic: {} as SongResult,
-  playMusicUrl: '',
+  playMusic: getLocalStorageItem('currentPlayMusic', {} as SongResult),
+  playMusicUrl: getLocalStorageItem('currentPlayMusicUrl', ''),
   user: getLocalStorageItem('user', null),
-  playList: [],
-  playListIndex: 0,
+  playList: getLocalStorageItem('playList', []),
+  playListIndex: getLocalStorageItem('playListIndex', 0),
   setData: defaultSettings,
   lyric: {},
   isMobile: false,
@@ -72,12 +127,16 @@ const mutations = {
   },
   async setPlay(state: State, playMusic: SongResult) {
     await handlePlayMusic(state, playMusic);
+    localStorage.setItem('currentPlayMusic', JSON.stringify(state.playMusic));
+    localStorage.setItem('currentPlayMusicUrl', state.playMusicUrl);
   },
   setIsPlay(state: State, isPlay: boolean) {
     state.isPlay = isPlay;
+    localStorage.setItem('isPlaying', isPlay.toString());
   },
-  setPlayMusic(state: State, play: boolean) {
+  async setPlayMusic(state: State, play: boolean) {
     state.play = play;
+    localStorage.setItem('isPlaying', play.toString());
   },
   setMusicFull(state: State, musicFull: boolean) {
     state.musicFull = musicFull;
@@ -85,6 +144,8 @@ const mutations = {
   setPlayList(state: State, playList: SongResult[]) {
     state.playListIndex = playList.findIndex((item) => item.id === state.playMusic.id);
     state.playList = playList;
+    localStorage.setItem('playList', JSON.stringify(playList));
+    localStorage.setItem('playListIndex', state.playListIndex.toString());
   },
   async nextPlay(state: State) {
     await nextPlay(state);
@@ -238,6 +299,39 @@ const actions = {
     } catch (error) {
       console.error('获取系统字体失败:', error);
     }
+  },
+  async initializePlayState({ state, commit }: { state: State; commit: any }) {
+    const savedPlayList = getLocalStorageItem('playList', []);
+    const savedPlayMusic = getLocalStorageItem('currentPlayMusic', null);
+
+    if (savedPlayList.length > 0) {
+      commit('setPlayList', savedPlayList);
+    }
+
+    if (savedPlayMusic && Object.keys(savedPlayMusic).length > 0) {
+      // 不直接使用保存的 URL，而是重新获取
+      try {
+        // 使用 handlePlayMusic 来重新获取音乐 URL
+
+        // 根据自动播放设置决定是否恢复播放状态
+        const shouldAutoPlay = state.setData.autoPlay;
+        if (shouldAutoPlay) {
+          await handlePlayMusic(state, savedPlayMusic);
+        }
+        state.play = shouldAutoPlay;
+        state.isPlay = true;
+      } catch (error) {
+        console.error('重新获取音乐链接失败:', error);
+        // 清除无效的播放状态
+        state.play = false;
+        state.isPlay = false;
+        state.playMusic = {} as SongResult;
+        state.playMusicUrl = '';
+        localStorage.removeItem('currentPlayMusic');
+        localStorage.removeItem('currentPlayMusicUrl');
+        localStorage.removeItem('isPlaying');
+      }
+    }
   }
 };
 
diff --git a/src/renderer/views/set/index.vue b/src/renderer/views/set/index.vue
index 0478b62..77994f9 100644
--- a/src/renderer/views/set/index.vue
+++ b/src/renderer/views/set/index.vue
@@ -136,6 +136,17 @@
                 style="width: 160px"
               />
             </div>
+
+            <div class="set-item">
+              <div>
+                <div class="set-item-title">自动播放</div>
+                <div class="set-item-content">重新打开应用时是否自动继续播放</div>
+              </div>
+              <n-switch v-model:value="setData.autoPlay">
+                <template #checked>开启</template>
+                <template #unchecked>关闭</template>
+              </n-switch>
+            </div>
           </div>
         </div>