|
@@ -467,11 +467,9 @@ export class DataPersistenceService implements IDataPersistenceService {
|
|
|
throw new Error('DataPersistenceService not initialized');
|
|
throw new Error('DataPersistenceService not initialized');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- console.log("Heanup2 DataPersistenceService: 开始加载播放列表");
|
|
|
|
|
|
|
|
|
|
// 优先从AppStorage获取
|
|
// 优先从AppStorage获取
|
|
|
let playlistData = AppStorage.get<PlaylistData>(DataPersistenceService.KEYS.PLAYLIST);
|
|
let playlistData = AppStorage.get<PlaylistData>(DataPersistenceService.KEYS.PLAYLIST);
|
|
|
- console.log(`Heanup2 DataPersistenceService: 从AppStorage获取到播放列表: ${playlistData ? 'exists' : 'null'}`);
|
|
|
|
|
|
|
|
|
|
if (!playlistData) {
|
|
if (!playlistData) {
|
|
|
// 检查context是否有效
|
|
// 检查context是否有效
|
|
@@ -535,15 +533,12 @@ export class DataPersistenceService implements IDataPersistenceService {
|
|
|
|
|
|
|
|
if (playlistData) {
|
|
if (playlistData) {
|
|
|
console.log(`Heanup2 DataPersistenceService: 最终加载成功,播放列表歌曲数量: ${playlistData.songs.length}`);
|
|
console.log(`Heanup2 DataPersistenceService: 最终加载成功,播放列表歌曲数量: ${playlistData.songs.length}`);
|
|
|
-
|
|
|
|
|
return playlistData;
|
|
return playlistData;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
console.log("Heanup2 DataPersistenceService: 没有找到播放列表数据");
|
|
console.log("Heanup2 DataPersistenceService: 没有找到播放列表数据");
|
|
|
return null;
|
|
return null;
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.log(`Heanup2 DataPersistenceService: 加载播放列表出错: ${error}`);
|
|
console.log(`Heanup2 DataPersistenceService: 加载播放列表出错: ${error}`);
|
|
|
-
|
|
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -572,7 +567,6 @@ export class DataPersistenceService implements IDataPersistenceService {
|
|
|
|
|
|
|
|
// 首先保存到AppStorage(确保内存中有数据)
|
|
// 首先保存到AppStorage(确保内存中有数据)
|
|
|
AppStorage.setOrCreate(DataPersistenceService.KEYS.PLAYER_STATE, stateData);
|
|
AppStorage.setOrCreate(DataPersistenceService.KEYS.PLAYER_STATE, stateData);
|
|
|
- console.log(`Heanup2 DataPersistenceService: 已保存播放状态到AppStorage - playing: ${state.isPlaying}, paused: ${state.isPaused}, index: ${state.currentIndex}`);
|
|
|
|
|
|
|
|
|
|
// 如果context有效,尝试保存到PreferencesUtil
|
|
// 如果context有效,尝试保存到PreferencesUtil
|
|
|
if (this.context) {
|
|
if (this.context) {
|
|
@@ -583,7 +577,6 @@ export class DataPersistenceService implements IDataPersistenceService {
|
|
|
while (retryCount < maxRetries) {
|
|
while (retryCount < maxRetries) {
|
|
|
try {
|
|
try {
|
|
|
PreferencesUtil.putSync(DataPersistenceService.KEYS.PLAYER_STATE, JSON.stringify(stateData));
|
|
PreferencesUtil.putSync(DataPersistenceService.KEYS.PLAYER_STATE, JSON.stringify(stateData));
|
|
|
- console.log(`Heanup2 DataPersistenceService: 已保存播放状态到PreferencesUtil (尝试 ${retryCount + 1}/${maxRetries})`);
|
|
|
|
|
break; // 成功,跳出循环
|
|
break; // 成功,跳出循环
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
lastError = error;
|
|
lastError = error;
|
|
@@ -631,7 +624,6 @@ export class DataPersistenceService implements IDataPersistenceService {
|
|
|
|
|
|
|
|
// 优先从AppStorage获取
|
|
// 优先从AppStorage获取
|
|
|
let stateData = AppStorage.get<PlayerStateData>(DataPersistenceService.KEYS.PLAYER_STATE);
|
|
let stateData = AppStorage.get<PlayerStateData>(DataPersistenceService.KEYS.PLAYER_STATE);
|
|
|
- console.log(`Heanup2 DataPersistenceService: 从AppStorage获取到播放状态: ${stateData ? 'exists' : 'null'}`);
|
|
|
|
|
|
|
|
|
|
if (!stateData) {
|
|
if (!stateData) {
|
|
|
// 检查context是否有效
|
|
// 检查context是否有效
|
|
@@ -694,8 +686,7 @@ export class DataPersistenceService implements IDataPersistenceService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (stateData) {
|
|
if (stateData) {
|
|
|
- console.log(`Heanup2 DataPersistenceService: 最终播放状态加载成功 - playing: ${stateData.isPlaying}, paused: ${stateData.isPaused}, index: ${stateData.currentIndex}`);
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
return stateData;
|
|
return stateData;
|
|
|
}
|
|
}
|
|
|
|
|
|