소스 검색

Merge branch 'master' into dev

* master:
  ATTrackingManager权限修改
  iOS15  ATTrackingManager 不弹窗的问题
  修改版本号
胡志强 3 년 전
부모
커밋
1ce7d371d3
3개의 변경된 파일33개의 추가작업 그리고 10개의 파일을 삭제
  1. 4 4
      Introduce.xcodeproj/project.pbxproj
  2. 29 0
      Introduce/Aarchitecture/AppDelegate.swift
  3. 0 6
      Introduce/Record/INRecorderController.swift

+ 4 - 4
Introduce.xcodeproj/project.pbxproj

@@ -483,7 +483,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -507,7 +507,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.introduce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -530,7 +530,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -554,7 +554,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.introduce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 29 - 0
Introduce/Aarchitecture/AppDelegate.swift

@@ -9,6 +9,8 @@ import BFCommonKit
 import BFMaterialKit
 import UIKit
 import AppTrackingTransparency
+import AdSupport
+
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -65,5 +67,32 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             isEnterBack = false
         }
         UIApplication.shared.keyWindow?.isUserInteractionEnabled = true
+        
+        requestPromission()
+    }
+    
+    func requestPromission(){
+        if #available(iOS 14.0, *) {
+            let status = ATTrackingManager.trackingAuthorizationStatus
+            switch status {
+                case .denied:
+                    print("用户拒绝IDFA")
+                case .authorized:
+                    print("用户允许IDFA")
+                case .notDetermined:
+                    print("用户未做选择或未弹窗IDFA")
+                    ATTrackingManager.requestTrackingAuthorization { _ in
+                    }
+                default:
+                    break
+            }
+        } else {
+            if ASIdentifierManager.shared().isAdvertisingTrackingEnabled {
+                print("用户开启了广告追踪IDFA")
+            } else {
+                print("用户关闭了广告追踪IDFA")
+            }
+        }
+
     }
 }

+ 0 - 6
Introduce/Record/INRecorderController.swift

@@ -173,12 +173,6 @@ class INRecorderController: BFBaseViewController {
     }
     
     override func viewDidLoad() {
-        DispatchQueue.global().async {[weak self] in
-            if #available(iOS 14, *) {
-                ATTrackingManager.requestTrackingAuthorization { [weak self] _ in
-                }
-            }
-        }
         super.viewDidLoad()
         view.backgroundColor = .black
         view.addSubview(bgView)