修复图片内容填充模式

This commit is contained in:
bluesea 2024-04-08 17:38:40 +08:00
parent aef0834757
commit b22545fed0
4 changed files with 30 additions and 31 deletions

View File

@ -563,8 +563,8 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "567" startingLineNumber = "552"
endingLineNumber = "567" endingLineNumber = "552"
landmarkName = "navgationButtonClick2(sender:)" landmarkName = "navgationButtonClick2(sender:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@ -617,5 +617,21 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3BC11DCB-0980-4202-9671-1A0261773A2C"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "325"
endingLineNumber = "325"
landmarkName = "viewDidAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>

View File

@ -12,31 +12,29 @@ import AVKit
class ZZHExternalViewController: UIViewController { class ZZHExternalViewController: UIViewController {
var imageView: UIImageView? var imageView: UIImageView?
// var avplayerController:AVPlayerViewController?
// var player:AVPlayer?
var playerLayer:AVPlayerLayer? var playerLayer:AVPlayerLayer?
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
print("ZZHExternalViewController viewDidLoad..") print("ZZHExternalViewController viewDidLoad..")
imageView = UIImageView() imageView = UIImageView()
imageView?.image = UIImage(named: "externalScreenBg") imageView?.image = UIImage(named: "externalScreenBg")
imageView?.contentMode = .scaleAspectFill imageView?.contentMode = .scaleAspectFit
self.view .addSubview(imageView!) self.view .addSubview(imageView!)
imageView?.snp.makeConstraints({ make in imageView?.snp.makeConstraints({ make in
make.left.top.right.bottom.equalTo(0) make.left.top.right.bottom.equalTo(0)
}) })
// player = AVPlayer()
playerLayer = AVPlayerLayer() playerLayer = AVPlayerLayer()
playerLayer!.frame = self.view.bounds playerLayer!.frame = self.view.bounds
self.view.layer.addSublayer(playerLayer!) self.view.layer.addSublayer(playerLayer!)
//// player?.allowsExternalPlayback = true self.view.backgroundColor = .clear
//// player?.usesExternalPlaybackWhileExternalScreenIsActive = true }
// avplayerController = AVPlayerViewController()
// avplayerController?.player = player override func viewWillLayoutSubviews() {
// self.addChild(avplayerController!) super.viewWillLayoutSubviews()
// self.view.addSubview(avplayerController!.view)
// avplayerController!.view.frame = self.view.bounds print("bounds:\(self.view.bounds)")
print("frames:\(playerLayer!.frame)")
} }
} }

View File

@ -334,18 +334,6 @@ class CCSpatialVideoDisplayController: BaseController {
} }
} }
self.player?.play() 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: - //MARK: -
@ -427,16 +415,13 @@ class CCSpatialVideoDisplayController: BaseController {
let ws = us as! UIWindowScene let ws = us as! UIWindowScene
if ws.session.role.rawValue == "UIWindowSceneSessionRoleExternalDisplayNonInteractive"{ if ws.session.role.rawValue == "UIWindowSceneSessionRoleExternalDisplayNonInteractive"{
externalVC = ws.windows.first?.rootViewController as? ZZHExternalViewController externalVC = ws.windows.first?.rootViewController as? ZZHExternalViewController
if let evc = externalVC { if externalVC != nil {
if let ed = externalDispalylink { if let ed = externalDispalylink {
externalDispalylink?.invalidate() ed.invalidate()
externalDispalylink = nil
} }
externalDispalylink = ws.windows.first?.screen.displayLink(withTarget: self, selector: #selector(displayUpdate(caDisplayLink:))) externalDispalylink = ws.windows.first?.screen.displayLink(withTarget: self, selector: #selector(displayUpdate(caDisplayLink:)))
externalDispalylink?.add(to: RunLoop.main, forMode: RunLoop.Mode.common) externalDispalylink?.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
}
}
} }
} }