Skip to content

Commit cd310b3

Browse files
plutolessplutoless
authored
Merge pull request #100 from AgoraIO/dev/3.0.1
Dev/3.0.1
2 parents 9c9cf43 + a6fd6bf commit cd310b3

8 files changed

Lines changed: 80 additions & 116 deletions

File tree

‎OpenLive-Android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
implementation 'androidx.appcompat:appcompat:1.1.0'
3737
implementation 'androidx.recyclerview:recyclerview:1.0.0'
3838
implementation 'androidx.cardview:cardview:1.0.0'
39-
implementation 'io.agora.rtc:full-sdk:3.0.0'
39+
implementation 'io.agora.rtc:full-sdk:3.0.1'
4040

4141
testImplementation 'junit:junit:4.12'
4242
testImplementation 'org.mockito:mockito-core:1.10.19'

‎OpenLive-iOS-Objective-C/OpenLive.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
03F7A6BB246CFCE1007D61D9 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26E1238690720047E150 /* AgoraRtcKit.framework */; };
11+
03F7A6BC246CFCE1007D61D9 /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26E1238690720047E150 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1012
07D24CF81D866704002C69BF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 07D24CF71D866704002C69BF /* main.m */; };
1113
07D24CFB1D866704002C69BF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 07D24CFA1D866704002C69BF /* AppDelegate.m */; };
1214
07D24D011D866704002C69BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 07D24CFF1D866704002C69BF /* Main.storyboard */; };
@@ -20,20 +22,22 @@
2022
07D24D351D867644002C69BF /* VideoViewLayouter.m in Sources */ = {isa = PBXBuildFile; fileRef = 07D24D2D1D867644002C69BF /* VideoViewLayouter.m */; };
2123
07D24D361D867644002C69BF /* VideoSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 07D24D2F1D867644002C69BF /* VideoSession.m */; };
2224
38D618B8224A5FAE004A6C87 /* BeautyEffectTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D618B7224A5FAE004A6C87 /* BeautyEffectTableViewController.m */; };
23-
A76C26E2238690720047E150 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26E1238690720047E150 /* AgoraRtcKit.framework */; };
24-
A7733D7824079F3400483870 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7C50EF4212168BD00774322 /* Accelerate.framework */; };
25-
A7733D7924079F3900483870 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D24D1A1D8667F5002C69BF /* AudioToolbox.framework */; };
26-
A7733D7A24079F3E00483870 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D24D161D8667E7002C69BF /* VideoToolbox.framework */; };
27-
A7733D7B24079F4A00483870 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D24D1E1D866802002C69BF /* CoreMedia.framework */; };
28-
A7733D7C24079F4A00483870 /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 382885B42249DC390023BCFA /* CoreML.framework */; };
29-
A7733D7D24079F4A00483870 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D24D1C1D8667FB002C69BF /* CoreMotion.framework */; };
30-
A7733D7E24079F5000483870 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D24D201D866809002C69BF /* CoreTelephony.framework */; };
31-
A7733D7F24079F5400483870 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D24D141D8667DC002C69BF /* AVFoundation.framework */; };
32-
A7733D8024079F5A00483870 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D24D181D8667EC002C69BF /* libc++.tbd */; };
33-
A7733D8124079F6500483870 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D29C3B1E9E192A00C3583C /* libresolv.tbd */; };
34-
A7733D8224079F9A00483870 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 704E32D21FEB50A10027B6DB /* SystemConfiguration.framework */; };
3525
/* End PBXBuildFile section */
3626

27+
/* Begin PBXCopyFilesBuildPhase section */
28+
03F7A6BD246CFCE1007D61D9 /* Embed Frameworks */ = {
29+
isa = PBXCopyFilesBuildPhase;
30+
buildActionMask = 2147483647;
31+
dstPath = "";
32+
dstSubfolderSpec = 10;
33+
files = (
34+
03F7A6BC246CFCE1007D61D9 /* AgoraRtcKit.framework in Embed Frameworks */,
35+
);
36+
name = "Embed Frameworks";
37+
runOnlyForDeploymentPostprocessing = 0;
38+
};
39+
/* End PBXCopyFilesBuildPhase section */
40+
3741
/* Begin PBXFileReference section */
3842
07D24CF31D866704002C69BF /* OpenLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenLive.app; sourceTree = BUILT_PRODUCTS_DIR; };
3943
07D24CF71D866704002C69BF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -79,18 +83,7 @@
7983
isa = PBXFrameworksBuildPhase;
8084
buildActionMask = 2147483647;
8185
files = (
82-
A7733D7A24079F3E00483870 /* VideoToolbox.framework in Frameworks */,
83-
A76C26E2238690720047E150 /* AgoraRtcKit.framework in Frameworks */,
84-
A7733D7F24079F5400483870 /* AVFoundation.framework in Frameworks */,
85-
A7733D8124079F6500483870 /* libresolv.tbd in Frameworks */,
86-
A7733D7C24079F4A00483870 /* CoreML.framework in Frameworks */,
87-
A7733D7824079F3400483870 /* Accelerate.framework in Frameworks */,
88-
A7733D7E24079F5000483870 /* CoreTelephony.framework in Frameworks */,
89-
A7733D8024079F5A00483870 /* libc++.tbd in Frameworks */,
90-
A7733D7924079F3900483870 /* AudioToolbox.framework in Frameworks */,
91-
A7733D7B24079F4A00483870 /* CoreMedia.framework in Frameworks */,
92-
A7733D8224079F9A00483870 /* SystemConfiguration.framework in Frameworks */,
93-
A7733D7D24079F4A00483870 /* CoreMotion.framework in Frameworks */,
86+
03F7A6BB246CFCE1007D61D9 /* AgoraRtcKit.framework in Frameworks */,
9487
);
9588
runOnlyForDeploymentPostprocessing = 0;
9689
};
@@ -182,6 +175,7 @@
182175
07D24CEF1D866704002C69BF /* Sources */,
183176
07D24CF01D866704002C69BF /* Frameworks */,
184177
07D24CF11D866704002C69BF /* Resources */,
178+
03F7A6BD246CFCE1007D61D9 /* Embed Frameworks */,
185179
);
186180
buildRules = (
187181
);

‎OpenLive-iOS/OpenLive.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
03F7A6B8246CFC7E007D61D9 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26882386594F0047E150 /* AgoraRtcKit.framework */; };
11+
03F7A6B9246CFC7E007D61D9 /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26882386594F0047E150 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1012
07130E8A1D22928200CC85D8 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07130E891D22928200CC85D8 /* KeyCenter.swift */; };
1113
078012ED1D1E57730093DE24 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078012EC1D1E57730093DE24 /* AppDelegate.swift */; };
1214
078012EF1D1E57730093DE24 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078012EE1D1E57730093DE24 /* MainViewController.swift */; };
@@ -16,24 +18,12 @@
1618
0790F1261D1E6450003F8C18 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0790F1251D1E6450003F8C18 /* SettingsViewController.swift */; };
1719
0790F1281D1E645B003F8C18 /* LiveRoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0790F1271D1E645B003F8C18 /* LiveRoomViewController.swift */; };
1820
0790F1511D1E9631003F8C18 /* VideoSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0790F1501D1E9631003F8C18 /* VideoSession.swift */; };
19-
A758116624078C45007EDAD3 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0745273C1E9E050C0054D2D4 /* libresolv.tbd */; };
20-
A758116824078C59007EDAD3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A758116724078C4D007EDAD3 /* libc++.tbd */; };
21-
A758116924078C64007EDAD3 /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 382885B22249DBB10023BCFA /* CoreML.framework */; };
22-
A758116B24078C6E007EDAD3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758116A24078C6E007EDAD3 /* SystemConfiguration.framework */; };
23-
A758116D24078C78007EDAD3 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758116C24078C78007EDAD3 /* CoreTelephony.framework */; };
24-
A758116F24078C7F007EDAD3 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758116E24078C7F007EDAD3 /* VideoToolbox.framework */; };
25-
A758117124078C85007EDAD3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758117024078C85007EDAD3 /* AudioToolbox.framework */; };
26-
A758117324078C8F007EDAD3 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758117224078C8F007EDAD3 /* CoreMotion.framework */; };
27-
A758117524078C97007EDAD3 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758117424078C97007EDAD3 /* CoreMedia.framework */; };
28-
A758117724078C9F007EDAD3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758117624078C9F007EDAD3 /* AVFoundation.framework */; };
29-
A758117924078CAA007EDAD3 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758117824078CAA007EDAD3 /* Accelerate.framework */; };
3021
A75BF8C822B38B5F0072AF13 /* VideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A75BF8C722B38B5F0072AF13 /* VideoView.swift */; };
3122
A76C267C238657850047E150 /* AGEVideoLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76C2677238657850047E150 /* AGEVideoLayout.swift */; };
3223
A76C267D238657850047E150 /* AGEVideoConstraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76C2678238657850047E150 /* AGEVideoConstraints.swift */; };
3324
A76C267E238657850047E150 /* AGEEventsObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76C2679238657850047E150 /* AGEEventsObserver.swift */; };
3425
A76C267F238657850047E150 /* AGEView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76C267A238657850047E150 /* AGEView.swift */; };
3526
A76C2680238657850047E150 /* AGEVideoContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76C267B238657850047E150 /* AGEVideoContainer.swift */; };
36-
A76C268C23865ABC0047E150 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26882386594F0047E150 /* AgoraRtcKit.framework */; };
3727
A7C54A92230BD9C9003D65E3 /* FileCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7C54A91230BD9C9003D65E3 /* FileCenter.swift */; };
3828
A7C54A98230BE275003D65E3 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7C54A97230BE275003D65E3 /* Settings.swift */; };
3929
A7C54A9A230BE487003D65E3 /* DimensionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7C54A99230BE487003D65E3 /* DimensionCell.swift */; };
@@ -43,6 +33,20 @@
4333
A7DEE04F232F735C00E34432 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A7DEE04E232F735C00E34432 /* README.md */; };
4434
/* End PBXBuildFile section */
4535

36+
/* Begin PBXCopyFilesBuildPhase section */
37+
03F7A6BA246CFC7E007D61D9 /* Embed Frameworks */ = {
38+
isa = PBXCopyFilesBuildPhase;
39+
buildActionMask = 2147483647;
40+
dstPath = "";
41+
dstSubfolderSpec = 10;
42+
files = (
43+
03F7A6B9246CFC7E007D61D9 /* AgoraRtcKit.framework in Embed Frameworks */,
44+
);
45+
name = "Embed Frameworks";
46+
runOnlyForDeploymentPostprocessing = 0;
47+
};
48+
/* End PBXCopyFilesBuildPhase section */
49+
4650
/* Begin PBXFileReference section */
4751
07130E891D22928200CC85D8 /* KeyCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyCenter.swift; sourceTree = "<group>"; };
4852
0745273C1E9E050C0054D2D4 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
@@ -90,18 +94,7 @@
9094
isa = PBXFrameworksBuildPhase;
9195
buildActionMask = 2147483647;
9296
files = (
93-
A758116824078C59007EDAD3 /* libc++.tbd in Frameworks */,
94-
A758117324078C8F007EDAD3 /* CoreMotion.framework in Frameworks */,
95-
A758117724078C9F007EDAD3 /* AVFoundation.framework in Frameworks */,
96-
A758116F24078C7F007EDAD3 /* VideoToolbox.framework in Frameworks */,
97-
A758116B24078C6E007EDAD3 /* SystemConfiguration.framework in Frameworks */,
98-
A758117524078C97007EDAD3 /* CoreMedia.framework in Frameworks */,
99-
A758117124078C85007EDAD3 /* AudioToolbox.framework in Frameworks */,
100-
A76C268C23865ABC0047E150 /* AgoraRtcKit.framework in Frameworks */,
101-
A758116924078C64007EDAD3 /* CoreML.framework in Frameworks */,
102-
A758117924078CAA007EDAD3 /* Accelerate.framework in Frameworks */,
103-
A758116D24078C78007EDAD3 /* CoreTelephony.framework in Frameworks */,
104-
A758116624078C45007EDAD3 /* libresolv.tbd in Frameworks */,
97+
03F7A6B8246CFC7E007D61D9 /* AgoraRtcKit.framework in Frameworks */,
10598
);
10699
runOnlyForDeploymentPostprocessing = 0;
107100
};
@@ -228,6 +221,7 @@
228221
078012E61D1E57730093DE24 /* Frameworks */,
229222
078012E71D1E57730093DE24 /* Resources */,
230223
A72AE10824067CD900542EA5 /* ShellScript */,
224+
03F7A6BA246CFC7E007D61D9 /* Embed Frameworks */,
231225
);
232226
buildRules = (
233227
);

‎OpenLive-macOS-Objective-C/OpenLive.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
03F7A6C1246CFDC7007D61D9 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26682386557C0047E150 /* AgoraRtcKit.framework */; };
11+
03F7A6C2246CFDC7007D61D9 /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26682386557C0047E150 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1012
1A2F4525202C072F003783AE /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A2F4523202C072F003783AE /* SettingsViewController.m */; };
1113
1A2F456E202C4F81003783AE /* ReplacementSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A2F456D202C4F80003783AE /* ReplacementSegue.m */; };
1214
1A2F4571202C549F003783AE /* LiveRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A2F4570202C549F003783AE /* LiveRoomViewController.m */; };
@@ -20,15 +22,22 @@
2022
1AFA9DD0202BF0A600D782CB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA9DCF202BF0A600D782CB /* main.m */; };
2123
1AFA9DF5202BF28900D782CB /* MainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA9DF4202BF28900D782CB /* MainWindowController.m */; };
2224
1AFA9DF8202BF2C100D782CB /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA9DF7202BF2C100D782CB /* MainViewController.m */; };
23-
A76C26692386557C0047E150 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76C26682386557C0047E150 /* AgoraRtcKit.framework */; };
24-
A7733D8A2407A2C700483870 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7C50EF02121663D00774322 /* Accelerate.framework */; };
25-
A7733D8B2407A2D600483870 /* CoreWLAN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A2F45AC202D75CE003783AE /* CoreWLAN.framework */; };
26-
A7733D8C2407A2DC00483870 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A2F45A4202D75AF003783AE /* SystemConfiguration.framework */; };
27-
A7733D8D2407A2E200483870 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A2F45A8202D75C1003783AE /* libc++.tbd */; };
28-
A7733D8E2407A2E800483870 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A2F45A6202D75B8003783AE /* libresolv.tbd */; };
29-
A7733D8F2407A2F400483870 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A2F45B2202D75E0003783AE /* VideoToolbox.framework */; };
3025
/* End PBXBuildFile section */
3126

27+
/* Begin PBXCopyFilesBuildPhase section */
28+
03F7A6C3246CFDC7007D61D9 /* Embed Frameworks */ = {
29+
isa = PBXCopyFilesBuildPhase;
30+
buildActionMask = 2147483647;
31+
dstPath = "";
32+
dstSubfolderSpec = 10;
33+
files = (
34+
03F7A6C2246CFDC7007D61D9 /* AgoraRtcKit.framework in Embed Frameworks */,
35+
);
36+
name = "Embed Frameworks";
37+
runOnlyForDeploymentPostprocessing = 0;
38+
};
39+
/* End PBXCopyFilesBuildPhase section */
40+
3241
/* Begin PBXFileReference section */
3342
1A2F4522202C072F003783AE /* SettingsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
3443
1A2F4523202C072F003783AE /* SettingsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; };
@@ -74,13 +83,7 @@
7483
isa = PBXFrameworksBuildPhase;
7584
buildActionMask = 2147483647;
7685
files = (
77-
A7733D8B2407A2D600483870 /* CoreWLAN.framework in Frameworks */,
78-
A7733D8F2407A2F400483870 /* VideoToolbox.framework in Frameworks */,
79-
A7733D8D2407A2E200483870 /* libc++.tbd in Frameworks */,
80-
A76C26692386557C0047E150 /* AgoraRtcKit.framework in Frameworks */,
81-
A7733D8C2407A2DC00483870 /* SystemConfiguration.framework in Frameworks */,
82-
A7733D8A2407A2C700483870 /* Accelerate.framework in Frameworks */,
83-
A7733D8E2407A2E800483870 /* libresolv.tbd in Frameworks */,
86+
03F7A6C1246CFDC7007D61D9 /* AgoraRtcKit.framework in Frameworks */,
8487
);
8588
runOnlyForDeploymentPostprocessing = 0;
8689
};
@@ -172,6 +175,7 @@
172175
1AFA9DBC202BF0A500D782CB /* Sources */,
173176
1AFA9DBD202BF0A500D782CB /* Frameworks */,
174177
1AFA9DBE202BF0A500D782CB /* Resources */,
178+
03F7A6C3246CFDC7007D61D9 /* Embed Frameworks */,
175179
);
176180
buildRules = (
177181
);

0 commit comments

Comments
 (0)