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

1.3.1 提审版本

Browse Source
This commit is contained in:
QinFendeZhou 2024-11-18 21:29:29 +08:00
parent 15922d59af
commit 1a06d6346b
6 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
relax.offline.mp3.music/AppDelegate.swift
View File

@ -154,7 +154,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
} }
///跳转A面 ///跳转A面
func switch_aSide() { func switch_aSide() {
guard showStatus != false else { guard showStatus == nil else {
//用户已经跳转过了，不要改动 //用户已经跳转过了，不要改动
return return
} }

25
relax.offline.mp3.music/MP/Common/Base(公用基类)/Controllers/MP_LunchViewController.swift
View File

@ -197,15 +197,26 @@ class MP_LunchViewController: UIViewController {
guard let self = self else {return} guard let self = self else {return}
//停止计时器 //停止计时器
timer.isPaused = true timer.isPaused = true
if accessAppdelegate.showStatus == false { //判断广告是否展示
//当前已处于A面 if MP_ADSimpleManager.shared.getInterstitialSwitch() {
MP_AnalyticsManager.shared.jump_eventAction("A jump to B", reason: "Switch test passed, IP test passed, User delays in processing network permissions") //展示中,切换完成任务块
self.completionBlock = {
MP_AnalyticsManager.shared.jump_eventAction("jump to B", reason: "Switch test passed, IP test passed")
//加载完毕，判断并跳转
accessAppdelegate.switch_positive()
}
}else { }else {
//当前还未跳转 //没有展示
MP_AnalyticsManager.shared.jump_eventAction("jump to B", reason: "Switch test passed, IP test passed") if accessAppdelegate.showStatus == false {
//当前已处于A面
MP_AnalyticsManager.shared.jump_eventAction("A jump to B", reason: "Switch test passed, IP test passed, User delays in processing network permissions")
}else {
//当前还未跳转
MP_AnalyticsManager.shared.jump_eventAction("jump to B", reason: "Switch test passed, IP test passed")
}
//加载完毕，判断并跳转
accessAppdelegate.switch_positive()
} }
//加载完毕，判断并跳转
accessAppdelegate.switch_positive()
} }
} }
}else { }else {

8
relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_AnalyticsManager.swift
View File

@ -129,7 +129,7 @@ class MP_AnalyticsManager: NSObject {
//每次启动都要获取值 //每次启动都要获取值
let settings = RemoteConfigSettings() let settings = RemoteConfigSettings()
settings.minimumFetchInterval = 0 settings.minimumFetchInterval = 0
settings.fetchTimeout = 20 settings.fetchTimeout = 15
remoteConfig.configSettings = settings remoteConfig.configSettings = settings
remoteConfig.fetch(completionHandler: {[weak self] status, error in remoteConfig.fetch(completionHandler: {[weak self] status, error in
guard let self = self else {return} guard let self = self else {return}
@ -285,6 +285,12 @@ class MP_AnalyticsManager: NSObject {
//不存在，直接进入A面 //不存在，直接进入A面
completion(false) completion(false)
} }
if frequency > 0 {
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
print("重启firebase请求")
self.getOpenStatus(frequency - 1, completion: completion)
}
}
} }
}) })
} }

6
relax.offline.mp3.music/MP/Common/Tool(工具封装)/MP_NetWorkManager.swift
View File

@ -73,7 +73,7 @@ class MP_NetWorkManager: NSObject {
//MARK: - API接口 //MARK: - API接口
///IP获取 ///IP获取
private let iPInfo:String = "https://api.tikustok.com/app/common/getIPInfo" private let iPInfo:String = "https://ipinfo.io/json"
///域名链接 ///域名链接
private let header:String = "https://music.youtube.com" private let header:String = "https://music.youtube.com"
///端点 ///端点
@ -354,10 +354,10 @@ extension MP_NetWorkManager {
guard let self = self else {return} guard let self = self else {return}
switch response.result { switch response.result {
case .success(let value): case .success(let value):
guard let data = value.data, let code = data.isoCode else { guard let code = value.country else {
return return
} }
let ip = data.ip let ip = value.ip
UserDefaults.standard.set(ip, forKey: "IP_Info") UserDefaults.standard.set(ip, forKey: "IP_Info")
if ISOs.contains(code) { if ISOs.contains(code) {
locaton = code locaton = code

28
relax.offline.mp3.music/MP/MPPositive/Models/JsonStructs(js文件结构)/MPPositive_JsonBrowse.swift
View File

@ -4,32 +4,16 @@ import Foundation
///IP信息结构 ///IP信息结构
struct JsonIPInfo: Codable { struct JsonIPInfo: Codable {
let data:Datas? let ip:String?
let message:String? let country:String?
let status:String?
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case data = "data" case ip = "ip"
case message = "message" case country = "country"
case status = "status"
} }
init(from decoder: Decoder) throws { init(from decoder: Decoder) throws {
let values = try decoder.container(keyedBy: CodingKeys.self) let values = try decoder.container(keyedBy: CodingKeys.self)
data = try values.decodeIfPresent(Datas.self, forKey: .data) ip = try values.decodeIfPresent(String.self, forKey: .ip)
message = try values.decodeIfPresent(String.self, forKey: .message) country = try values.decodeIfPresent(String.self, forKey: .country)
status = try values.decodeIfPresent(String.self, forKey: .status)
}
struct Datas: Codable {
let isoCode:String?
let ip:String?
enum CodingKeys: String, CodingKey {
case isoCode = "isoCode"
case ip = "ip"
}
init(from decoder: Decoder) throws {
let values = try decoder.container(keyedBy: CodingKeys.self)
isoCode = try values.decodeIfPresent(String.self, forKey: .isoCode)
ip = try values.decodeIfPresent(String.self, forKey: .ip)
}
} }
} }