fix apiExample remaining issues

Author: xianing

iOS/APIExample/Examples/Advanced/MediaChannelRelay/MediaChannelRelay.swift

@@ -102,10 +102,11 @@ class MediaChannelRelayMain: BaseViewController {
         // 2. If app certificate is turned on at dashboard, token is needed
         // when joining channel. The channel name and uid used to calculate
         // the token has to match the ones used for channel join
-        let result = agoraKit.joinChannel(byToken: nil, channelId: channelName, info: nil, uid: 0) {[unowned self] (channel, uid, elapsed) -> Void in
-            self.isJoined = true
-            LogUtils.log(message: "Join \(channel) with uid \(uid) elapsed \(elapsed)ms", level: .info)
-        }
+        let option = AgoraRtcChannelMediaOptions()
+        option.publishCameraTrack = .of(true)
+        option.clientRoleType = .of((Int32)(AgoraClientRole.broadcaster.rawValue))
+        
+        let result = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: 0, mediaOptions: option)
         if result != 0 {
             // Usually happens with invalid parameters
             // Error code description can be found at:
@@ -143,8 +144,6 @@ class MediaChannelRelayMain: BaseViewController {
     override func willMove(toParent parent: UIViewController?) {
         if parent == nil {
             // leave channel when exiting the view
-            // deregister packet processing
-            AgoraCustomEncryption.deregisterPacketProcessing(agoraKit)
             if isJoined {
                 agoraKit.leaveChannel { (stats) -> Void in
                     LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
@@ -238,4 +237,9 @@ extension MediaChannelRelayMain: AgoraRtcEngineDelegate {
     func rtcEngine(_ engine: AgoraRtcEngineKit, didReceive event: AgoraChannelMediaRelayEvent) {
         LogUtils.log(message: "didReceiveRelayEvent: \(event.rawValue)", level: .info)
     }
+    
+    func rtcEngine(_ engine: AgoraRtcEngineKit, didJoinChannel channel: String, withUid uid: UInt, elapsed: Int) {
+        self.isJoined = true
+        LogUtils.log(message: "Join \(channel) with uid \(uid) elapsed \(elapsed)ms", level: .info)
+    }
 }

iOS/APIExample/Examples/Advanced/MediaPlayer/Base.lproj/MediaPlayer.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -91,7 +91,7 @@
                                     <action selector="doOpenMediaUrlWithSender:" destination="jxp-ZN-2yG" eventType="touchUpInside" id="vVg-Wv-87g"/>
                                 </connections>
                             </button>
-                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" continuous="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qN0-s6-ZGP">
+                            <slider opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" continuous="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qN0-s6-ZGP">
                                 <rect key="frame" x="18" y="564" width="334.5" height="31"/>
                                 <connections>
                                     <action selector="doSeekWithSender:" destination="jxp-ZN-2yG" eventType="valueChanged" id="pnh-Up-W0k"/>

iOS/APIExample/Examples/Advanced/MediaPlayer/MediaPlayer.swift

@@ -9,8 +9,8 @@ import UIKit
 import AGEVideoLayout
 import AgoraRtcKit
 
-//TODO
-//#if false
+let CAMERA_UID = UInt.random(in: 1001...2000)
+let PLAYER_UID = UInt.random(in: 2001...3000)
 
 class MediaPlayerEntry : UIViewController
 {
@@ -51,6 +51,8 @@ class MediaPlayerMain: BaseViewController, UITextFieldDelegate {
 
     var agoraKit: AgoraRtcEngineKit!
     var mediaPlayerKit: AgoraRtcMediaPlayerProtocol!
+    var connectionId1:UInt?
+    var connectionId2:UInt?
 
     private var originY: CGFloat = 0
 
@@ -126,7 +128,7 @@ class MediaPlayerMain: BaseViewController, UITextFieldDelegate {
         // prepare media player
         mediaPlayerKit = agoraKit.createMediaPlayer(with: self)
         mediaPlayerKit.setView(localVideo.videoView)
-//        mediaPlayerKit.setRenderMode(.fit)
+        mediaPlayerKit.setRenderMode(.fit)
 
         playoutVolume.minimumValue = 0
         playoutVolume.maximumValue = 400
@@ -146,28 +148,29 @@ class MediaPlayerMain: BaseViewController, UITextFieldDelegate {
         let option1 = AgoraRtcChannelMediaOptions()
         option1.publishMediaPlayerVideoTrack = .of(true)
         option1.publishMediaPlayerAudioTrack = .of(true)
-        option1.publishAudioTrack = .of(true)
-        option1.autoSubscribeAudio = .of(true)
+        option1.publishAudioTrack = .of(false)
+        option1.autoSubscribeAudio = .of(false)
         option1.autoSubscribeVideo = .of(false)
         option1.clientRoleType = .of((Int32)(AgoraClientRole.broadcaster.rawValue))
         option1.publishMediaPlayerId = .of((Int32)(mediaPlayerKit.getMediaPlayerId()))
-        let connectionIdPointer = UnsafeMutablePointer<UInt>.allocate(capacity: MemoryLayout<UInt32>.stride)
-        let result1 = agoraKit.joinChannelEx(byToken: KeyCenter.Token, channelId: channelName, uid: 1001, connectionId: connectionIdPointer, delegate: self, mediaOptions: option1, joinSuccess: nil)
-        
+        let connectionIdPointer = UnsafeMutablePointer<UInt>.allocate(capacity: 200)
+        connectionId1 = UInt(connectionIdPointer.pointee)
+        let result1 = agoraKit.joinChannelEx(byToken: KeyCenter.Token, channelId: channelName, uid: PLAYER_UID, connectionId: connectionIdPointer, delegate: nil, mediaOptions: option1, joinSuccess: nil)
         let option2 = AgoraRtcChannelMediaOptions()
         option2.publishCameraTrack = .of(true)
-        option2.autoSubscribeAudio = .of(false)
-        option2.autoSubscribeVideo = .of(false)
+        option2.publishAudioTrack = .of(true)
+        option2.autoSubscribeAudio = .of(true)
+        option2.autoSubscribeVideo = .of(true)
         option2.clientRoleType = .of((Int32)(AgoraClientRole.broadcaster.rawValue))
-        let connectionIdPointer2 = UnsafeMutablePointer<UInt>.allocate(capacity: MemoryLayout<UInt32>.stride)
-        let result2 = agoraKit.joinChannelEx(byToken: KeyCenter.Token, channelId: channelName, uid: 1002, connectionId: connectionIdPointer2, delegate: self, mediaOptions: option2, joinSuccess: nil)
+        let result2 = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: CAMERA_UID, mediaOptions: option2, joinSuccess: nil)
         if result1 != 0 && result2 != 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: \(result1), please check your params")
         }
+        connectionIdPointer.deallocate()
     }
 
     @IBAction func doOpenMediaUrl(sender: UIButton) {
@@ -189,18 +192,11 @@ class MediaPlayerMain: BaseViewController, UITextFieldDelegate {
         mediaPlayerKit.pause()
     }
 
-    @IBAction func doSeek(sender: UISlider) {
-        //let position = Int(sender.value * Float(mediaPlayerKit.getDuration()))
-        //let result = mediaPlayerKit.seek(toPosition: position)
-    }
-    
     @IBAction func doAdjustPlayoutVolume(sender: UISlider) {
-        //AgoraRtcChannelPublishHelper.shareInstance().adjustPlayoutSignalVolume(Int32(Int(sender.value)))
         mediaPlayerKit.adjustPlayoutVolume(Int32(Int(sender.value)))
     }
 
     @IBAction func doAdjustPublishVolume(sender: UISlider) {
-        //AgoraRtcChannelPublishHelper.shareInstance().adjustPublishSignalVolume(Int32(Int(sender.value)))
         mediaPlayerKit.adjustPublishSignalVolume(Int32(Int(sender.value)))
     }
 
@@ -250,6 +246,9 @@ extension MediaPlayerMain: AgoraRtcEngineDelegate {
     /// @param uid uid of remote joined user
     /// @param elapsed time elapse since current sdk instance join the channel in ms
     func rtcEngine(_ engine: AgoraRtcEngineKit, didJoinedOfUid uid: UInt, elapsed: Int) {
+        if uid == CAMERA_UID || uid == PLAYER_UID {
+            return
+        }
         LogUtils.log(message: "remote user join: \(uid) \(elapsed)ms", level: .info)
 
         // Only one remote video view is available for this
@@ -294,7 +293,7 @@ extension MediaPlayerMain: AgoraRtcMediaPlayerDelegate {
             case .openCompleted:
                 let duration = weakself.mediaPlayerKit.getDuration()
                 weakself.playerControlStack.isHidden = false
-                weakself.playerDurationLabel.text = "\(String(format: "%02d", duration / 60)) : \(String(format: "%02d", duration % 60))"
+                weakself.playerDurationLabel.text = "\(String(format: "%02d", duration / 60000)) : \(String(format: "%02d", duration % 60000 / 1000))"
                 weakself.playerProgressSlider.setValue(0, animated: true)
                 break
             case .stopped:
@@ -308,12 +307,12 @@ extension MediaPlayerMain: AgoraRtcMediaPlayerDelegate {
     }
 
     func agoraRtcMediaPlayer(_ playerKit: AgoraRtcMediaPlayerProtocol, didChangedToPosition position: Int) {
-        let duration = Float(mediaPlayerKit.getDuration() * 1000)
+        let duration = Float(mediaPlayerKit.getDuration())
         var progress: Float = 0
         var left: Int = 0
         if duration > 0 {
-            progress = Float(mediaPlayerKit.getPosition()) / duration
-            left = Int((mediaPlayerKit.getDuration() * 1000 - mediaPlayerKit.getPosition()) / 1000)
+            progress = Float(position) / duration
+            left = Int((mediaPlayerKit.getDuration() - position)) / 1000
         }
         DispatchQueue.main.async {[weak self] in
             guard let weakself = self else { return }
@@ -324,5 +323,3 @@ extension MediaPlayerMain: AgoraRtcMediaPlayerDelegate {
         }
     }
 }
-
-//#endif