Skip to content

Commit fa1f327

Browse files
sbd021sbd021
committed
Merge branch 'dev/3.7.1' of github.com:AgoraIO/API-Examples into dev/3.7.1
2 parents 300f3c8 + 6d4585f commit fa1f327

43 files changed

Lines changed: 1607 additions & 142 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎iOS/APIExample.xcodeproj/project.pbxproj‎

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@
127127
A7CA48C424553CF700507435 /* Popover.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A7CA48C224553CF600507435 /* Popover.storyboard */; };
128128
CBCDE23FB64E60D6A79F3723 /* Pods_Agora_ScreenShare_Extension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09E72C5D1AABD812866E41A6 /* Pods_Agora_ScreenShare_Extension.framework */; };
129129
D4046B5D3DE984062E3F6D92 /* Pods_APIExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07A781F5D5D3783CEC7C8EFA /* Pods_APIExample.framework */; };
130+
E763A87D288E977C00FE99FA /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = E763A87C288E977C00FE99FA /* Util.swift */; };
131+
E789AAF928694D8C00851463 /* LocalAccess.strings in Resources */ = {isa = PBXBuildFile; fileRef = E789AAF428694D8C00851463 /* LocalAccess.strings */; };
132+
E789AAFA28694D8C00851463 /* LocalAccess.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E789AAF628694D8C00851463 /* LocalAccess.storyboard */; };
133+
E789AAFB28694D8C00851463 /* LocalAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = E789AAF828694D8C00851463 /* LocalAccess.swift */; };
134+
E7EEF1BE2880187C00D9D2AE /* slience.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E7EEF1BD2880187C00D9D2AE /* slience.mp3 */; };
130135
F3184EFE27F8475600FA402D /* AgoraSampleBufferRender.m in Sources */ = {isa = PBXBuildFile; fileRef = F3184EFD27F8475600FA402D /* AgoraSampleBufferRender.m */; };
131136
F3184EFF27F85AD700FA402D /* AgoraPictureInPictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3EA6CE827F6E5E700CAF620 /* AgoraPictureInPictureController.m */; };
132137
F3184F0027F8605700FA402D /* VideoViewSampleBufferDisplayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3184EFB27F8439D00FA402D /* VideoViewSampleBufferDisplayView.xib */; };
@@ -344,6 +349,11 @@
344349
A7847F932458089E00469187 /* AgoraExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgoraExtension.swift; sourceTree = "<group>"; };
345350
A7BD765F247CC6920062A6B3 /* UITypeAlias.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITypeAlias.swift; sourceTree = "<group>"; };
346351
A7CA48C324553CF600507435 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Popover.storyboard; sourceTree = "<group>"; };
352+
E763A87C288E977C00FE99FA /* Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
353+
E789AAF528694D8C00851463 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LocalAccess.strings"; sourceTree = "<group>"; };
354+
E789AAF728694D8C00851463 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LocalAccess.storyboard; sourceTree = "<group>"; };
355+
E789AAF828694D8C00851463 /* LocalAccess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalAccess.swift; sourceTree = "<group>"; };
356+
E7EEF1BD2880187C00D9D2AE /* slience.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = slience.mp3; sourceTree = "<group>"; };
347357
F3184EFB27F8439D00FA402D /* VideoViewSampleBufferDisplayView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VideoViewSampleBufferDisplayView.xib; sourceTree = "<group>"; };
348358
F3184EFC27F8475600FA402D /* AgoraSampleBufferRender.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AgoraSampleBufferRender.h; sourceTree = "<group>"; };
349359
F3184EFD27F8475600FA402D /* AgoraSampleBufferRender.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AgoraSampleBufferRender.m; sourceTree = "<group>"; };
@@ -706,6 +716,7 @@
706716
7FBE1D502576A904005A8619 /* pvc_jnqd.bundle */,
707717
7FBE1D522576A904005A8619 /* pvc_kernels.metallib */,
708718
7FBE1D512576A904005A8619 /* srmetal.metallib */,
719+
E7EEF1BD2880187C00D9D2AE /* slience.mp3 */,
709720
03BEED0C251CAB9C005E78F4 /* audioeffect.mp3 */,
710721
03BEED0A251C4446005E78F4 /* audiomixing.mp3 */,
711722
);
@@ -850,6 +861,7 @@
850861
67B8C7A128050EE200195106 /* Utils */ = {
851862
isa = PBXGroup;
852863
children = (
864+
E763A87C288E977C00FE99FA /* Util.swift */,
853865
67B8C7A5280511CB00195106 /* MediaUtils.h */,
854866
67B8C7A6280511CB00195106 /* MediaUtils.m */,
855867
);
@@ -887,6 +899,7 @@
887899
A75A56D724A0603000D0089E /* Advanced */ = {
888900
isa = PBXGroup;
889901
children = (
902+
E789AAF328694D8C00851463 /* LocalAccess */,
890903
8BAF3C932758693A0073B30E /* VideoProcess */,
891904
5771635C264536750072DE96 /* CustomPcmAudioSource */,
892905
576EA57825ADC482000B3D79 /* VideoChat */,
@@ -895,7 +908,7 @@
895908
578AA65A259A056D00D7CAD9 /* CreateDataStream */,
896909
03FB5B2F25642E7C00F04ED0 /* LiveStreaming */,
897910
0364C1F52551AD6D00C6C0AE /* ARKit */,
898-
F38CCE3C27FD9D8E00232EC9 /* PictureInPicture */,
911+
F38CCE3C27FD9D8E00232EC9 /* PictureInPicture */,
899912
033A9F05252D61FB00BC26E1 /* RTMPStreaming */,
900913
033A9EE8252D5F5E00BC26E1 /* JoinMultiChannel */,
901914
033A9EED252D61E200BC26E1 /* CustomAudioRender */,
@@ -931,6 +944,16 @@
931944
name = "Supporting Files";
932945
sourceTree = "<group>";
933946
};
947+
E789AAF328694D8C00851463 /* LocalAccess */ = {
948+
isa = PBXGroup;
949+
children = (
950+
E789AAF428694D8C00851463 /* LocalAccess.strings */,
951+
E789AAF628694D8C00851463 /* LocalAccess.storyboard */,
952+
E789AAF828694D8C00851463 /* LocalAccess.swift */,
953+
);
954+
path = LocalAccess;
955+
sourceTree = "<group>";
956+
};
934957
F38CCE3C27FD9D8E00232EC9 /* PictureInPicture */ = {
935958
isa = PBXGroup;
936959
children = (
@@ -1073,6 +1096,7 @@
10731096
033A9F52252D89E600BC26E1 /* CustomVideoRender.storyboard in Resources */,
10741097
57B7FC89259C599100407BE1 /* RawAudioData.storyboard in Resources */,
10751098
03B12DAA251125B700E55818 /* VideoView.xib in Resources */,
1099+
E7EEF1BE2880187C00D9D2AE /* slience.mp3 in Resources */,
10761100
67D9A15727E94FAF008C3F8E /* SpatialAudio.storyboard in Resources */,
10771101
576EA58525AED471000B3D79 /* VideoChat.storyboard in Resources */,
10781102
033A9F48252D89D000BC26E1 /* CustomAudioRender.storyboard in Resources */,
@@ -1081,13 +1105,15 @@
10811105
0364C2052551B46100C6C0AE /* AR.scnassets in Resources */,
10821106
033A9F30252D860100BC26E1 /* JoinChannelAudio.storyboard in Resources */,
10831107
F3184F0027F8605700FA402D /* VideoViewSampleBufferDisplayView.xib in Resources */,
1108+
E789AAF928694D8C00851463 /* LocalAccess.strings in Resources */,
10841109
0364C1FD2551AD6D00C6C0AE /* ARKit.storyboard in Resources */,
10851110
033A9F75252D8B4800BC26E1 /* ScreenShare.storyboard in Resources */,
10861111
8BAF3C992758693B0073B30E /* VideoProcess.strings in Resources */,
10871112
033A9F5C252D89FD00BC26E1 /* CustomVideoSourcePush.storyboard in Resources */,
10881113
03D13BD92448758B00B599B3 /* Assets.xcassets in Resources */,
10891114
033A9F6B252D8B3500BC26E1 /* MediaChannelRelay.storyboard in Resources */,
10901115
03D13BD72448758900B599B3 /* Main.storyboard in Resources */,
1116+
E789AAFA28694D8C00851463 /* LocalAccess.storyboard in Resources */,
10911117
);
10921118
runOnlyForDeploymentPostprocessing = 0;
10931119
};
@@ -1188,6 +1214,7 @@
11881214
67B8C79E2804081F00195106 /* RawVideoData.swift in Sources */,
11891215
033A9EFA252D61E200BC26E1 /* CustomAudioRender.swift in Sources */,
11901216
03D13BD42448758900B599B3 /* ViewController.swift in Sources */,
1217+
E789AAFB28694D8C00851463 /* LocalAccess.swift in Sources */,
11911218
03F8733224C8696600EDB1A3 /* EntryViewController.swift in Sources */,
11921219
0371D8AE250B4A2C00C0DD61 /* JoinChannelAudio.swift in Sources */,
11931220
033A9EFC252D61E200BC26E1 /* CustomVideoRender.swift in Sources */,
@@ -1243,6 +1270,7 @@
12431270
03BCEC762449EB5000ED7177 /* LogViewController.swift in Sources */,
12441271
0364C2022551B19800C6C0AE /* ARVideoSource.swift in Sources */,
12451272
0339D6D624E91CEB008739CD /* QuickSwitchChannel.swift in Sources */,
1273+
E763A87D288E977C00FE99FA /* Util.swift in Sources */,
12461274
A7847F942458089E00469187 /* AgoraExtension.swift in Sources */,
12471275
03BCEC50244938C500ED7177 /* BaseViewController.swift in Sources */,
12481276
);
@@ -1533,6 +1561,22 @@
15331561
name = Popover.storyboard;
15341562
sourceTree = "<group>";
15351563
};
1564+
E789AAF428694D8C00851463 /* LocalAccess.strings */ = {
1565+
isa = PBXVariantGroup;
1566+
children = (
1567+
E789AAF528694D8C00851463 /* zh-Hans */,
1568+
);
1569+
name = LocalAccess.strings;
1570+
sourceTree = "<group>";
1571+
};
1572+
E789AAF628694D8C00851463 /* LocalAccess.storyboard */ = {
1573+
isa = PBXVariantGroup;
1574+
children = (
1575+
E789AAF728694D8C00851463 /* Base */,
1576+
);
1577+
name = LocalAccess.storyboard;
1578+
sourceTree = "<group>";
1579+
};
15361580
F38CCE3F27FDC78B00232EC9 /* PictureInPicture.storyboard */ = {
15371581
isa = PBXVariantGroup;
15381582
children = (
@@ -1570,7 +1614,7 @@
15701614
"$(PROJECT_DIR)/Agora-ScreenShare-Extension",
15711615
);
15721616
MARKETING_VERSION = 1.0;
1573-
PRODUCT_BUNDLE_IDENTIFIER = "io.agora.api.example.Agora-ScreenShare-Extension";
1617+
PRODUCT_BUNDLE_IDENTIFIER = "io.agora.api.examples.Agora-ScreenShare-Extension";
15741618
PRODUCT_NAME = "$(TARGET_NAME)";
15751619
PROVISIONING_PROFILE_SPECIFIER = "";
15761620
SKIP_INSTALL = YES;
@@ -1606,7 +1650,7 @@
16061650
"$(PROJECT_DIR)/Agora-ScreenShare-Extension",
16071651
);
16081652
MARKETING_VERSION = 1.0;
1609-
PRODUCT_BUNDLE_IDENTIFIER = "io.agora.api.example.Agora-ScreenShare-Extension";
1653+
PRODUCT_BUNDLE_IDENTIFIER = "io.agora.api.examples.Agora-ScreenShare-Extension";
16101654
PRODUCT_NAME = "$(TARGET_NAME)";
16111655
PROVISIONING_PROFILE_SPECIFIER = "";
16121656
SKIP_INSTALL = YES;
@@ -1753,8 +1797,8 @@
17531797
"$(inherited)",
17541798
"@executable_path/Frameworks",
17551799
);
1756-
MARKETING_VERSION = 1.0;
1757-
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.example;
1800+
MARKETING_VERSION = 3.7.1;
1801+
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.examples;
17581802
PRODUCT_NAME = "$(TARGET_NAME)";
17591803
PROVISIONING_PROFILE_SPECIFIER = "";
17601804
SWIFT_OBJC_BRIDGING_HEADER = "APIExample/APIExample-Bridging-Header.h";
@@ -1785,8 +1829,8 @@
17851829
"$(inherited)",
17861830
"@executable_path/Frameworks",
17871831
);
1788-
MARKETING_VERSION = 1.0;
1789-
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.example;
1832+
MARKETING_VERSION = 3.7.1;
1833+
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.examples;
17901834
PRODUCT_NAME = "$(TARGET_NAME)";
17911835
PROVISIONING_PROFILE_SPECIFIER = "";
17921836
SWIFT_OBJC_BRIDGING_HEADER = "APIExample/APIExample-Bridging-Header.h";

‎iOS/APIExample/Assets.xcassets/camera.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "camera.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎iOS/APIExample/Assets.xcassets/camera.imageset/camera.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)