From 6381a24bf9da0cc206e3374132609ce21955c4d9 Mon Sep 17 00:00:00 2001 From: "Mr.zhou" <1422157428@qq.com> Date: Fri, 19 Jul 2024 17:42:27 +0800 Subject: [PATCH] =?UTF-8?q?B=E9=9D=A21.1.2=20=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=89=8B=E5=8A=A8=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Center/Clear Cache.imageset/Contents.json | 4 ++-- .../Clear Cache.imageset/Frame_34543@2x.png | Bin 2810 -> 0 bytes .../Clear Cache.imageset/Frame_34543@3x.png | Bin 5814 -> 0 bytes ...u_840d98d2-1a22-4b2e-adf3-d3557c9aad4g.png | Bin 0 -> 1637 bytes ...u_f53bc5b8-c70c-4922-a61f-60dfcff9008g.png | Bin 0 -> 1132 bytes .../Tool(工具封装)/MP_AdMobManager.swift | 7 +++++++ .../MP/Common/Tool(工具封装)/MP_HUD.swift | 2 ++ .../Tool(工具封装)/MP_NetWorkManager.swift | 19 +++++++++++------- .../Tool(工具封装)/MP_PlayerManager.swift | 6 +++--- .../MPPositive_OfflineSongsViewController.swift | 4 ++-- .../MPPositive_SearchViewController.swift | 14 +++++++++---- .../MPPositive_SearchSuggestionsView.swift | 10 ++++++--- 12 files changed, 45 insertions(+), 21 deletions(-) delete mode 100644 relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Frame_34543@2x.png delete mode 100644 relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Frame_34543@3x.png create mode 100644 relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/img_v3_02cu_840d98d2-1a22-4b2e-adf3-d3557c9aad4g.png create mode 100644 relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/img_v3_02cu_f53bc5b8-c70c-4922-a61f-60dfcff9008g.png diff --git a/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Contents.json b/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Contents.json index 25e56f5..6348443 100644 --- a/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Contents.json +++ b/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame_34543@2x.png", + "filename" : "img_v3_02cu_f53bc5b8-c70c-4922-a61f-60dfcff9008g.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame_34543@3x.png", + "filename" : "img_v3_02cu_840d98d2-1a22-4b2e-adf3-d3557c9aad4g.png", "idiom" : "universal", "scale" : "3x" } diff --git a/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Frame_34543@2x.png b/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/Frame_34543@2x.png deleted file mode 100644 index 20c94dab1effdbadf4d282a05ebfc1ab9e0f3f06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2810 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 A?EnA( diff --git a/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/img_v3_02cu_840d98d2-1a22-4b2e-adf3-d3557c9aad4g.png b/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/img_v3_02cu_840d98d2-1a22-4b2e-adf3-d3557c9aad4g.png new file mode 100644 index 0000000000000000000000000000000000000000..e1fb0b86ff4a4edd5a22715aba8f20f93a332a48 GIT binary patch literal 1637 zcmV-r2AcVaP)@-$`LBdC8@4y2QY$(u;V>I@p_yZF& z$iyLxo_>JmXdm09D+`!NxA(v+*j#Wtc2zrt*Na0w;&XLA!-I^(DZ{l*V2lQ5>gseO zXIRdzHU!8P#yKmDHIWo820wxaHq)ge_NhE!cP)`PHQF)wbPXE@oZShSFP~*?5xBe# z*bF?dQ3fklJ}>@2(Rb(9)Oth2K9<*tZ_i+OCD(1N&Qe&33)`h@p3riwiH+f5HM@`c z90S$FwsyJTyRaNTfHqiUw|xBD33yFTgXL$rkS|*)TA&h7a95QnYh5&<<@86fECvUBn&2o zSi{_C*EKI8!9n2_enqj5=M&I_qV8=qwj&MI(aWXRTnvLvljfC%Wa3RF!^sir1_d9m zJ*O^6a!*L11NyDu*V$i1+YxN&1@V{wTkS(t1JjI8TZ2zskeEqBAUYeo=3+=el9pWe zjeei;?Xx$EdQy3aFdFJQyYhbM0Oew3uqlyBUJRrP$FmY+*`#u?dZ613Z$+lkF;UQu z9F(4rRg7AUfSw38SQ;Wkp<7Aw8t$nfsfsTzKlU=bk_|ZpiC>ox4sNui(!m!=WW7m9 z{w$^0@YA zDFI(AQ0Xaj~1RRk%8aVM}7Ct)?Xc4hHmb#uS5v1Y1w#E_QpO*;n6~2UCXYL1xz7C zC8ZANRJC;RByCo==wNQN{bwoUQ-~G>m3VAWk(1mluKiR=%+)?{nSJHIO`ZK$zsU1W z_M0$>!5XeSw^B9n-2GF5iau}1mq{QE)iLNN4~}weSpX#Xiv-sJ+sIi2vYOsbhJpU(-Jc$r6!~FXm jt1dUbS=0+&@SWm6AyIt%GfAzo00000NkvXXu0mjfgrx;f literal 0 HcmV?d00001 diff --git a/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/img_v3_02cu_f53bc5b8-c70c-4922-a61f-60dfcff9008g.png b/relax.offline.mp3.music/Assets.xcassets/SideA/Center/Clear Cache.imageset/img_v3_02cu_f53bc5b8-c70c-4922-a61f-60dfcff9008g.png new file mode 100644 index 0000000000000000000000000000000000000000..952393dc6c5f0b4c5d015c472d250efdc23975a8 GIT binary patch literal 1132 zcmV-y1e5!TP)DI`sj&4NS;oN=O!if`>*lcmUWa@44hJLA}L0pP3#T>|33*{psIK(nw3c-VS6 zN-%#1pLJ}uV&LnREl_R%)2zNoy6z z%zfL1011o14I6VnF|B2Nd{uT0t8bq-(K7q=aV5rtR@_A=M0qCluXt9=c zqj903na3o}I7P(?gBeU4!|@?NQ(cU-L9Wfy;-AM~pvzb&Z(=n5B?=lu~O|L68_0ni^8BE)>tW_8w%E zc?(8S!GMFGUe{0t8ijdC1DZQ4PH71^Y?8FZS98L{qsrf3VE~mf?Y9uxsd#z-%0qw< zEm{6FG-KS(G=th7j4ppyQ>GCFy*HpJ{Dnl#yekL@* zmVUeC=uAlb)=OBJHo0ES8h!Rcmp?}nWBOZOK%R4 y#N+l@mLm5z1sF>Ls40~idej*$TY28)HS! Void)) { + guard netWorkStatu != .notReachable else { + completion([]) + handleError(url, error: nil) + return + } //发送post请求 MPSession.request(url, method: .post, parameters: parameters, encoding: JSONEncoding.default).responseDecodable(of: JsonSearchPreviewResults.self) { [weak self] (response) in guard let self = self else {return} diff --git a/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_PlayerManager.swift b/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_PlayerManager.swift index 3d524f1..9ec99da 100644 --- a/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_PlayerManager.swift +++ b/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_PlayerManager.swift @@ -438,9 +438,9 @@ class MP_PlayerManager:NSObject{ @objc private func netWorkReachableAction(_ sender:Notification) { //监听到网络状态恢复，检索当前播放器是否正在播放 if loadPlayer?.currentVideo != nil { - if playState == .Playing { + if playState == .Playing, let currentItem = loadPlayer?.currentVideo?.resourcePlayerItem { //有音乐播放，获取当前播放进度 - let currentTime = loadPlayer?.currentVideo?.resourcePlayerItem?.currentTime() ?? .zero + let currentTime = currentItem.currentTime() //手动调整播放时间点，以此重启播放器缓存 player.seek(to: currentTime) player.play() @@ -666,7 +666,7 @@ class MP_PlayerManager:NSObject{ } } default: - guard let songVideos = loadPlayer.songVideos, songVideos.count != 1 else { + guard let songVideos = loadPlayer?.songVideos, songVideos.count != 1 else { player.seek(to: .zero) playState = .Playing player.play() diff --git a/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Center（个人曲库页）/MPPositive_OfflineSongsViewController.swift b/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Center（个人曲库页）/MPPositive_OfflineSongsViewController.swift index d024f55..23bc80a 100644 --- a/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Center（个人曲库页）/MPPositive_OfflineSongsViewController.swift +++ b/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Center（个人曲库页）/MPPositive_OfflineSongsViewController.swift @@ -126,7 +126,7 @@ extension MPPositive_OfflineSongsViewController: UITableViewDataSource, UITableV MP_DownloadManager.shared.deleteFileDocuments(videoId) { videoId in MP_HUD.progress("Loading...", delay: 0.5) { MP_HUD.text("Removed", delay: 1.0, completion: nil) - tableView.reloadData() + self.reload() } } } @@ -145,7 +145,7 @@ extension MPPositive_OfflineSongsViewController: UITableViewDataSource, UITableV //确定取消 MP_DownloadManager.shared.cancelDownloadTask(videoId) { videoId in MP_HUD.text("Canceled", delay: 1.0, completion: nil) - tableView.reloadData() + self.reload() } } alertController.addAction(sure) diff --git a/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Search（搜索页）/MPPositive_SearchViewController.swift b/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Search（搜索页）/MPPositive_SearchViewController.swift index 13e2c9c..31a0aeb 100644 --- a/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Search（搜索页）/MPPositive_SearchViewController.swift +++ b/relax.offline.mp3.music/MP/MPPositive/ViewControllers/Search（搜索页）/MPPositive_SearchViewController.swift @@ -68,9 +68,10 @@ class MPPositive_SearchViewController: MPPositive_BaseViewController { [weak self] in guard let self = self else {return} historyCollectionView.reloadData() + historyCollectionView.layoutIfNeeded() guard let layout = historyCollectionView.collectionViewLayout as? MPPositive_TagFlowLayout, let height = layout.layoutAttributeds.last?.frame.maxY else {return} historyCollectionView.snp.updateConstraints { make in - make.height.equalTo(height) + make.height.equalTo(height*width) } } grideCollectionView.reloadData() @@ -82,6 +83,7 @@ class MPPositive_SearchViewController: MPPositive_BaseViewController { deinit{ NotificationCenter.default.removeObserver(self) } + //配置 private func configure() { let searchView = createSearchView() @@ -163,13 +165,17 @@ class MPPositive_SearchViewController: MPPositive_BaseViewController { MPPositive_SearchTagModel.fetchAll { [weak self] items in guard let self = self else {return} items.forEach({(MPPositive_SearchTagModel.delete($0))}) + guard let layout = historyCollectionView.collectionViewLayout as? MPPositive_TagFlowLayout else {return} layout.originxArray.removeAll() layout.originyArray.removeAll() layout.layoutAttributeds.removeAll() - historyCollectionView.reloadData() - historyCollectionView.snp.updateConstraints { make in - make.height.equalTo(10) + MPPositive_LoadCoreModel.shared.reloadSearchTags { + [weak self] in + self?.historyCollectionView.reloadData() + self?.historyCollectionView.snp.updateConstraints { make in + make.height.equalTo(10) + } } } } diff --git a/relax.offline.mp3.music/MP/MPPositive/Views/Search/MPPositive_SearchSuggestionsView.swift b/relax.offline.mp3.music/MP/MPPositive/Views/Search/MPPositive_SearchSuggestionsView.swift index f11e6d2..a48e6a3 100644 --- a/relax.offline.mp3.music/MP/MPPositive/Views/Search/MPPositive_SearchSuggestionsView.swift +++ b/relax.offline.mp3.music/MP/MPPositive/Views/Search/MPPositive_SearchSuggestionsView.swift @@ -52,9 +52,13 @@ extension MPPositive_SearchSuggestionsView:UITableViewDataSource, UITableViewDel return cell } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - if selectedTextBlock != nil { - let text = suggestions[indexPath.row].string - selectedTextBlock!(text) + MPPositive_Debouncer.shared.call { + [weak self] in + guard let self = self else {return} + if selectedTextBlock != nil { + let text = suggestions[indexPath.row].string + selectedTextBlock!(text) + } } } }