修复图片内容填充模式
This commit is contained in:
parent
aef0834757
commit
b22545fed0
Binary file not shown.
@ -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">
|
||||
</BreakpointContent>
|
||||
@ -617,5 +617,21 @@
|
||||
landmarkType = "7">
|
||||
</BreakpointContent>
|
||||
</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>
|
||||
</Bucket>
|
||||
|
||||
@ -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)")
|
||||
}
|
||||
}
|
||||
|
||||
@ -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)
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user