fix 屏幕共享模块看不到远端用户流的问题

Author: zhaoyongqiang

iOS/APIExample/APIExample/Examples/Advanced/ScreenShare/ScreenShare.swift

@@ -30,7 +30,9 @@ class ScreenShareEntry : UIViewController
         guard let newViewController = storyBoard.instantiateViewController(withIdentifier: identifier) as? BaseViewController else {return}
         newViewController.title = channelName
         newViewController.configs = ["channelName":channelName]
-        self.navigationController?.pushViewController(newViewController, animated: true)
+        NetworkManager.shared.generateToken(channelName: channelName, uid: SCREEN_SHARE_UID) {
+            self.navigationController?.pushViewController(newViewController, animated: true)
+        }
     }
 }
 
@@ -61,22 +63,9 @@ class ScreenShareMain: BaseViewController {
         option.clientRoleType = GlobalSettings.shared.getUserRole()
         option.publishCameraTrack = true
         option.publishMicrophoneTrack = true
-        option.autoSubscribeAudio = true
-        option.autoSubscribeVideo = true
-        return option
-    }()
-    private lazy var screenOption: AgoraRtcChannelMediaOptions = {
-        let option = AgoraRtcChannelMediaOptions()
-        option.clientRoleType = .broadcaster
-        option.publishCameraTrack = false
-        option.publishMicrophoneTrack = false
-        option.publishScreenCaptureAudio = true
-        option.publishScreenCaptureVideo = true
         return option
     }()
 
-    private let screenShareId = SCREEN_SHARE_UID
-    private let screenShareBroadcasterId = SCREEN_SHARE_BROADCASTER_UID
     private var systemBroadcastPicker: RPSystemBroadcastPickerView?
 
     // indicate if current instance has joined channel
@@ -100,6 +89,10 @@ class ScreenShareMain: BaseViewController {
         config.channelProfile = .liveBroadcasting
         agoraKit = AgoraRtcEngineKit.sharedEngine(with: config, delegate: self)
         agoraKit.setLogFile(LogUtils.sdkLogPath())
+
+        // get channel name from configs
+        guard let channelName = configs["channelName"] as? String else {return}
+        
 
         // make myself a broadcaster
         agoraKit.setClientRole(GlobalSettings.shared.getUserRole())
@@ -130,23 +123,16 @@ class ScreenShareMain: BaseViewController {
         // when joining channel. The channel name and uid used to calculate
         // the token has to match the ones used for channel join
 
-        joinChannel(uid: screenShareId, option: option)
-    }
-    
-    private func joinChannel(uid: UInt, option: AgoraRtcChannelMediaOptions) {
-        guard let channelName = configs["channelName"] as? String else {return}
-        let connection = AgoraRtcConnection()
-        connection.channelId = channelName
-        connection.localUid = uid
-        NetworkManager.shared.generateToken(channelName: channelName, uid: uid) { token in
-            let result = self.agoraKit.joinChannelEx(byToken: token, connection: connection, delegate: self, mediaOptions: option, joinSuccess: nil)
-            if result != 0 {
-                // Usually happens with invalid parameters
-                // Error code description can be found at:
-                // en: https://docs.agora.io/en/Voice/API%20Reference/oc/Constants/AgoraErrorCode.html
-                // cn: https://docs.agora.io/cn/Voice/API%20Reference/oc/Constants/AgoraErrorCode.html
-                self.showAlert(title: "Error", message: "joinChannel call failed: \(result), please check your params")
-            }
+
+        let result = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: SCREEN_SHARE_UID, mediaOptions: option)
+        agoraKit.muteRemoteAudioStream(UInt(SCREEN_SHARE_BROADCASTER_UID), mute: true)
+        agoraKit.muteRemoteVideoStream(UInt(SCREEN_SHARE_BROADCASTER_UID), mute: true)
+        if result != 0 {
+            // Usually happens with invalid parameters
+            // Error code description can be found at:
+            // en: https://docs.agora.io/en/Voice/API%20Reference/oc/Constants/AgoraErrorCode.html
+            // cn: https://docs.agora.io/cn/Voice/API%20Reference/oc/Constants/AgoraErrorCode.html
+            self.showAlert(title: "Error", message: "joinChannel call failed: \(result), please check your params")
         }
     }
 
@@ -194,48 +180,34 @@ class ScreenShareMain: BaseViewController {
     override func willMove(toParent parent: UIViewController?) {
         if parent == nil {
             // leave channel when exiting the view
+            // deregister packet processing
             if isJoined {
-                guard let channelName = configs["channelName"] as? String else {return}
                 agoraKit.disableAudio()
                 agoraKit.disableVideo()
-                let connection = AgoraRtcConnection()
-                connection.localUid = screenShareId
-                connection.channelId = channelName
-                agoraKit.leaveChannelEx(connection) { stats in
-                    LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
-                }
-                let screenConnection = AgoraRtcConnection()
-                screenConnection.localUid = UInt(screenShareBroadcasterId)
-                screenConnection.channelId = channelName
-                agoraKit.leaveChannelEx(screenConnection) { stats in
+                agoraKit.leaveChannel { (stats) -> Void in
                     LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
                 }
                 AgoraRtcEngineKit.destroy()
             }
         }
     }
     @IBAction func stopScreenCapture(_ sender: Any) {
-        guard let channelName = configs["channelName"] as? String else {return}
         agoraKit.stopScreenCapture()
-        screenOption.publishCustomVideoTrack = false
-        agoraKit.updateChannel(with: screenOption)
-        let screenConnection = AgoraRtcConnection()
-        screenConnection.localUid = UInt(screenShareBroadcasterId)
-        screenConnection.channelId = channelName
-        agoraKit.leaveChannelEx(screenConnection) { stats in
-            LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
-        }
+        option.publishScreenCaptureVideo = false
+        option.publishCameraTrack = true
+        agoraKit.updateChannel(with: option)
     }
     @IBAction func startScreenCapture(_ sender: Any) {
-        prepareSystemBroadcaster()
         agoraKit.startScreenCapture(screenParams)
-        
+        option.publishScreenCaptureVideo = true
+        option.publishCameraTrack = false
+        agoraKit.updateChannel(with: option)
+        prepareSystemBroadcaster()
         guard let picker = systemBroadcastPicker else { return }
         for view in picker.subviews where view is UIButton {
             (view as? UIButton)?.sendActions(for: .allEvents)
             break
         }
-        joinChannel(uid: UInt(screenShareBroadcasterId), option: screenOption)
     }
     @IBAction func updateScreenCapture(_ sender: Any) {
 
@@ -282,11 +254,6 @@ extension ScreenShareMain: AgoraRtcEngineDelegate {
     func rtcEngine(_ engine: AgoraRtcEngineKit, didJoinedOfUid uid: UInt, elapsed: Int) {
         LogUtils.log(message: "remote user join: \(uid) \(elapsed)ms", level: .info)
 
-        if isScreenShareUid(uid: uid) {
-            LogUtils.log(message: "Ignore screen share uid", level: .info)
-            return
-        }
-        
         // Only one remote video view is available for this
         // tutorial. Here we check if there exists a surface
         // view tagged as this uid.
@@ -339,21 +306,4 @@ extension ScreenShareMain: AgoraRtcEngineDelegate {
     func rtcEngine(_ engine: AgoraRtcEngineKit, remoteAudioStats stats: AgoraRtcRemoteAudioStats) {
         remoteVideo.statsInfo?.updateAudioStats(stats)
     }
-    
-    func rtcEngine(_ engine: AgoraRtcEngineKit, localVideoStateChangedOf state: AgoraVideoLocalState, error: AgoraLocalVideoStreamError, sourceType: AgoraVideoSourceType) {
-        
-        print("state == \(state)  error == \(error)")
-        switch (sourceType, state) {
-        case (.screen, .capturing):
-            print("屏幕共享开始")
-
-        case (.screen, .stopped):
-            print("屏幕共享停止")
-
-        case (.screen, .failed):
-            print("断开连接")
-        
-        default: break
-        }
-    }
 }