3-group-ios/Music_Player3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.8 封挡版

Browse Source
This commit is contained in:
Mr.zhou 2024-08-19 14:40:41 +08:00
parent b262a3cfd9
commit 96c404f9d7
10 changed files with 88 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
relax.offline.mp3.music.xcodeproj/project.pbxproj
View File

@ -1879,7 +1879,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1.1.7.1; CURRENT_PROJECT_VERSION = 1.1.8.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RAQJ4FNZUH; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RAQJ4FNZUH;
@ -1900,7 +1900,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.7; MARKETING_VERSION = 1.1.8;
PRODUCT_BUNDLE_IDENTIFIER = relax.offline.mp3.music; PRODUCT_BUNDLE_IDENTIFIER = relax.offline.mp3.music;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -1925,7 +1925,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1.1.7.1; CURRENT_PROJECT_VERSION = 1.1.8.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RAQJ4FNZUH; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RAQJ4FNZUH;
@ -1946,7 +1946,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.7; MARKETING_VERSION = 1.1.8;
PRODUCT_BUNDLE_IDENTIFIER = relax.offline.mp3.music; PRODUCT_BUNDLE_IDENTIFIER = relax.offline.mp3.music;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

BIN
relax.offline.mp3.music.xcworkspace/xcuserdata/zhou.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

7
relax.offline.mp3.music/MP/MPPositive/Views/Base/MPPositive_MoreOperationDownLoadTableViewCell.swift
View File

@ -48,13 +48,16 @@ class MPPositive_MoreOperationDownLoadTableViewCell: UITableViewCell {
MP_DownloadManager.shared.loadQueue.async { MP_DownloadManager.shared.loadQueue.async {
[weak self] in [weak self] in
guard let self = self else {return} guard let self = self else {return}
MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) { statu in MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) {[weak self] statu in
guard let self = self else {return}
if statu == false { if statu == false {
//未下载,判断是否加入了下载队列 //未下载,判断是否加入了下载队列
if MP_DownloadManager.shared.isTasksQueue(for: videoId) { if MP_DownloadManager.shared.isTasksQueue(for: videoId) {
//加入下载队列，确定是否活跃下载队列中 //加入下载队列，确定是否活跃下载队列中
if MP_DownloadManager.shared.isActiveTask(for: videoId) { if MP_DownloadManager.shared.isActiveTask(for: videoId) {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.state = .downloading self.loadBtn.state = .downloading
self.titleLabel.text = "Downloading" self.titleLabel.text = "Downloading"
} }
@ -62,6 +65,8 @@ class MPPositive_MoreOperationDownLoadTableViewCell: UITableViewCell {
if let progress = MP_DownloadManager.shared.getProgress(for: videoId) { if let progress = MP_DownloadManager.shared.getProgress(for: videoId) {
//下载中 //下载中
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.stopDownloadButton.progress = progress self.loadBtn.stopDownloadButton.progress = progress
} }
} }

15
relax.offline.mp3.music/MP/MPPositive/Views/Home/MPPositive_ArtistShowSongTableViewCell.swift
View File

@ -154,6 +154,8 @@ class MPPositive_ArtistShowSongTableViewCell: UITableViewCell, PKDownloadButtonD
func setProgress(_ videoId:String) { func setProgress(_ videoId:String) {
guard videoId.isEmpty == false, videoId == itemView.browseItem.videoId else { guard videoId.isEmpty == false, videoId == itemView.browseItem.videoId else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .startDownload self.loadBtn.state = .startDownload
} }
@ -163,25 +165,32 @@ class MPPositive_ArtistShowSongTableViewCell: UITableViewCell, PKDownloadButtonD
[weak self] in [weak self] in
guard let self = self else {return} guard let self = self else {return}
//判断是否下载完成 //判断是否下载完成
MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) {statu in MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) {[weak self] statu in
guard let self = self else {return}
if statu == false { if statu == false {
//未下载,判断是否加入了下载队列 //未下载,判断是否加入了下载队列
if MP_DownloadManager.shared.isTasksQueue(for: videoId) { if MP_DownloadManager.shared.isTasksQueue(for: videoId) {
//加入下载队列，确定是否活跃下中 //加入下载队列，确定是否活跃下中
if MP_DownloadManager.shared.isActiveTask(for: videoId) { if MP_DownloadManager.shared.isActiveTask(for: videoId) {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.state = .downloading self.loadBtn.state = .downloading
} }
//活跃中，获取下载值 //活跃中，获取下载值
if let progress = MP_DownloadManager.shared.getProgress(for: videoId) { if let progress = MP_DownloadManager.shared.getProgress(for: videoId) {
//下载中 //下载中
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.stopDownloadButton.progress = progress self.loadBtn.stopDownloadButton.progress = progress
} }
} }
}else { }else {
//处于队列中，还未开始下载 //处于队列中，还未开始下载
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .pending self.loadBtn.state = .pending
} }
@ -189,12 +198,16 @@ class MPPositive_ArtistShowSongTableViewCell: UITableViewCell, PKDownloadButtonD
}else { }else {
//未加入下载队列 //未加入下载队列
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .startDownload self.loadBtn.state = .startDownload
} }
} }
}else { }else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//已经完成下载 //已经完成下载
self.loadBtn.state = .downloaded self.loadBtn.state = .downloaded
} }

4
relax.offline.mp3.music/MP/MPPositive/Views/Home/MPPositive_ArtistShowTypeView.swift
View File

@ -85,7 +85,11 @@ class MPPositive_ArtistShowTypeView: UIView, JXPagingViewListViewDelegate, UIVie
//上拉刷新 //上拉刷新
@objc private func footerRefresh() { @objc private func footerRefresh() {
guard sectionList.continuation != nil, sectionList.itct != nil else { guard sectionList.continuation != nil, sectionList.itct != nil else {
DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
tableView.mj_footer?.endRefreshingWithNoMoreData() tableView.mj_footer?.endRefreshingWithNoMoreData()
}
return return
} }
sectionList.requestArtistContinuation() sectionList.requestArtistContinuation()

15
relax.offline.mp3.music/MP/MPPositive/Views/Home/MPPositive_HomeSingleCollectionViewCell.swift
View File

@ -157,6 +157,8 @@ class MPPositive_HomeSingleCollectionViewCell: UICollectionViewCell, PKDownloadB
func setProgress(_ videoId:String) { func setProgress(_ videoId:String) {
guard videoId.isEmpty == false, videoId == itemViewModel?.browseItem.videoId else { guard videoId.isEmpty == false, videoId == itemViewModel?.browseItem.videoId else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.dowloadBtn.state = .startDownload self.dowloadBtn.state = .startDownload
} }
@ -166,25 +168,32 @@ class MPPositive_HomeSingleCollectionViewCell: UICollectionViewCell, PKDownloadB
[weak self] in [weak self] in
guard let self = self else {return} guard let self = self else {return}
//判断是否下载完成 //判断是否下载完成
MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) { statu in MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) {[weak self] statu in
guard let self = self else {return}
if statu == false { if statu == false {
//未下载,判断是否加入了下载队列 //未下载,判断是否加入了下载队列
if MP_DownloadManager.shared.isTasksQueue(for: videoId) { if MP_DownloadManager.shared.isTasksQueue(for: videoId) {
//加入下载队列，确定是否活跃下中 //加入下载队列，确定是否活跃下中
if MP_DownloadManager.shared.isActiveTask(for: videoId) { if MP_DownloadManager.shared.isActiveTask(for: videoId) {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.dowloadBtn.state = .downloading self.dowloadBtn.state = .downloading
} }
//活跃中，获取下载值 //活跃中，获取下载值
if let progress = MP_DownloadManager.shared.getProgress(for: videoId) { if let progress = MP_DownloadManager.shared.getProgress(for: videoId) {
//下载中 //下载中
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.dowloadBtn.stopDownloadButton.progress = progress self.dowloadBtn.stopDownloadButton.progress = progress
} }
} }
}else { }else {
//处于队列中，还未开始下载 //处于队列中，还未开始下载
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.dowloadBtn.state = .pending self.dowloadBtn.state = .pending
} }
@ -192,12 +201,16 @@ class MPPositive_HomeSingleCollectionViewCell: UICollectionViewCell, PKDownloadB
}else { }else {
//未加入下载队列 //未加入下载队列
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.dowloadBtn.state = .startDownload self.dowloadBtn.state = .startDownload
} }
} }
}else { }else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//已经完成下载 //已经完成下载
self.dowloadBtn.state = .downloaded self.dowloadBtn.state = .downloaded
} }

15
relax.offline.mp3.music/MP/MPPositive/Views/Home/MPPositive_MusicItemShowTableViewCell.swift
View File

@ -89,6 +89,8 @@ class MPPositive_MusicItemShowTableViewCell: UITableViewCell, PKDownloadButtonDe
func setProgress(_ videoId:String) { func setProgress(_ videoId:String) {
guard videoId.isEmpty == false, videoId == itemView?.browseItem.videoId else { guard videoId.isEmpty == false, videoId == itemView?.browseItem.videoId else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .startDownload self.loadBtn.state = .startDownload
} }
@ -98,25 +100,32 @@ class MPPositive_MusicItemShowTableViewCell: UITableViewCell, PKDownloadButtonDe
[weak self] in [weak self] in
guard let self = self else {return} guard let self = self else {return}
//判断是否下载完成 //判断是否下载完成
MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) { statu in MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) {[weak self] statu in
guard let self = self else {return}
if statu == false { if statu == false {
//未下载,判断是否加入了下载队列 //未下载,判断是否加入了下载队列
if MP_DownloadManager.shared.isTasksQueue(for: videoId) { if MP_DownloadManager.shared.isTasksQueue(for: videoId) {
//加入下载队列，确定是否活跃下中 //加入下载队列，确定是否活跃下中
if MP_DownloadManager.shared.isActiveTask(for: videoId) { if MP_DownloadManager.shared.isActiveTask(for: videoId) {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.state = .downloading self.loadBtn.state = .downloading
} }
//活跃中，获取下载值 //活跃中，获取下载值
if let progress = MP_DownloadManager.shared.getProgress(for: videoId) { if let progress = MP_DownloadManager.shared.getProgress(for: videoId) {
//下载中 //下载中
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.stopDownloadButton.progress = progress self.loadBtn.stopDownloadButton.progress = progress
} }
} }
}else { }else {
//处于队列中，还未开始下载 //处于队列中，还未开始下载
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .pending self.loadBtn.state = .pending
} }
@ -124,12 +133,16 @@ class MPPositive_MusicItemShowTableViewCell: UITableViewCell, PKDownloadButtonDe
}else { }else {
//未加入下载队列 //未加入下载队列
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .startDownload self.loadBtn.state = .startDownload
} }
} }
}else { }else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//已经完成下载 //已经完成下载
self.loadBtn.state = .downloaded self.loadBtn.state = .downloaded
} }

13
relax.offline.mp3.music/MP/MPPositive/Views/Player/MPPositive_PlayerCoverView.swift
View File

@ -185,25 +185,32 @@ class MPPositive_PlayerCoverView: UIView, PKDownloadButtonDelegate {
MP_DownloadManager.shared.loadQueue.async { MP_DownloadManager.shared.loadQueue.async {
[weak self] in [weak self] in
guard let self = self else {return} guard let self = self else {return}
MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) { statu in MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) {[weak self] statu in
guard let self = self else {return}
if statu == false { if statu == false {
//未下载,判断是否加入了下载队列 //未下载,判断是否加入了下载队列
if MP_DownloadManager.shared.isTasksQueue(for: videoId) { if MP_DownloadManager.shared.isTasksQueue(for: videoId) {
//加入下载队列，确定是否活跃下载队列中 //加入下载队列，确定是否活跃下载队列中
if MP_DownloadManager.shared.isActiveTask(for: videoId) { if MP_DownloadManager.shared.isActiveTask(for: videoId) {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.downloadButton.state = .downloading self.downloadButton.state = .downloading
} }
//活跃中，获取下载值 //活跃中，获取下载值
if let progress = MP_DownloadManager.shared.getProgress(for: videoId) { if let progress = MP_DownloadManager.shared.getProgress(for: videoId) {
//下载中 //下载中
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.downloadButton.stopDownloadButton.progress = progress self.downloadButton.stopDownloadButton.progress = progress
} }
} }
}else { }else {
//处于队列中，还未开始下载 //处于队列中，还未开始下载
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.downloadButton.state = .pending self.downloadButton.state = .pending
} }
@ -211,6 +218,8 @@ class MPPositive_PlayerCoverView: UIView, PKDownloadButtonDelegate {
}else { }else {
//未加入下载队列 //未加入下载队列
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.downloadButton.state = .startDownload self.downloadButton.state = .startDownload
} }
@ -218,6 +227,8 @@ class MPPositive_PlayerCoverView: UIView, PKDownloadButtonDelegate {
}else { }else {
//已经完成下载 //已经完成下载
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//已经完成下载 //已经完成下载
self.downloadButton.state = .downloaded self.downloadButton.state = .downloaded
} }

15
relax.offline.mp3.music/MP/MPPositive/Views/Search/MPPositive_SearchResultShowTableViewCell.swift
View File

@ -140,6 +140,8 @@ class MPPositive_SearchResultShowTableViewCell: UITableViewCell, PKDownloadButto
func setProgress(_ videoId:String) { func setProgress(_ videoId:String) {
guard videoId.isEmpty == false, (videoId == itemView?.item?.videoId || videoId == songViewModel?.collectionSong.videoId || videoId == loadViewModel?.loadItem.videoId || videoId == videoModel?.videoId) else { guard videoId.isEmpty == false, (videoId == itemView?.item?.videoId || videoId == songViewModel?.collectionSong.videoId || videoId == loadViewModel?.loadItem.videoId || videoId == videoModel?.videoId) else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .startDownload self.loadBtn.state = .startDownload
} }
@ -149,37 +151,48 @@ class MPPositive_SearchResultShowTableViewCell: UITableViewCell, PKDownloadButto
[weak self] in [weak self] in
guard let self = self else {return} guard let self = self else {return}
//判断是否下载完成 //判断是否下载完成
MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) { statu in MP_DownloadManager.shared.isDownloadedFileDocuments(videoId) {[weak self] statu in
guard let self = self else {return}
if statu == false { if statu == false {
//未下载,判断是否加入了下载队列 //未下载,判断是否加入了下载队列
if MP_DownloadManager.shared.isTasksQueue(for: videoId) { if MP_DownloadManager.shared.isTasksQueue(for: videoId) {
//加入下载队列，确定是否活跃下中 //加入下载队列，确定是否活跃下中
if MP_DownloadManager.shared.isActiveTask(for: videoId) { if MP_DownloadManager.shared.isActiveTask(for: videoId) {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.state = .downloading self.loadBtn.state = .downloading
} }
//活跃中，获取下载值 //活跃中，获取下载值
if let progress = MP_DownloadManager.shared.getProgress(for: videoId) { if let progress = MP_DownloadManager.shared.getProgress(for: videoId) {
//下载中 //下载中
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
self.loadBtn.stopDownloadButton.progress = progress self.loadBtn.stopDownloadButton.progress = progress
} }
} }
}else { }else {
//处于队列中，还未开始下载 //处于队列中，还未开始下载
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .pending self.loadBtn.state = .pending
} }
} }
}else { }else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//未加入下载队列 //未加入下载队列
self.loadBtn.state = .startDownload self.loadBtn.state = .startDownload
} }
} }
}else { }else {
DispatchQueue.main.async { DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
//已经完成下载 //已经完成下载
self.loadBtn.state = .downloaded self.loadBtn.state = .downloaded
} }

4
relax.offline.mp3.music/MP/MPPositive/Views/Search/MPPositive_SearchResultTypeShowView.swift
View File

@ -95,7 +95,11 @@ class MPPositive_SearchResultTypeShowView: MPPositive_BaseShowView, JXSegmentedL
//上拉刷新 //上拉刷新
@objc private func footerRefresh() { @objc private func footerRefresh() {
guard sectionList.continuation != nil, sectionList.itct != nil else { guard sectionList.continuation != nil, sectionList.itct != nil else {
DispatchQueue.main.async {
[weak self] in
guard let self = self else {return}
tableView.mj_footer?.endRefreshingWithNoMoreData() tableView.mj_footer?.endRefreshingWithNoMoreData()
}
return return
} }
sectionList.requestSearchContinuation() sectionList.requestSearchContinuation()