Merge branch 'languages' of https://git.yishihui.com/iOS/Introduce into languages

合并代码

Introduce.xcodeproj/project.pbxproj

@@ -478,7 +478,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -497,7 +497,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.introduce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -519,7 +519,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -538,7 +538,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.introduce;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Introduce/Aarchitecture/AppDelegate.swift

@@ -8,6 +8,7 @@
 import BFCommonKit
 import BFMaterialKit
 import UIKit
+import AppTrackingTransparency
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -55,5 +56,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             INAppConfigUtil.appLaunchReportUpload(isHotLaunch: true)
             isEnterBack = false
         }
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1) {
+            if #available(iOS 14, *) {
+                ATTrackingManager.requestTrackingAuthorization { status in
+                    
+                }
+            }
+        }
     }
 }

Introduce/Record/INIntroduceController.swift

@@ -112,9 +112,9 @@ class INIntroduceController: BFBaseViewController {
 
         let okAction = UIAlertAction(title: "option_exit".BFLocale, style: .cancel, handler: {[weak self]
            action in
-           print("点击了确定")
            self?.recordScreenVC.backBtnClick()
-            self?.super_back()
+//            self?.super_back()
+            self?.navigationController?.popToRootViewController(animated: true)
         })
         okAction.setValue(UIColor.red, forKey:"titleTextColor")
 

Introduce/Record/INPhotoVideosController.swift

@@ -104,7 +104,6 @@ class INPhotoVideosController: BFBaseViewController {
     lazy var photoMaterialVc: BFPhotosMaterialController = {
         let vc = BFPhotosMaterialController()
         vc.maxChoseNum = 20
-        vc.msgType = .all
         vc.showGIF = false
         vc.view.backgroundColor = .black
         vc.updateFrame(newFrame: CGRect(x: 0, y: navHeadImageView?.bottomY ?? 0, width: cScreenWidth, height: cScreenHeigth - cDevice_iPhoneTabBarHei - (navHeadImageView?.bottomY ?? 0)))