Merge branch 'master' into dev/3.2.0

AgoraIO-Extensions · Dec 15, 2020 · da3222a · da3222a
2 parents 3a55997 + c8845fe
commit da3222a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/RtcSurfaceView.swift b/RtcSurfaceView.swift
@@ -18,36 +18,40 @@ class RtcSurfaceView: UIView {
     }()
     private weak var channel: AgoraRtcChannel?
 
+    func destroy() {
+        canvas.view = nil
+    }
+
     func setData(_ engine: AgoraRtcEngineKit, _ channel: AgoraRtcChannel?, _ uid: Int) {
         self.channel = channel
         canvas.channelId = channel?.getId()
         canvas.uid = UInt(uid)
         setupVideoCanvas(engine)
     }
-    
+
     func resetVideoCanvas(_ engine: AgoraRtcEngineKit) {
         let canvas = AgoraRtcVideoCanvas()
         canvas.view = nil
         canvas.renderMode = self.canvas.renderMode
         canvas.channelId = self.canvas.channelId
         canvas.uid = self.canvas.uid
         canvas.mirrorMode = self.canvas.mirrorMode
-        
+
         if canvas.uid == 0 {
             engine.setupLocalVideo(canvas)
         } else {
             engine.setupRemoteVideo(canvas)
         }
     }
-    
+
     private func setupVideoCanvas(_ engine: AgoraRtcEngineKit) {
         if canvas.uid == 0 {
             engine.setupLocalVideo(canvas)
         } else {
             engine.setupRemoteVideo(canvas)
         }
     }
-    
+
     func setRenderMode(_ engine: AgoraRtcEngineKit, _ renderMode: Int) {
         canvas.renderMode = AgoraVideoRenderMode(rawValue: UInt(renderMode))!
         setupRenderMode(engine)