Skip to content

Commit f328b9c

Browse files
zhangqianzezhangqianze
committed
use pod instead of local copy agora sdk
1 parent a35d9ad commit f328b9c

5 files changed

Lines changed: 11 additions & 13 deletions

File tree

‎iOS/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.vscode
12
*.xcuserdata
23
*.DS_Store
34
*.xcscmblueprint

‎iOS/APIExample.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
03BCEC50244938C500ED7177 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03BCEC4F244938C500ED7177 /* BaseViewController.swift */; };
11-
03BCEC5524494ECC00ED7177 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03BCEC5424494ECC00ED7177 /* AgoraRtcKit.framework */; };
1211
03BCEC5824494F3A00ED7177 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03BCEC5724494F3A00ED7177 /* Accelerate.framework */; };
1312
03BCEC5A24494F4600ED7177 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03BCEC5924494F4600ED7177 /* AudioToolbox.framework */; };
1413
03BCEC5C24494F4F00ED7177 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03BCEC5B24494F4F00ED7177 /* AVFoundation.framework */; };
@@ -39,7 +38,6 @@
3938

4039
/* Begin PBXFileReference section */
4140
03BCEC4F244938C500ED7177 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
42-
03BCEC5424494ECC00ED7177 /* AgoraRtcKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AgoraRtcKit.framework; sourceTree = "<group>"; };
4341
03BCEC5724494F3A00ED7177 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
4442
03BCEC5924494F4600ED7177 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
4543
03BCEC5B24494F4F00ED7177 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
@@ -81,7 +79,6 @@
8179
03BCEC6B24494FC300ED7177 /* libc++.tbd in Frameworks */,
8280
03BCEC6224494F6500ED7177 /* CoreML.framework in Frameworks */,
8381
03BCEC6624494F7400ED7177 /* VideoToolbox.framework in Frameworks */,
84-
03BCEC5524494ECC00ED7177 /* AgoraRtcKit.framework in Frameworks */,
8582
03BCEC5824494F3A00ED7177 /* Accelerate.framework in Frameworks */,
8683
03BCEC5A24494F4600ED7177 /* AudioToolbox.framework in Frameworks */,
8784
03BCEC6824494F7A00ED7177 /* SystemConfiguration.framework in Frameworks */,
@@ -168,8 +165,7 @@
168165
03D13BD32448758900B599B3 /* ViewController.swift */,
169166
03BCEC4C244932E000ED7177 /* Examples */,
170167
03D13BFF24488F1E00B599B3 /* Common */,
171-
A7CA48BF2455315A00507435 /* Supporting Files */,
172-
03BCEC5424494ECC00ED7177 /* AgoraRtcKit.framework */,
168+
A7CA48BF2455315A00507435 /* Supporting Files */
173169
);
174170
path = APIExample;
175171
sourceTree = "<group>";

‎iOS/APIExample/Base.lproj/Main.storyboard‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HWc-eV-zrm">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HWc-eV-zrm">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
@@ -177,7 +177,7 @@
177177
<fontDescription key="fontDescription" type="system" pointSize="14"/>
178178
<textInputTraits key="textInputTraits"/>
179179
</textField>
180-
<textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="rtmp://vid-218.push.chinanetcenter.broadcastapp.agora.io/live/qwer" borderStyle="roundedRect" placeholder="Enter RTMP URL" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8Mz-FP-egY">
180+
<textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter RTMP URL" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8Mz-FP-egY">
181181
<rect key="frame" x="20" y="341" width="240" height="34"/>
182182
<fontDescription key="fontDescription" type="system" pointSize="14"/>
183183
<textInputTraits key="textInputTraits"/>
@@ -266,7 +266,7 @@
266266
<action selector="onJoin" destination="X1U-3n-3dG" eventType="touchUpInside" id="YcR-kW-mn0"/>
267267
</connections>
268268
</button>
269-
<textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="rtmp://vid-218.pull.chinanetcenter.broadcastapp.agora.io/live/qwer" borderStyle="roundedRect" placeholder="Enter RTMP URL" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="V9k-cL-4Yp">
269+
<textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter RTMP URL" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="V9k-cL-4Yp">
270270
<rect key="frame" x="20" y="351" width="230" height="34"/>
271271
<fontDescription key="fontDescription" type="system" pointSize="14"/>
272272
<textInputTraits key="textInputTraits"/>

‎iOS/APIExample/ViewController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class ViewController: UIViewController {
2727
MenuItem(name: "RTMP Streaming", controller: "RTMPStreaming"),
2828
MenuItem(name: "RTMP Injection", controller: "RTMPInjection")
2929
]),
30-
MenuSection(name: "Quality Metrics", rows: [
31-
MenuItem(name: "Lastmile Test", controller: "Lastmile"),
32-
MenuItem(name: "Realtime Stats", controller: "RealtimeStats")
33-
])
30+
// MenuSection(name: "Quality Metrics", rows: [
31+
// MenuItem(name: "Lastmile Test", controller: "Lastmile"),
32+
// MenuItem(name: "Realtime Stats", controller: "RealtimeStats")
33+
// ])
3434
]
3535

3636
override func viewDidLoad() {

‎iOS/Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ target 'APIExample' do
77

88
# Pods for APIExample
99
pod 'AGEVideoLayout'
10+
pod 'AgoraRtcEngine_iOS', '3.0.0'
1011
end

0 commit comments

Comments
 (0)