From d3d3da4f6e17c3f868a0098ee07d21b0846b7bcb Mon Sep 17 00:00:00 2001 From: "Mr.zhou" <1422157428@qq.com> Date: Fri, 12 Jul 2024 19:33:23 +0800 Subject: [PATCH] =?UTF-8?q?B=E9=9D=A21.1.1=20=E4=BC=98=E5=8C=96=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=8A=9F=E8=83=BD=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project.pbxproj | 28 ++ relax.offline.mp3.music/AppDelegate.swift | 71 +--- relax.offline.mp3.music/Info.plist | 2 +- .../Controllers/MP_BaseViewController.swift | 4 +- .../Controllers/MP_GuideViewController.xib | 2 +- .../Controllers/MP_LunchViewController.swift | 113 +++--- .../MP/Common/Extension(扩展)/HexColor.swift | 12 + .../Common/Extension(扩展)/Notification.swift | 2 + .../Common/Macro(宏定义与全局量)/Macro.swift | 180 ++++++++- .../Protocol(公用协议)/CoreDataDelegete.swift | 23 +- .../Tool(工具封装)/MP_AdMobManager.swift | 346 ++++++++++++------ .../Tool(工具封装)/MP_AnalyticsManager.swift | 48 ++- .../MP_CoreDataHandlerManager.swift | 61 +-- .../Tool(工具封装)/MP_NetWorkManager.swift | 168 ++++++++- .../Tool(工具封装)/MP_PlayerManager.swift | 24 +- .../MPPositive_JsonBrowse.swift | 82 ++++- .../MPPositive_JsonGenres.swift | 231 ++++++++++++ .../Models/MPPositive_AdModelModel.swift | 33 ++ .../Models/Models/MPPositive_GridModel.swift | 26 ++ .../MPPositive_GridViewModel.swift | 27 ++ .../MPPositive_BrowseLoadViewModel.swift | 2 + .../MPPositive_GridLoadViewModel.swift | 65 ++++ .../MPPositive_LoadCoreModel.swift | 2 +- ...PPositive_SearchResultsLoadViewModel.swift | 3 +- .../MPPositive_TabBarController.swift | 17 +- .../MPPositive_GrideMoodViewController.swift | 189 ++++++++++ ...MPPositive_SearchResultShowViewController.swift | 7 +- .../MPPositive_SearchViewController.swift | 81 +++- .../MPPositive_HomeSinglesTableViewCell.swift | 2 +- ...sitive_SearchGrideCollectionViewCell.swift | 45 +++ .../MPPositive_SearchResultsShowView.swift | 30 +- .../Models/Load/MPSideA_LoadDataMusic.swift | 16 +- .../MPSideA_TabBarController.swift | 15 +- 33 files changed, 1640 insertions(+), 317 deletions(-) create mode 100644 relax.offline.mp3.music/MP/MPPositive/Models/JsonStructs(js文件结构)/MPPositive_JsonGenres.swift create mode 100644 relax.offline.mp3.music/MP/MPPositive/Models/Models/MPPositive_AdModelModel.swift create mode 100644 relax.offline.mp3.music/MP/MPPositive/Models/Models/MPPositive_GridModel.swift create mode 100644 relax.offline.mp3.music/MP/MPPositive/Models/ViewModels/ListViewModels/MPPositive_GridViewModel.swift create mode 100644 relax.offline.mp3.music/MP/MPPositive/Models/ViewModels/LoadViewModels/MPPositive_GridLoadViewModel.swift create mode 100644 relax.offline.mp3.music/MP/MPPositive/ViewControllers/Search（搜索页）/MPPositive_GrideMoodViewController.swift create mode 100644 relax.offline.mp3.music/MP/MPPositive/Views/Search/MPPositive_SearchGrideCollectionViewCell.swift diff --git a/relax.offline.mp3.music.xcodeproj/project.pbxproj b/relax.offline.mp3.music.xcodeproj/project.pbxproj index a318297..2955905 100644 --- a/relax.offline.mp3.music.xcodeproj/project.pbxproj +++ b/relax.offline.mp3.music.xcodeproj/project.pbxproj @@ -232,11 +232,18 @@ CBC2D6F82BFDF3D800E17703 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CBC2D6F72BFDF3D800E17703 /* Assets.xcassets */; }; CBC2D6FB2BFDF3D800E17703 /* Base in Resources */ = {isa = PBXBuildFile; fileRef = CBC2D6FA2BFDF3D800E17703 /* Base */; }; CBC2D7D42BFDF4B900E17703 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = CBC2D7792BFDF4B900E17703 /* PrivacyInfo.xcprivacy */; }; + CBC3F2B22C3E76160075DC74 /* MPPositive_AdModelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBC3F2B12C3E76160075DC74 /* MPPositive_AdModelModel.swift */; }; CBC81FBA2C3694990028143B /* MPPositive_HomeSinglesTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBC81FB92C3694990028143B /* MPPositive_HomeSinglesTableViewCell.swift */; }; CBC81FBC2C3696230028143B /* MPPositive_HomeSingleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBC81FBB2C3696230028143B /* MPPositive_HomeSingleCollectionViewCell.swift */; }; + CBD344DA2C3FACB30095F18F /* MPPositive_JsonGenres.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBD344D92C3FACB30095F18F /* MPPositive_JsonGenres.swift */; }; + CBD344DC2C3FCA270095F18F /* MPPositive_GridModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBD344DB2C3FCA270095F18F /* MPPositive_GridModel.swift */; }; + CBD344DE2C3FD8230095F18F /* MPPositive_GridViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBD344DD2C3FD8230095F18F /* MPPositive_GridViewModel.swift */; }; CBD4570D2C2EC38400CE766D /* AppTrackingTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD4570C2C2EC38400CE766D /* AppTrackingTransparency.framework */; }; CBD5CAFD2C3BE9A90001E315 /* MP_MarQueeLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBD5CAFC2C3BE9A90001E315 /* MP_MarQueeLabel.swift */; }; CBDAC60E2C2BE1B6008B8D34 /* MPPositive_ChooseNewPlayListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBDAC60D2C2BE1B6008B8D34 /* MPPositive_ChooseNewPlayListTableViewCell.swift */; }; + CBDBDDF22C40C40900767F0B /* MPPositive_GridLoadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBDBDDF12C40C40900767F0B /* MPPositive_GridLoadViewModel.swift */; }; + CBDBDDF42C40D03F00767F0B /* MPPositive_SearchGrideCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBDBDDF32C40D03F00767F0B /* MPPositive_SearchGrideCollectionViewCell.swift */; }; + CBDBDDF62C40FFC600767F0B /* MPPositive_GrideMoodViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBDBDDF52C40FFC600767F0B /* MPPositive_GrideMoodViewController.swift */; }; CBF3AEDA2C255B1200947AFC /* MPPositive_PlayListsShowTypeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBF3AED92C255B1200947AFC /* MPPositive_PlayListsShowTypeView.swift */; }; /* End PBXBuildFile section */ @@ -465,11 +472,18 @@ CBC2D6FA2BFDF3D800E17703 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; CBC2D6FC2BFDF3D800E17703 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CBC2D7792BFDF4B900E17703 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; + CBC3F2B12C3E76160075DC74 /* MPPositive_AdModelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_AdModelModel.swift; sourceTree = ""; }; CBC81FB92C3694990028143B /* MPPositive_HomeSinglesTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_HomeSinglesTableViewCell.swift; sourceTree = ""; }; CBC81FBB2C3696230028143B /* MPPositive_HomeSingleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_HomeSingleCollectionViewCell.swift; sourceTree = ""; }; + CBD344D92C3FACB30095F18F /* MPPositive_JsonGenres.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_JsonGenres.swift; sourceTree = ""; }; + CBD344DB2C3FCA270095F18F /* MPPositive_GridModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_GridModel.swift; sourceTree = ""; }; + CBD344DD2C3FD8230095F18F /* MPPositive_GridViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_GridViewModel.swift; sourceTree = ""; }; CBD4570C2C2EC38400CE766D /* AppTrackingTransparency.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppTrackingTransparency.framework; path = System/Library/Frameworks/AppTrackingTransparency.framework; sourceTree = SDKROOT; }; CBD5CAFC2C3BE9A90001E315 /* MP_MarQueeLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MP_MarQueeLabel.swift; sourceTree = ""; }; CBDAC60D2C2BE1B6008B8D34 /* MPPositive_ChooseNewPlayListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_ChooseNewPlayListTableViewCell.swift; sourceTree = ""; }; + CBDBDDF12C40C40900767F0B /* MPPositive_GridLoadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_GridLoadViewModel.swift; sourceTree = ""; }; + CBDBDDF32C40D03F00767F0B /* MPPositive_SearchGrideCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_SearchGrideCollectionViewCell.swift; sourceTree = ""; }; + CBDBDDF52C40FFC600767F0B /* MPPositive_GrideMoodViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_GrideMoodViewController.swift; sourceTree = ""; }; CBF3AED92C255B1200947AFC /* MPPositive_PlayListsShowTypeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPPositive_PlayListsShowTypeView.swift; sourceTree = ""; }; EE70E1FE424F9A64CCD389DD /* Pods-relax.offline.mp3.music.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-relax.offline.mp3.music.debug.xcconfig"; path = "Target Support Files/Pods-relax.offline.mp3.music/Pods-relax.offline.mp3.music.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -686,6 +700,7 @@ children = ( CBAFCA322C0A10500054500E /* MPPositive_JsonBrowse.swift */, CBBAF8CC2C339CF200B3C838 /* MPPositive_JsonCharts.swift */, + CBD344D92C3FACB30095F18F /* MPPositive_JsonGenres.swift */, CBAFCA302C0A10500054500E /* MPPositive_JsonArtist.swift */, CBAFCA312C0A10500054500E /* MPPositive_JsonArtistMore.swift */, CBAFCA332C0A10500054500E /* MPPositive_JsonListAlbum.swift */, @@ -705,7 +720,9 @@ isa = PBXGroup; children = ( CBAFCA3D2C0A10500054500E /* MPPositive_ArtistHeaderModel.swift */, + CBC3F2B12C3E76160075DC74 /* MPPositive_AdModelModel.swift */, CBAFCA3E2C0A10500054500E /* MPPositive_BrowseItemModel.swift */, + CBD344DB2C3FCA270095F18F /* MPPositive_GridModel.swift */, CBAFCA3F2C0A10500054500E /* MPPositive_CollectionArtistModel.swift */, CBAFCA402C0A10500054500E /* MPPositive_CollectionListModel.swift */, CBAFCA412C0A10500054500E /* MPPositive_CollectionSongModel.swift */, @@ -727,6 +744,7 @@ CBAFCA492C0A10500054500E /* MPPositive_ArtistViewModel.swift */, CBAFCA4A2C0A10500054500E /* MPPositive_BrowseItemViewModel.swift */, CBAFCA4B2C0A10500054500E /* MPPositive_BrowseModuleListViewModel.swift */, + CBD344DD2C3FD8230095F18F /* MPPositive_GridViewModel.swift */, CBAFCA4C2C0A10500054500E /* MPPositive_CollectionArtistViewModel.swift */, CBAFCA4D2C0A10500054500E /* MPPositive_CollectionListViewModel.swift */, CBAFCA4E2C0A10500054500E /* MPPositive_CollectionSongViewModel.swift */, @@ -751,6 +769,7 @@ CBAFCA5A2C0A10500054500E /* MPPositive_PlayerLoadViewModel.swift */, CBAFCA5B2C0A10500054500E /* MPPositive_RecommendLoadViewModel.swift */, CBAFCA5C2C0A10500054500E /* MPPositive_SearchResultsLoadViewModel.swift */, + CBDBDDF12C40C40900767F0B /* MPPositive_GridLoadViewModel.swift */, ); path = LoadViewModels; sourceTree = ""; @@ -825,6 +844,7 @@ isa = PBXGroup; children = ( CBAFCA752C0A10500054500E /* MPPositive_SearchViewController.swift */, + CBDBDDF52C40FFC600767F0B /* MPPositive_GrideMoodViewController.swift */, CBAFCA742C0A10500054500E /* MPPositive_SearchResultShowViewController.swift */, ); path = "Search（搜索页）"; @@ -909,6 +929,7 @@ isa = PBXGroup; children = ( CBAFCA9E2C0A10500054500E /* MPPositive_SearchTagCollectionViewCell.swift */, + CBDBDDF32C40D03F00767F0B /* MPPositive_SearchGrideCollectionViewCell.swift */, CBAFCA9D2C0A10500054500E /* MPPositive_SearchSuggestionsView.swift */, CBAFCA9A2C0A10500054500E /* MPPositive_SearchResultsShowView.swift */, CBAFCA982C0A10500054500E /* MPPositive_SearchResultPreviewShowView.swift */, @@ -1353,6 +1374,7 @@ CBAFCB652C0A10500054500E /* MPPositive_HomeListThirdCollectionViewCell.swift in Sources */, CBAFCB472C0A10500054500E /* MPPositive_LoveArtistsViewController.swift in Sources */, CBAFCAF62C0A10500054500E /* InstanceFromNib.swift in Sources */, + CBD344DE2C3FD8230095F18F /* MPPositive_GridViewModel.swift in Sources */, CBAFCB622C0A10500054500E /* MPPositive_HomeListFirstCollectionViewCell.swift in Sources */, CBAFCB112C0A10500054500E /* MP_PlayerManager.swift in Sources */, CBAFCB582C0A10500054500E /* MPPositive_LibraryTableViewCell.swift in Sources */, @@ -1365,12 +1387,14 @@ CBAFCB632C0A10500054500E /* MPPositive_HomeListFourthCollectionViewCell.swift in Sources */, CB1E3B682C23E09100071DEA /* MPPositive_CustomVideoModel.swift in Sources */, CBAFCB3E2C0A10500054500E /* MPPositive_PlayerLoadViewModel.swift in Sources */, + CBD344DC2C3FCA270095F18F /* MPPositive_GridModel.swift in Sources */, CBC81FBA2C3694990028143B /* MPPositive_HomeSinglesTableViewCell.swift in Sources */, CBAFCB252C0A10500054500E /* MPPositive_CollectionArtistModel.swift in Sources */, CBAFCB702C0A10500054500E /* MPPositive_SearchResultShowTableViewCell.swift in Sources */, CBAFCB662C0A10500054500E /* MPPositive_HomeShowTableViewCell.swift in Sources */, CBAFCB352C0A10500054500E /* MPPositive_ListAlbumListViewModel.swift in Sources */, CBAFCB7C2C0A10500054500E /* MPSideA_NavigationController.swift in Sources */, + CBDBDDF62C40FFC600767F0B /* MPPositive_GrideMoodViewController.swift in Sources */, CBAFCB932C0A10500054500E /* MPSideA_PlayerViewController.swift in Sources */, CBAFCB512C0A10500054500E /* MPPositive_SearchResultShowViewController.swift in Sources */, CBAFCB4C2C0A10500054500E /* MPPositive_ListShowViewController.swift in Sources */, @@ -1441,12 +1465,14 @@ CBAFCB832C0A10500054500E /* MPSideA_DeleteViewController.swift in Sources */, CBAFCAF22C0A10500054500E /* String.swift in Sources */, CBAFCB0E2C0A10500054500E /* MP_HUD.swift in Sources */, + CBD344DA2C3FACB30095F18F /* MPPositive_JsonGenres.swift in Sources */, CB0033F02C290AC200B18FD3 /* MPPositive_CustomPlayListViewModel.swift in Sources */, CBAFCB4B2C0A10500054500E /* MPPositive_HomeViewController.swift in Sources */, CBAFCB2A2C0A10500054500E /* MPPositive_SearchSuggestionItemModel.swift in Sources */, CBAFCB372C0A10500054500E /* MPPositive_RecommendListViewModel.swift in Sources */, CBAFCB282C0A10500054500E /* MPPositive_DownloadItemModel.swift in Sources */, CBAFCB152C0A10500054500E /* MPSideA_MediaCenterManager.swift in Sources */, + CBDBDDF22C40C40900767F0B /* MPPositive_GridLoadViewModel.swift in Sources */, CBAFCAEB2C0A10500054500E /* relax.offline.mp3.xcdatamodeld in Sources */, CBAFCB192C0A10500054500E /* MPPositive_JsonBrowse.swift in Sources */, CBAFCB912C0A10500054500E /* MPSideA_HomeViewController.swift in Sources */, @@ -1468,6 +1494,7 @@ CBAFCB442C0A10500054500E /* MPPositive_PresentationController.swift in Sources */, CB0968752C2121410045E55B /* GADTSmallTemplateView.m in Sources */, CBAFCB9B2C0A10500054500E /* MPSideA_CenterTableViewCell.swift in Sources */, + CBC3F2B22C3E76160075DC74 /* MPPositive_AdModelModel.swift in Sources */, CBAFCB412C0A10500054500E /* MPPositive_BaseViewController.swift in Sources */, CBAFCB4E2C0A10500054500E /* MPPositive_PlayerListShowViewController.swift in Sources */, CBAFCB8B2C0A10500054500E /* MPSideA_ServiceViewController.swift in Sources */, @@ -1499,6 +1526,7 @@ CBAFCB532C0A10500054500E /* MPPositive_BottomShowView.swift in Sources */, CBF3AEDA2C255B1200947AFC /* MPPositive_PlayListsShowTypeView.swift in Sources */, CBC2D6EC2BFDF3D700E17703 /* AppDelegate.swift in Sources */, + CBDBDDF42C40D03F00767F0B /* MPPositive_SearchGrideCollectionViewCell.swift in Sources */, CBAFCB322C0A10500054500E /* MPPositive_CollectionListViewModel.swift in Sources */, CBC81FBC2C3696230028143B /* MPPositive_HomeSingleCollectionViewCell.swift in Sources */, CBAFCB812C0A10500054500E /* MPSideA_CenterViewController.swift in Sources */, diff --git a/relax.offline.mp3.music/AppDelegate.swift b/relax.offline.mp3.music/AppDelegate.swift index 1367a51..41dae6c 100644 --- a/relax.offline.mp3.music/AppDelegate.swift +++ b/relax.offline.mp3.music/AppDelegate.swift @@ -25,6 +25,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate { private var backgroundEntryTime:Date? //B面 private var positiceVC:MPPositive_TabBarController! + //推送要求 + private let notificationHandler = NotificationHandler() func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { //请求通知权限 UNUserNotificationCenter.current() @@ -34,8 +36,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate { print("Users are not allowed to be notified of messages.") } } + //切换通知代理 + UNUserNotificationCenter.current().delegate = notificationHandler //广告默认ID - coreAdMosIDs() + coreDefaultValues() ActiveDaysCalculation() //FireBase初始化 FirebaseApp.configure() @@ -82,56 +86,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { //响应后台控制 UIApplication.shared.beginReceivingRemoteControlEvents() } - //存储修改值 - func coreAdMosIDs() { - if UserDefaults.standard.string(forKey: "OpenICEID") == nil { - print("第一次启动，添加广告ID") - //存入默认开屏冷启动广告ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/5575463023", forKey: "OpenICEID") - } - if UserDefaults.standard.string(forKey: "OpenHOSTID") == nil { - //存入默认开屏热启动广告ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/5575463023", forKey: "OpenHOSTID") - } - if UserDefaults.standard.string(forKey: "SearchINSERTID") == nil { - //存入默认搜索插页广告ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/4411468910", forKey: "SearchINSERTID") - } - if UserDefaults.standard.string(forKey: "SearchNATIVEID") == nil { - //存入默认搜索原生广告ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/3986624511", forKey: "SearchNATIVEID") - } - if UserDefaults.standard.string(forKey: "PlayerINSERTID") == nil { - //存入默认播放插页广告ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/4411468910", forKey: "PlayerINSERTID") - } - if UserDefaults.standard.string(forKey: "SwitchINSERTID") == nil { - //存入默认切歌插页广告ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/4411468910", forKey: "SwitchINSERTID") - } - if UserDefaults.standard.string(forKey: "LoadINSERTID") == nil { - //存入默认下载插页广告ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/4411468910", forKey: "LoadINSERTID") - } - if UserDefaults.standard.string(forKey: "LibraryINSERTID") == nil { - //存入默认曲库插页ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/4411468910", forKey: "LibraryINSERTID") - } - if UserDefaults.standard.string(forKey: "LibraryNATIVEID") == nil { - //存入默认曲库原生ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/3986624511", forKey: "LibraryNATIVEID") - } - if UserDefaults.standard.string(forKey: "GlobalINSERTID") == nil { - //存入默认全局备用插页ID - UserDefaults.standard.set("ca-app-pub-3940256099942544/4411468910", forKey: "GlobalINSERTID") - } - if UserDefaults.standard.string(forKey: "ClientVersion") == nil { - UserDefaults.standard.set("1.20240618.01.00", forKey: "ClientVersion") - } - if UserDefaults.standard.string(forKey: "PlayerVersion") == nil { - UserDefaults.standard.set("6.18.1", forKey: "PlayerVersion") - } - } //活跃天数计算 private func ActiveDaysCalculation() { //判断是否存在活跃天数组 @@ -279,6 +233,21 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } } } + func adManagerDidShowInterstitial() { + window?.rootViewController?.setNeedsStatusBarAppearanceUpdate() + } } ///访问appDelegate let accessAppdelegate = ( UIApplication.shared.delegate as! AppDelegate) +///在应用内展示通知 +class NotificationHandler: NSObject, UNUserNotificationCenterDelegate { + func userNotificationCenter(_ center: UNUserNotificationCenter, + willPresent notification: UNNotification, + withCompletionHandler completionHandler: + @escaping (UNNotificationPresentationOptions) -> Void) { + completionHandler([.alert, .sound, .badge]) + + // 如果不想显示某个通知，可以直接用空 options 调用 completionHandler: + // completionHandler([]) + } +} diff --git a/relax.offline.mp3.music/Info.plist b/relax.offline.mp3.music/Info.plist index 02ad002..a0bfcd8 100644 --- a/relax.offline.mp3.music/Info.plist +++ b/relax.offline.mp3.music/Info.plist @@ -12,7 +12,7 @@ fetch GADApplicationIdentifier - ca-app-pub-3940256099942544~1458002511 + ca-app-pub-1371732277241593~3881310073 SKAdNetworkItems diff --git a/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_BaseViewController.swift b/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_BaseViewController.swift index 783d25d..fdade9f 100644 --- a/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_BaseViewController.swift +++ b/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_BaseViewController.swift @@ -17,7 +17,7 @@ class MP_BaseViewController: UIViewController { // MP_NetWorkManager.shared.requestStatusToYouTube() // 注册应用从后台唤醒到前台的通知 // NotificationCenter.default.addObserver(self, selector: #selector(appWillEnterForegroundAction), name:UIApplication.willEnterForegroundNotification, object: nil) - + } override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) @@ -39,7 +39,7 @@ class MP_BaseViewController: UIViewController { UserDefaults.standard.set(true, forKey: "isNetWorkUsage") } - + // private func triggerLocalNetworkPrivacyAlert() { // let sock4 = socket(AF_INET, SOCK_DGRAM, 0) // guard sock4 >= 0 else { return } diff --git a/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_GuideViewController.xib b/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_GuideViewController.xib index 7902352..63b892a 100644 --- a/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_GuideViewController.xib +++ b/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_GuideViewController.xib @@ -30,7 +30,7 @@