diff --git a/MusicPlayer/MP/Common/Tool(工具封装)/MP_PlayerManager.swift b/MusicPlayer/MP/Common/Tool(工具封装)/MP_PlayerManager.swift index 49764d7..934580d 100644 --- a/MusicPlayer/MP/Common/Tool(工具封装)/MP_PlayerManager.swift +++ b/MusicPlayer/MP/Common/Tool(工具封装)/MP_PlayerManager.swift @@ -160,8 +160,6 @@ class MP_PlayerManager:NSObject{ loadPlayer.currentVideo?.resourcePlayerItem?.addObserver(self, forKeyPath: "status", options: [.old,.new], context: nil) //当前缓冲值 loadPlayer.currentVideo?.resourcePlayerItem.addObserver(self, forKeyPath: "loadedTimeRanges", options: [.old,.new], context: nil) - //对其他PlayerItem进行预加载 - } //实现KVO监听 override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { diff --git a/MusicPlayer/MP/MPPositive/Models/ViewModels/ListViewModels/MPPositive_SongViewModel.swift b/MusicPlayer/MP/MPPositive/Models/ViewModels/ListViewModels/MPPositive_SongViewModel.swift index 6c1a3f9..978b2d9 100644 --- a/MusicPlayer/MP/MPPositive/Models/ViewModels/ListViewModels/MPPositive_SongViewModel.swift +++ b/MusicPlayer/MP/MPPositive/Models/ViewModels/ListViewModels/MPPositive_SongViewModel.swift @@ -74,17 +74,21 @@ class MPPositive_SongViewModel: NSObject { if song.relatedID != nil { relatedId = song.relatedID } - //检索是否收藏 - isCollection = MPPositive_CollectionSongModel.fetch(.init(format: "videoId == %@", song.videoId)).count != 0 - - //检索是否下载 - isDlownd = MPPositive_DownloadItemModel.fetch(.init(format: "videoId == %@", song.videoId)).count != 0 - + reloadCollectionAndDownLoad() //执行预加载 if isPloading == false { preloadAsset(resourceAsset) } } + //页面状态更新 + func reloadCollectionAndDownLoad() { + //检索是否收藏 + isCollection = MPPositive_CollectionSongModel.fetch(.init(format: "videoId == %@", song.videoId)).count != 0 + + //检索是否下载 + isDlownd = MPPositive_DownloadItemModel.fetch(.init(format: "videoId == %@", song.videoId)).count != 0 + } + //执行预加载 func preloadAsset(_ asset:AVURLAsset) { //执行预加载 diff --git a/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift b/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift index 4543ef0..fa0d870 100644 --- a/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift +++ b/MusicPlayer/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift @@ -157,6 +157,7 @@ class MPPositive_PlayerCoverView: UIView { MPPositive_CollectionSongModel.delete(i) } } + MP_PlayerManager.shared.loadPlayer.currentVideo.reloadCollectionAndDownLoad() } }else{ self.collectionSongBtn.isSelected = true @@ -167,6 +168,7 @@ class MPPositive_PlayerCoverView: UIView { item.subtitle = MP_PlayerManager.shared.loadPlayer.currentVideo.subtitle item.coverImage = MP_PlayerManager.shared.loadPlayer.currentVideo.coverUrl MPPositive_CollectionSongModel.save() + MP_PlayerManager.shared.loadPlayer.currentVideo.reloadCollectionAndDownLoad() } } } @@ -204,7 +206,8 @@ class MPPositive_PlayerCoverView: UIView { MPPositive_DownloadItemModel.save() DispatchQueue.main.async { - self?.loadBtn.setBackgroundImage(UIImage(named: "Song_Loaded'logo"), for: .normal) + MP_PlayerManager.shared.loadPlayer.currentVideo.reloadCollectionAndDownLoad() + self?.loadBtn.setBackgroundImage(UIImage(named: "Song_Loaded'logo"), for: .normal) self?.loadBtn.setImage(UIImage(named: ""), for: .normal) } @@ -216,10 +219,7 @@ class MPPositive_PlayerCoverView: UIView { self?.loadBtn.setBackgroundImage(UIImage(named: "Song_Unload'logo"), for: .normal) self?.loadBtn.setImage(UIImage(named: ""), for: .normal) } - SVProgressHUD.showInfo(withStatus: "下载超时请重新下载") - DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) { - SVProgressHUD.dismiss() - } + MP_HUD.text("下载超时请重新下载", delay: 1.5, completion: nil) } }) }