fix: 修复present导致外部控制器安全区域异常

fix: 修复UITableView和UICollectionView相关示例代码错误

Author: chenlin

.gitignore

@@ -11,7 +11,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        window?.rootViewController = CLTabBarController()
+        window?.rootViewController = CLTabBarController(nibName: nil, bundle: nil)
         window?.makeKeyAndVisible()
         return true
     }

AppDelegate.swift

@@ -148,19 +148,18 @@ extension CLCollectionViewController {
 private extension CLCollectionViewController {
     func playWithIndexPath(_ indexPath: IndexPath) {
         guard let cell = collectionView.cellForItem(at: indexPath) else { return }
+        let player = player ?? CLPlayer()
+        self.player = player
 
-        if player == nil {
-            player = CLPlayer()
-        }
-        player?.title = NSMutableAttributedString("这是一个标题", attributes: { $0
+        player.title = NSMutableAttributedString("这是一个标题", attributes: { $0
                 .font(.systemFont(ofSize: 16))
                 .foregroundColor(.orange)
                 .alignment(.center)
         })
-        player?.url = URL(string: array[indexPath.row])
-        cell.contentView.addSubview(player!)
-        player?.frame = cell.contentView.bounds
-        player?.play()
+        player.url = URL(string: array[indexPath.row])
+        cell.contentView.addSubview(player)
+        player.frame = cell.contentView.bounds
+        player.play()
     }
 }
 

CLCollectionViewController/CLCollectionViewController.swift

@@ -26,7 +26,11 @@ class CLFrameController: CLController {
     }()
 
     private lazy var player: CLPlayer = {
-        let view = CLPlayer(frame: CGRect(x: 0, y: UIApplication.shared.statusBarFrame.size.height + navigationBarHeight + 50, width: view.bounds.width, height: view.bounds.width / (16.0 / 9.0))) { config in
+        let statusBarFrame = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .first(where: { $0.activationState == .foregroundActive })?
+            .statusBarManager?.statusBarFrame.height ?? 0
+        let view = CLPlayer(frame: CGRect(x: 0, y: statusBarFrame + navigationBarHeight + 50, width: view.bounds.width, height: view.bounds.width / (16.0 / 9.0))) { config in
             config.videoGravity = .resizeAspectFill
             config.topBarHiddenStyle = .never
             config.isHiddenToolbarWhenStart = false

CLFrameController/CLFrameController.swift

@@ -161,8 +161,16 @@ extension CLHomeController {}
 private extension CLHomeController {
     func getAllowedAVPlayerFileExtensions() -> [String] {
         let avTypes = AVURLAsset.audiovisualTypes()
-        var avExtensions = avTypes.map { UTTypeCopyPreferredTagWithClass($0 as CFString, kUTTagClassFilenameExtension)?.takeRetainedValue() as String? ?? "" }
-        avExtensions = avExtensions.filter { !$0.isEmpty }
+        var avExtensions: [String] = []
+
+        for avFileType in avTypes {
+            let rawValue = avFileType.rawValue
+            if let utType = UTType(rawValue),
+               let ext = utType.preferredFilenameExtension
+            {
+                avExtensions.append(ext)
+            }
+        }
         return avExtensions
     }
 

CLHomeController/Controller/CLHomeController.swift

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'CLPlayer'
-  s.version      = '2.0.7'
+  s.version      = '2.0.8'
   s.summary      = 'Swift版自定义AVPlayer'
   s.description  = <<-DESC
                    CLPlayer是基于系统AVPlayer封装的视频播放器.
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
                    DESC
   s.homepage     = 'https://github.com/JmoVxia/CLPlayer'
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
-  s.authors      = {'JmoVxia' => '269968846@qq.com'}
+  s.authors      = {'JmoVxia' => 'JmoVxia@gmail.com'}
   s.social_media_url = 'https://github.com/JmoVxia'
   s.swift_versions = ['5.0']
   s.ios.deployment_target = '12.0'

CLPlayer.podspec

@@ -484,7 +484,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1300;
-				LastUpgradeCheck = 1540;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					5BA39B132727D147005059F5 = {
 						CreatedOnToolsVersion = 13.0;
@@ -573,10 +573,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CLPlayer/Pods-CLPlayer-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CLPlayer/Pods-CLPlayer-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CLPlayer/Pods-CLPlayer-resources.sh\"\n";
@@ -689,6 +693,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = 533J5B8T42;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -752,6 +757,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = 533J5B8T42;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -790,12 +796,13 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.CLPlayer.JmoVxia;
+				PRODUCT_BUNDLE_IDENTIFIER = com.CLPlayer.JmoVxia.CC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -819,12 +826,13 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.CLPlayer.JmoVxia;
+				PRODUCT_BUNDLE_IDENTIFIER = com.CLPlayer.JmoVxia.CC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

CLPlayer.xcodeproj/project.pbxproj

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CLPlayer.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

CLPlayer.xcodeproj/xcuserdata/caigetuxun.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "02A9FB44-ED1E-4CF8-9E92-912DD8B9EB0D"
+   type = "0"
+   version = "2.0">
+</Bucket>

CLPlayer.xcworkspace/xcuserdata/caigetuxun.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -22,13 +22,23 @@ extension CLAnimationTransitioning {
 }
 
 class CLAnimationTransitioning: NSObject {
-    private let keyWindow: UIWindow? = {
-        if #available(iOS 13.0, *) {
-            return UIApplication.shared.windows.filter { $0.isKeyWindow }.last
-        } else {
-            return UIApplication.shared.keyWindow
+    @discardableResult private func mainSync<T>(execute block: () -> T) -> T {
+        guard !Thread.isMainThread else { return block() }
+        return DispatchQueue.main.sync { block() }
+    }
+
+    private var keyWindow: UIWindow? {
+        mainSync {
+            if #available(iOS 13.0, *) {
+                UIApplication.shared.connectedScenes
+                    .compactMap { $0 as? UIWindowScene }
+                    .flatMap(\.windows)
+                    .first { $0.isKeyWindow }
+            } else {
+                UIApplication.shared.keyWindow
+            }
         }
-    }()
+    }
 
     private weak var playerView: CLPlayerView?
 
@@ -89,7 +99,6 @@ extension CLAnimationTransitioning: UIViewControllerAnimatedTransitioning {
                 toView.bounds = transitionContext.containerView.bounds
                 toView.center = transitionContext.containerView.center
                 transitionContext.completeTransition(true)
-                UIViewController.attemptRotationToDeviceOrientation()
             }
         } else {
             guard let parentStackView = parentStackView else { return }
@@ -114,7 +123,6 @@ extension CLAnimationTransitioning: UIViewControllerAnimatedTransitioning {
                 parentStackView.addArrangedSubview(playerView)
                 fromView.removeFromSuperview()
                 transitionContext.completeTransition(true)
-                UIViewController.attemptRotationToDeviceOrientation()
             }
         }
     }