添加私有化环境

Author: zhaoyongqiang

iOS/APIExample/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HWc-eV-zrm">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HWc-eV-zrm">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
         <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"/>
@@ -153,7 +153,7 @@
                         <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SliderCell" id="G0g-5t-oRK" customClass="SettingsSliderCell" customModule="APIExample" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="55.5" width="414" height="54.5"/>
+                                <rect key="frame" x="0.0" y="49.5" width="414" height="54.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="G0g-5t-oRK" id="8Yv-dJ-Q4d">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="54.5"/>
@@ -203,7 +203,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="LabelCell" id="YOS-Tx-FSj" userLabel="LabelCell" customClass="SettingsLabelCell" customModule="APIExample" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="110" width="414" height="54.5"/>
+                                <rect key="frame" x="0.0" y="104" width="414" height="54.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YOS-Tx-FSj" id="Ezh-hI-UFS">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="54.5"/>
@@ -245,7 +245,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SelectCell" id="wPb-Hp-Lzk" customClass="SettingsSelectCell" customModule="APIExample" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="164.5" width="414" height="54.5"/>
+                                <rect key="frame" x="0.0" y="158.5" width="414" height="54.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="wPb-Hp-Lzk" id="xjH-Qx-gt4">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="54.5"/>
@@ -285,6 +285,42 @@
                                     <outlet property="settingLabel" destination="2VP-yo-86d" id="wP7-Pr-xuR"/>
                                 </connections>
                             </tableViewCell>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="TextFieldCell" rowHeight="54" id="dKe-Yn-syX" customClass="SettingsTextFieldCell" customModule="APIExample">
+                                <rect key="frame" x="0.0" y="213" width="414" height="54"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dKe-Yn-syX" id="caI-Wb-ziH">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="54"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PkZ-75-gY9">
+                                            <rect key="frame" x="20" y="17" width="41.5" height="20.5"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FFZ-yf-YVJ">
+                                            <rect key="frame" x="244" y="7" width="150" height="40"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="150" id="oYE-kK-axs"/>
+                                                <constraint firstAttribute="height" constant="40" id="sMf-gS-pKE"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <textInputTraits key="textInputTraits"/>
+                                        </textField>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="FFZ-yf-YVJ" firstAttribute="centerY" secondItem="caI-Wb-ziH" secondAttribute="centerY" id="IK5-ZJ-Hgg"/>
+                                        <constraint firstItem="PkZ-75-gY9" firstAttribute="leading" secondItem="caI-Wb-ziH" secondAttribute="leading" constant="20" symbolic="YES" id="RqQ-37-XIE"/>
+                                        <constraint firstItem="PkZ-75-gY9" firstAttribute="centerY" secondItem="caI-Wb-ziH" secondAttribute="centerY" id="aq1-iv-FeM"/>
+                                        <constraint firstAttribute="trailing" secondItem="FFZ-yf-YVJ" secondAttribute="trailing" constant="20" symbolic="YES" id="cF2-LQ-ZVD"/>
+                                        <constraint firstItem="FFZ-yf-YVJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="PkZ-75-gY9" secondAttribute="trailing" constant="8" symbolic="YES" id="pJC-qF-Yqs"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="settingLabel" destination="PkZ-75-gY9" id="cov-1k-Sme"/>
+                                    <outlet property="textField" destination="FFZ-yf-YVJ" id="vgc-nX-czp"/>
+                                </connections>
+                            </tableViewCell>
                         </prototypes>
                         <connections>
                             <outlet property="dataSource" destination="Ey4-v0-GaJ" id="Wg1-iY-w0o"/>

iOS/APIExample/Common/Settings/SettingsCells.swift

@@ -55,6 +55,45 @@ class SettingsSliderCell : SettingsBaseCell
     }
 }
 
+class SettingsTextFieldParam: SettingsBaseParam {
+    var value:String
+    weak var context:UIViewController?;
+    init(key:String, label:String, context: UIViewController) {
+        self.context = context
+        self.value = label
+        super.init(key: key, label: label, type: "TextFieldCell")
+    }
+}
+
+class SettingsTextFieldCell : SettingsBaseCell
+{
+    
+    @IBOutlet weak var settingLabel: UILabel!
+    @IBOutlet weak var textField: UITextField!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        textField.placeholder = "Please enter".localized
+        textField.addTarget(self, action: #selector(textValueChange(sender:)), for: .editingChanged)
+    }
+    
+    override func configure(configs: SettingsBaseParam) {
+        super.configure(configs: configs)
+        
+        guard let param = configs as? SettingsTextFieldParam else {return}
+        settingLabel.text = param.label
+        if let ip = UserDefaults.standard.string(forKey: "private") {
+            textField.text = ip
+        }
+    }
+    
+    @objc
+    private func textValueChange(sender: UITextField) {
+        guard let configs = self.configs as? SettingsTextFieldParam else {return}
+        delegate?.didChangeValue(type: "TextFieldCell", key: configs.key, value: sender.text ?? "")
+    }
+}
+
 class SettingsSliderParam: SettingsBaseParam {
     var value:Float
     var minimumValue:Float

iOS/APIExample/Examples/Basic/JoinChannelVideo/JoinChannelVideo.swift

@@ -59,10 +59,20 @@ class JoinChannelVideoMain: BaseViewController {
         // setup log file path
         let logConfig = AgoraLogConfig()
         logConfig.level = .info
+        logConfig.filePath = LogUtils.sdkLogPath()
         config.logConfig = logConfig
 
         agoraKit = AgoraRtcEngineKit.sharedEngine(with: config, delegate: self)
 
+        // setup accessPointConfig
+        if let ip = UserDefaults.standard.string(forKey: "private") {
+            let accessPointConfig = AgoraLocalAccessPointConfiguration()
+            accessPointConfig.mode = .localOnly
+            accessPointConfig.ipList = [ip]
+            let result = agoraKit.setLocalAccessPoint(accessPointConfig)
+            print("result == \(result)")
+        }
+        
         // get channel name from configs
         guard let channelName = configs["channelName"] as? String,
               let resolution = GlobalSettings.shared.getSetting(key: "resolution")?.selectedOption().value as? CGSize,
@@ -72,9 +82,9 @@ class JoinChannelVideoMain: BaseViewController {
         // make myself a broadcaster
         agoraKit.setChannelProfile(.liveBroadcasting)
         agoraKit.setClientRole(.broadcaster)
-        
         // enable video module and set up video encoding configs
         agoraKit.enableVideo()
+        agoraKit.enableAudio()
         agoraKit.setVideoEncoderConfiguration(AgoraVideoEncoderConfiguration(size: resolution,
                 frameRate: fps,
                 bitrate: AgoraVideoBitrateStandard,
@@ -120,14 +130,12 @@ class JoinChannelVideoMain: BaseViewController {
         }
     }
 
-    override func willMove(toParent parent: UIViewController?) {
-        if parent == nil {
-            // leave channel when exiting the view
-            if isJoined {
-                agoraKit.leaveChannel { (stats) -> Void in
-                    LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
-                }
-            }
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        agoraKit.disableVideo()
+        agoraKit.disableAudio()
+        agoraKit.leaveChannel { (stats) -> Void in
+            LogUtils.log(message: "left channel, duration: \(stats.duration)", level: .info)
         }
     }
 }
@@ -228,4 +236,8 @@ extension JoinChannelVideoMain: AgoraRtcEngineDelegate {
     func rtcEngine(_ engine: AgoraRtcEngineKit, remoteAudioStats stats: AgoraRtcRemoteAudioStats) {
         remoteVideo.statsInfo?.updateAudioStats(stats)
     }
+    
+    func rtcEngine(_ engine: AgoraRtcEngineKit, didProxyConnected channel: String, withUid uid: UInt, proxyType: AgoraProxyType, localProxyIp: String, elapsed: Int) {
+        LogUtils.log(message: "channel == \(channel) proxyType == \(proxyType) localProxyIp == \(localProxyIp)", level: .info)
+    }
 }

iOS/APIExample/ViewController.swift

@@ -83,14 +83,15 @@ class ViewController: AGViewController {
         guard let settingsViewController = storyBoard.instantiateViewController(withIdentifier: "settings") as? SettingsViewController else { return }
 
         settingsViewController.settingsDelegate = self
-        settingsViewController.sectionNames = ["Video Configurations","Metadata"]
+        settingsViewController.sectionNames = ["Video Configurations","Metadata", "Private"]
         settingsViewController.sections = [
             [
                 SettingsSelectParam(key: "resolution", label:"Resolution".localized, settingItem: GlobalSettings.shared.getSetting(key: "resolution")!, context: self),
                 SettingsSelectParam(key: "fps", label:"Frame Rate".localized, settingItem: GlobalSettings.shared.getSetting(key: "fps")!, context: self),
                 SettingsSelectParam(key: "orientation", label:"Orientation".localized, settingItem: GlobalSettings.shared.getSetting(key: "orientation")!, context: self)
             ],
-            [SettingsLabelParam(key: "sdk_ver", label: "SDK Version", value: "v\(AgoraRtcEngineKit.getSdkVersion())")]
+            [SettingsLabelParam(key: "sdk_ver", label: "SDK Version", value: "v\(AgoraRtcEngineKit.getSdkVersion())")],
+            [SettingsTextFieldParam(key: "private", label: "Agora Local Access".localized, context: self)]
         ]
         self.navigationController?.pushViewController(settingsViewController, animated: true)
     }
@@ -146,6 +147,10 @@ extension ViewController: SettingsViewControllerDelegate {
         if(type == "SettingsSelectCell") {
             guard let setting = value as? SettingItem else {return}
             LogUtils.log(message: "select \(setting.selectedOption().label) for \(key)", level: .info)
+        }else if type == "TextFieldCell" {
+            LogUtils.log(message: "select \(value) for \(key)", level: .info)
+            UserDefaults.standard.set(value, forKey: key)
+            UserDefaults.standard.synchronize()
         }
     }
 }

iOS/APIExample/zh-Hans.lproj/Localizable.strings

@@ -135,3 +135,5 @@
 "Please insert headphones to experience the spatial audio effect" = "请插入耳机体验空间音效效果";
 "You will hear a piece of music, and after 10 seconds this piece of music will be played through spatial audio effects" = "你会听到一段音乐，10秒后这段音乐会通过空间音效的方式播放";
 "Now you can move the speaker icon to experience the spatial audio effect" = "现在您可以移动喇叭图标到不同的位置，体验空间音效效果";
+"Please enter" = "请输入";
+"Agora Local Access" = "私有化环境";

iOS/Podfile

@@ -6,12 +6,14 @@ target 'APIExample' do
 
   pod 'Floaty', '~> 4.2.0'  
   pod 'AGEVideoLayout', '~> 1.0.4'
-  pod 'AgoraRtcEngine_iOS', '3.7.0'
+#  pod 'AgoraRtcEngine_iOS', '3.7.0'
+  pod 'sdk', :path => 'sdk.podspec'
   pod 'AgoraMediaPlayer_iOS', '1.2.2'
 end
 
 target 'Agora-ScreenShare-Extension' do
   use_frameworks!
 
-  pod 'AgoraRtcEngine_iOS', '3.7.0'
+#  pod 'AgoraRtcEngine_iOS', '3.7.0'
+  pod 'sdk', :path => 'sdk.podspec'
 end