修复GCD定时器引起的bug

Author: JmoVxia

CLCollectionViewController/CLCollectionViewController.swift

@@ -27,7 +27,7 @@ class CLCollectionViewController: CLController {
     deinit {}
 
     private lazy var collectionView: UICollectionView = {
-        let width = (view.bounds.width - 30) * 0.5
+        let width = (view.bounds.width - 20)
         let layout = UICollectionViewFlowLayout()
         layout.minimumLineSpacing = 10
         layout.minimumInteritemSpacing = 10

CLHomeController/Controller/CLHomeController.swift

@@ -5,6 +5,8 @@
 //  Created by Chen JmoVxia on 2021/10/26.
 //
 
+import AVFoundation
+import MobileCoreServices
 import SnapKit
 import UIKit
 
@@ -58,6 +60,7 @@ extension CLHomeController {
         initUI()
         makeConstraints()
         initData()
+        print("本框架基于AVPlayer封装，支持格式：\n\(getAllowedAVPlayerFileExtensions())")
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -156,6 +159,13 @@ extension CLHomeController {}
 // MARK: - JmoVxia---私有方法
 
 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 }
+        return avExtensions
+    }
+
     func pushToFrame() {
         navigationController?.pushViewController(CLFrameController(), animated: true)
     }

CLPlayer.xcodeproj/project.pbxproj

@@ -483,7 +483,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1300;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1540;
 				TargetAttributes = {
 					5BA39B132727D147005059F5 = {
 						CreatedOnToolsVersion = 13.0;
@@ -771,8 +771,7 @@
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -801,8 +800,7 @@
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

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

@@ -7,7 +7,7 @@
 		<key>CLPlayer.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>

CLPlayer/CLFullScreenController/CLAnimationTransitioning.swift

@@ -53,7 +53,7 @@ class CLAnimationTransitioning: NSObject {
 
 extension CLAnimationTransitioning: UIViewControllerAnimatedTransitioning {
     func transitionDuration(using _: UIViewControllerContextTransitioning?) -> TimeInterval {
-        return 0.25
+        return 0.35
     }
 
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
@@ -106,7 +106,6 @@ extension CLAnimationTransitioning: UIViewControllerAnimatedTransitioning {
                 playView.contentView.setNeedsLayout()
                 playView.contentView.layoutIfNeeded()
             }) { _ in
-                toView.transform = .identity
                 transitionContext.completeTransition(true)
                 UIViewController.attemptRotationToDeviceOrientation()
             }
@@ -122,15 +121,12 @@ extension CLAnimationTransitioning: UIViewControllerAnimatedTransitioning {
 
             transitionContext.containerView.addSubview(toView)
             transitionContext.containerView.addSubview(fromView)
-            fromView.addSubview(playView)
 
             fromView.snp.remakeConstraints { make in
                 make.center.equalTo(fromCenter)
                 make.size.equalTo(fromSize)
             }
-            playView.snp.remakeConstraints { make in
-                make.edges.equalToSuperview()
-            }
+
             transitionContext.containerView.setNeedsLayout()
             transitionContext.containerView.layoutIfNeeded()
 
@@ -150,8 +146,8 @@ extension CLAnimationTransitioning: UIViewControllerAnimatedTransitioning {
                 playView.contentView.layoutIfNeeded()
             }) { _ in
                 fromView.transform = .identity
-                parentView.addArrangedSubview(playView)
                 fromView.removeFromSuperview()
+                parentView.addArrangedSubview(playView)
                 transitionContext.completeTransition(true)
                 UIViewController.attemptRotationToDeviceOrientation()
             }

CLPlayer/CLGCDTimer.swift

@@ -8,24 +8,24 @@
 import UIKit
 
 class CLGCDTimer: NSObject {
-    public enum State {
+    public enum TimerState {
         case suspended
         case resumed
     }
 
     /// 执行时间
     public private(set) var interval: TimeInterval!
-    /// 延迟时间
-    public private(set) var delaySecs: TimeInterval!
+    /// 第一次执行延迟时间延迟时间
+    public private(set) var initialDelay: TimeInterval!
     /// 队列
-    public private(set) var serialQueue: DispatchQueue!
+    public private(set) var queue: DispatchQueue!
     /// 定时器
     public private(set) var timer: DispatchSourceTimer!
-    /// 是否正在运行
-    public private(set) var state: State = .suspended
-    /// 响应次数
-    public private(set) var actionTimes = Int.zero
-    /// 响应
+    /// 运行状态
+    public private(set) var state: TimerState = .suspended
+    /// 执行次数
+    public private(set) var numberOfActions = Int.zero
+    /// 响应回调
     public private(set) var eventHandler: ((Int) -> Void)?
 
     /// 创建定时器
@@ -37,19 +37,19 @@ class CLGCDTimer: NSObject {
     ///   - repeats: 是否重复执行，默认true
     ///   - action: 响应
     public init(interval: TimeInterval,
-                delaySecs: TimeInterval = 0,
+                initialDelay: TimeInterval = 0,
                 queue: DispatchQueue = .main)
     {
         super.init()
         self.interval = interval
-        self.delaySecs = delaySecs
-        serialQueue = queue
-        timer = DispatchSource.makeTimerSource(queue: serialQueue)
-        timer.schedule(deadline: .now() + delaySecs, repeating: interval)
+        self.initialDelay = initialDelay
+        self.queue = queue
+        timer = DispatchSource.makeTimerSource(queue: queue)
+        timer.schedule(deadline: .now() + initialDelay, repeating: interval)
         timer.setEventHandler { [weak self] in
             guard let self = self else { return }
-            self.actionTimes += 1
-            self.eventHandler?(self.actionTimes)
+            self.numberOfActions += 1
+            self.eventHandler?(self.numberOfActions)
         }
     }
 
@@ -63,13 +63,13 @@ class CLGCDTimer: NSObject {
 
 extension CLGCDTimer {
     /// 开始
-    public func start(_ handler: @escaping ((_ count: Int) -> Void)) {
+    public func run(_ handler: @escaping ((_ numberOfActions: Int) -> Void)) {
         eventHandler = handler
         resume()
     }
 
     /// 暂停
-    public func suspend() {
+    public func pause() {
         guard let timer = timer else { return }
         guard state != .suspended else { return }
         state = .suspended

CLPlayer/CLPlayerContentView/CLPlayerContentView.swift

@@ -612,8 +612,8 @@ private extension CLPlayerContentView {
     }
 
     func autoFadeOutTooView() {
-        autoFadeOutTimer = CLGCDTimer(interval: 0, delaySecs: 0.25 + config.autoFadeOut)
-        autoFadeOutTimer?.start { [weak self] _ in
+        autoFadeOutTimer = CLGCDTimer(interval: 0, initialDelay: 0.25 + config.autoFadeOut)
+        autoFadeOutTimer?.run { [weak self] _ in
             self?.hiddenToolView()
         }
     }

CLPlayer/CLPlayerView.swift

@@ -224,7 +224,7 @@ private extension CLPlayerView {
         currentDuration = totalDuration
         playbackProgress = 1.0
         contentView.playState = .ended
-        sliderTimer?.suspend()
+        sliderTimer?.pause()
         DispatchQueue.main.async {
             self.playToEndHandler?()
         }
@@ -269,7 +269,7 @@ private extension CLPlayerView {
             totalDuration = TimeInterval(playerItem.duration.value) / TimeInterval(playerItem.duration.timescale)
 
             sliderTimer = CLGCDTimer(interval: 0.1)
-            sliderTimer?.start { [weak self] _ in
+            sliderTimer?.run { [weak self] _ in
                 self?.sliderTimerAction()
             }
 
@@ -323,13 +323,13 @@ private extension CLPlayerView {
         guard contentView.playState != .failed else { return }
 
         player?.pause()
-        sliderTimer?.suspend()
-        bufferTimer = nil
+        sliderTimer?.pause()
 
         contentView.playState = .buffering
-        bufferTimer = CLGCDTimer(interval: 0, delaySecs: 3.0)
-        bufferTimer?.start { [weak self] _ in
+        bufferTimer = CLGCDTimer(interval: 3.0, initialDelay: 3.0)
+        bufferTimer?.run { [weak self] _ in
             guard let playerItem = self?.playerItem else { return }
+            self?.bufferTimer = nil
             if playerItem.isPlaybackLikelyToKeepUp {
                 self?.play()
             } else {
@@ -351,17 +351,19 @@ private extension CLPlayerView {
 
 private extension CLPlayerView {
     func dismiss() {
+        guard Thread.isMainThread else { return DispatchQueue.main.async { self.dismiss() } }
         guard contentView.screenState == .fullScreen else { return }
         guard let controller = fullScreenController else { return }
         contentView.screenState = .animating
         controller.dismiss(animated: true, completion: {
             self.contentView.screenState = .small
+            self.fullScreenController = nil
+            UIViewController.attemptRotationToDeviceOrientation()
         })
-        fullScreenController = nil
-        UIViewController.attemptRotationToDeviceOrientation()
     }
 
     func presentWithOrientation(_ orientation: CLAnimationTransitioning.CLAnimationOrientation) {
+        guard Thread.isMainThread else { return DispatchQueue.main.async { self.presentWithOrientation(orientation) } }
         guard superview != nil else { return }
         guard fullScreenController == nil else { return }
         guard contentView.screenState == .small else { return }
@@ -404,6 +406,7 @@ extension CLPlayerView {
         player?.rate = rate
         sliderTimer?.resume()
         waitReadyToPlayState = .nomal
+        bufferTimer = nil
     }
 
     func pause() {
@@ -413,7 +416,7 @@ extension CLPlayerView {
         }
         contentView.playState = .pause
         player?.pause()
-        sliderTimer?.suspend()
+        sliderTimer?.pause()
         bufferTimer = nil
         waitReadyToPlayState = .nomal
     }

Podfile

@@ -9,6 +9,7 @@ target 'CLPlayer' do
     inhibit_all_warnings!
     pod 'SnapKit'
     pod 'SwiftFormat/CLI'
+    pod 'LookinServer', :subspecs => ['Swift'], :configurations => ['Debug']
 end
 
 post_install do |installer|

Podfile.lock

@@ -1,20 +1,26 @@
 PODS:
+  - LookinServer/Core (1.2.4)
+  - LookinServer/Swift (1.2.4):
+    - LookinServer/Core
   - SnapKit (5.6.0)
   - SwiftFormat/CLI (0.52.8)
 
 DEPENDENCIES:
+  - LookinServer/Swift
   - SnapKit
   - SwiftFormat/CLI
 
 SPEC REPOS:
   https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git:
+    - LookinServer
     - SnapKit
     - SwiftFormat
 
 SPEC CHECKSUMS:
+  LookinServer: 00c7588043ed8e7ab64ce55b9fb747e51371ad06
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
   SwiftFormat: e60dbe6a704faf75f3089744e5f508aae0be4ad5
 
-PODFILE CHECKSUM: c0c00e0561d0fe1bf93e289b8b78eeeded153d95
+PODFILE CHECKSUM: ef8371675a67d45b1e997f6d8c113acea73d85d7
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2