|
|
|
|
@ -101,17 +101,19 @@ class VideoCallViewController: UIViewController {
|
|
|
|
|
sender.isSelected = minimized
|
|
|
|
|
onMinimize?(minimized)
|
|
|
|
|
|
|
|
|
|
self.videoMuteBtn.isHidden = minimized
|
|
|
|
|
self.micMuteBtn.isHidden = minimized
|
|
|
|
|
|
|
|
|
|
let min_ = minimized
|
|
|
|
|
UIView.animate(withDuration: 1) {
|
|
|
|
|
UIView.animate(withDuration: 0.5) {
|
|
|
|
|
self.actionsHeightConstraint.constant = min_ ? 30 : 60
|
|
|
|
|
self.localvideoTopMargin.constant = min_ ? 20 : 40
|
|
|
|
|
self.videoMuteBtn.isHidden = min_
|
|
|
|
|
self.micMuteBtn.isHidden = min_
|
|
|
|
|
|
|
|
|
|
let vdoBound = self.localVideo.bounds
|
|
|
|
|
self.publisher?.view?.frame = CGRect(x: 0, y: 0, width: vdoBound.size.width, height: vdoBound.size.height)
|
|
|
|
|
let localVdoSize = self.localVideo.bounds.size
|
|
|
|
|
let remoteVdoSize = self.remoteVideo.bounds.size
|
|
|
|
|
self.publisher?.view?.frame = CGRect(x: 0, y: 0, width: localVdoSize.width, height: localVdoSize.height)
|
|
|
|
|
self.subscriber?.view?.frame = CGRect(x: 0, y: 0, width: remoteVdoSize.width, height: remoteVdoSize.height)
|
|
|
|
|
self.publisher?.view?.layoutIfNeeded()
|
|
|
|
|
self.subscriber?.view?.layoutIfNeeded()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -324,14 +326,8 @@ class VideoCallViewController: UIViewController {
|
|
|
|
|
extension VideoCallViewController: OTSessionDelegate {
|
|
|
|
|
|
|
|
|
|
func sessionDidConnect(_ session: OTSession) {
|
|
|
|
|
print("The client connected to the OpenTok session.")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: (#selector(VideoCallViewController.updateTimer)), userInfo: nil, repeats: true)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
print("The client connected to the OpenTok session.")
|
|
|
|
|
timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: (#selector(VideoCallViewController.updateTimer)), userInfo: nil, repeats: true)
|
|
|
|
|
setupPublisher()
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
@ -373,27 +369,23 @@ extension VideoCallViewController: OTSessionDelegate {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func session(_ session: OTSession, streamCreated stream: OTStream) {
|
|
|
|
|
subscriber = OTSubscriber(stream: stream, delegate: self)
|
|
|
|
|
guard let subscriber = subscriber else {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
subscriber = OTSubscriber(stream: stream, delegate: self)
|
|
|
|
|
guard let subscriber = subscriber else {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var error: OTError?
|
|
|
|
|
session.subscribe(subscriber, error: &error)
|
|
|
|
|
guard error == nil else {
|
|
|
|
|
print(error!)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
var error: OTError?
|
|
|
|
|
session.subscribe(subscriber, error: &error)
|
|
|
|
|
guard error == nil else {
|
|
|
|
|
print(error!)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
guard let subscriberView = subscriber.view else {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
subscriberView.frame = UIScreen.main.bounds
|
|
|
|
|
view.insertSubview(subscriberView, at: 0)
|
|
|
|
|
|
|
|
|
|
// if nil == subscriber {
|
|
|
|
|
// setupSubscribe(stream)
|
|
|
|
|
// }
|
|
|
|
|
guard let subscriberView = subscriber.view else {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
subscriberView.frame = CGRect(x: 0, y: 0, width: remoteVideo.bounds.width, height: remoteVideo.bounds.height)
|
|
|
|
|
remoteVideo.addSubview(subscriberView)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func setupSubscribe(_ stream: OTStream?) {
|
|
|
|
|
|