diff --git a/relax.offline.mp3.music.xcodeproj/project.pbxproj b/relax.offline.mp3.music.xcodeproj/project.pbxproj index a25f217..d68e459 100644 --- a/relax.offline.mp3.music.xcodeproj/project.pbxproj +++ b/relax.offline.mp3.music.xcodeproj/project.pbxproj @@ -822,9 +822,9 @@ CBAFCA362C0A10500054500E /* MPPositive_JsonPlayer.swift */, CBAFCA372C0A10500054500E /* MPPositive_JsonRecommend.swift */, CBAFCA382C0A10500054500E /* MPPositive_JsonSearchResults.swift */, - CBAFCA392C0A10500054500E /* MPPositive_JsonSearchSuggestions.swift */, - CBAFCA3A2C0A10500054500E /* MPPositive_JsonSearchTypeContinuation.swift */, CBAFCA3B2C0A10500054500E /* MPPositive_JsonSearchTypeResults.swift */, + CBAFCA3A2C0A10500054500E /* MPPositive_JsonSearchTypeContinuation.swift */, + CBAFCA392C0A10500054500E /* MPPositive_JsonSearchSuggestions.swift */, ); path = "JsonStructs(js文件结构)"; sourceTree = ""; @@ -1927,7 +1927,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1.3.0; + CURRENT_PROJECT_VERSION = 1.3.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RAQJ4FNZUH; @@ -1948,7 +1948,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.0; + MARKETING_VERSION = 1.3.1; PRODUCT_BUNDLE_IDENTIFIER = relax.offline.mp3.music; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1973,7 +1973,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1.3.0; + CURRENT_PROJECT_VERSION = 1.3.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RAQJ4FNZUH; @@ -1994,7 +1994,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.0; + MARKETING_VERSION = 1.3.1; PRODUCT_BUNDLE_IDENTIFIER = relax.offline.mp3.music; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/relax.offline.mp3.music.xcworkspace/xcshareddata/swiftpm/Package.resolved b/relax.offline.mp3.music.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8f44fed..141e323 100644 --- a/relax.offline.mp3.music.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/relax.offline.mp3.music.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/abseil-cpp-binary.git", "state" : { - "revision" : "748c7837511d0e6a507737353af268484e1745e2", - "version" : "1.2024011601.1" + "revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27", + "version" : "1.2024011602.0" } }, { @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/firebase-ios-sdk", "state" : { - "revision" : "e57841b296d04370ea23580f908881b0ccab17b9", - "version" : "10.28.1" + "revision" : "eca84fd638116dd6adb633b5a3f31cc7befcbb7d", + "version" : "10.29.0" } }, { @@ -78,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/gtm-session-fetcher.git", "state" : { - "revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193", - "version" : "3.4.1" + "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b", + "version" : "3.5.0" } }, { @@ -132,8 +132,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb", - "version" : "1.26.0" + "revision" : "ebc7251dd5b37f627c93698e4374084d98409633", + "version" : "1.28.2" } } ], diff --git a/relax.offline.mp3.music.xcworkspace/xcuserdata/zhou.xcuserdatad/UserInterfaceState.xcuserstate b/relax.offline.mp3.music.xcworkspace/xcuserdata/zhou.xcuserdatad/UserInterfaceState.xcuserstate index b290bdb..e53b4bc 100644 Binary files a/relax.offline.mp3.music.xcworkspace/xcuserdata/zhou.xcuserdatad/UserInterfaceState.xcuserstate and b/relax.offline.mp3.music.xcworkspace/xcuserdata/zhou.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/relax.offline.mp3.music/AppDelegate.swift b/relax.offline.mp3.music/AppDelegate.swift index 093c390..8d5df95 100644 --- a/relax.offline.mp3.music/AppDelegate.swift +++ b/relax.offline.mp3.music/AppDelegate.swift @@ -155,6 +155,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ///跳转A面 func switch_aSide() { guard showStatus != false else { + //用户已经跳转过了,不要改动 return } let tabBarVC = MPSideA_TabBarController() diff --git a/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_LunchViewController.swift b/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_LunchViewController.swift index 34867c6..36b0758 100644 --- a/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_LunchViewController.swift +++ b/relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_LunchViewController.swift @@ -338,7 +338,6 @@ class MP_LunchViewController: UIViewController { if MP_AdMobManager.shared.completeOpenAdBlock != nil { MP_AdMobManager.shared.completeOpenAdBlock!() } - } } } diff --git a/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_AnalyticsManager.swift b/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_AnalyticsManager.swift index 8d4cdf5..db330bf 100644 --- a/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_AnalyticsManager.swift +++ b/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_AnalyticsManager.swift @@ -125,10 +125,13 @@ class MP_AnalyticsManager: NSObject { } //MARK: - 开关 ///A/B面开关(包括间隔时长更新) - func getOpenStatus(_ completion:@escaping ((Bool) -> Void)) { + func getOpenStatus(_ frequency:Int = 50, completion:@escaping ((Bool) -> Void)) { //每次启动都要获取值 - let duration:TimeInterval = 0 - remoteConfig.fetch(withExpirationDuration: duration) {[weak self] status, error in + let settings = RemoteConfigSettings() + settings.minimumFetchInterval = 0 + settings.fetchTimeout = 20 + remoteConfig.configSettings = settings + remoteConfig.fetch(completionHandler: {[weak self] status, error in guard let self = self else {return} if status == .success { print("获取配置成功,各项功能使用线上配置") @@ -283,7 +286,7 @@ class MP_AnalyticsManager: NSObject { completion(false) } } - } + }) } ///更新AdMob广告配置 private func reloadAdMobIDs(_ adMob:String) { diff --git a/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_NetWorkManager.swift b/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_NetWorkManager.swift index 0f0fb06..864b545 100644 --- a/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_NetWorkManager.swift +++ b/relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_NetWorkManager.swift @@ -189,7 +189,7 @@ class MP_NetWorkManager: NSObject { ] ], "params": "CgIQBg", - "key":netKeyCode + "key":netKeyCode, ] } }