diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index 11a4b05..db70944 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -374,18 +374,6 @@ class CCSpatialVideoDisplayController: BaseController { override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) -// if self.player?.currentItem == nil {//此处需要判断是否为空:1,在didload的时候会设置一次,在viewDidDisappear的时候会被置空 -// let playerItem = self.getPlayerItem() -// self.player?.replaceCurrentItem(with: playerItem) -// } -// -// if self.externalVC != nil {//恢复外接屏幕的视频播放 -// if self.externalVC?.playerLayer?.player == nil { -// self.activeSession() -// self.externalVC?.playerLayer?.player = self.player -// } -// } -// self.player?.play() } //MARK: - 监听设备投流 @@ -451,9 +439,6 @@ class CCSpatialVideoDisplayController: BaseController { link = true isPlaying = true -// let playerItem = self.getPlayerItem() -// player?.replaceCurrentItem(with: playerItem) - print("外接屏幕已连接.....") // activeSession() @@ -501,8 +486,6 @@ class CCSpatialVideoDisplayController: BaseController { //当外接屏幕断开时 func dealTaskWhenExternalScreenDisConnect(){ print("外接屏幕已断开.....") -// let playerItem = self.getPlayerItem() -// player?.replaceCurrentItem(with: playerItem) link = false isPlaying = false @@ -619,29 +602,13 @@ class CCSpatialVideoDisplayController: BaseController { if isPlaying {//结束串流 isPlaying = false if self.externalVC != nil { - externalVC?.playerLayer?.player = nil -// player?.pause() - customPlayer.play(false) releaseVideoComposition() - DispatchQueue.main.asyncAfter(deadline: .now()+0.15, execute: {[weak self] in -// let playerItem = self?.getPlayerItem() -// self?.player?.replaceCurrentItem(with: playerItem) -// self?.playerController?.player = self?.player -// self?.player?.play() - - }) - + customPlayer.recoveryPlayerLayer(otherLayer: (self.externalVC!.playerLayer)!) } } else {//开始串流 if self.externalVC != nil { -// self.playerController?.player = nil -// player?.pause() -// releaseVideoComposition() -// let playerItem = self.getPlayerItem() -// player?.replaceCurrentItem(with: playerItem) -// externalVC?.playerLayer?.player = player -// player?.play() + customPlayer.moveToOtherPlayerLayer(destLayer: self.externalVC!.playerLayer!) isPlaying = true } }