diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 7468d8d..32e4bae 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 9c301ba..1c88ba2 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -563,8 +563,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "567" - endingLineNumber = "567" + startingLineNumber = "552" + endingLineNumber = "552" landmarkName = "navgationButtonClick2(sender:)" landmarkType = "7"> @@ -617,5 +617,21 @@ landmarkType = "7"> + + + + diff --git a/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift b/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift index 87b2ccc..07a902a 100644 --- a/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift +++ b/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift @@ -12,31 +12,29 @@ import AVKit class ZZHExternalViewController: UIViewController { var imageView: UIImageView? -// var avplayerController:AVPlayerViewController? -// var player:AVPlayer? var playerLayer:AVPlayerLayer? override func viewDidLoad() { super.viewDidLoad() print("ZZHExternalViewController viewDidLoad..") imageView = UIImageView() imageView?.image = UIImage(named: "externalScreenBg") - imageView?.contentMode = .scaleAspectFill + imageView?.contentMode = .scaleAspectFit self.view .addSubview(imageView!) imageView?.snp.makeConstraints({ make in make.left.top.right.bottom.equalTo(0) }) -// player = AVPlayer() playerLayer = AVPlayerLayer() playerLayer!.frame = self.view.bounds self.view.layer.addSublayer(playerLayer!) -//// player?.allowsExternalPlayback = true -//// player?.usesExternalPlaybackWhileExternalScreenIsActive = true -// avplayerController = AVPlayerViewController() -// avplayerController?.player = player -// self.addChild(avplayerController!) -// self.view.addSubview(avplayerController!.view) -// avplayerController!.view.frame = self.view.bounds + self.view.backgroundColor = .clear + } + + override func viewWillLayoutSubviews() { + super.viewWillLayoutSubviews() + + print("bounds:\(self.view.bounds)") + print("frames:\(playerLayer!.frame)") } } diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index 2ebc763..5d71c83 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -334,18 +334,6 @@ class CCSpatialVideoDisplayController: BaseController { } } self.player?.play() -// else if self.playerController?.player { -// let playerItem = self.getPlayerItem() -// Task { -// print("ccs viewdid load ---------") -// await self.loadVideoAssetReader() -// DispatchQueue.main.async {[weak self] in -// self?.player?.replaceCurrentItem(with: playerItem) -// self?.player?.play() -// } -// } -// } - } //MARK: - 监听设备投流 @@ -427,16 +415,13 @@ class CCSpatialVideoDisplayController: BaseController { let ws = us as! UIWindowScene if ws.session.role.rawValue == "UIWindowSceneSessionRoleExternalDisplayNonInteractive"{ externalVC = ws.windows.first?.rootViewController as? ZZHExternalViewController - if let evc = externalVC { + if externalVC != nil { if let ed = externalDispalylink { - externalDispalylink?.invalidate() - externalDispalylink = nil + ed.invalidate() } externalDispalylink = ws.windows.first?.screen.displayLink(withTarget: self, selector: #selector(displayUpdate(caDisplayLink:))) externalDispalylink?.add(to: RunLoop.main, forMode: RunLoop.Mode.common) - - } - + } } }