Skip to content

Commit 0ae5fce

Browse files
author
HeZhengQing
committed
[FIX] 4.6.0 sync global
1 parent 68f12e0 commit 0ae5fce

24 files changed

Lines changed: 62 additions & 2308 deletions

File tree

.github/ci/build/build_ios.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ else
8080
echo zip_name: $zip_name
8181
curl -o $zip_name $sdk_url || exit 1
8282
7za x ./$zip_name -y > log.txt
83-
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
83+
unzip_name=`ls -S -d */ | egrep 'Agora|Shengwang' | sed 's/\///g'`
8484
echo unzip_name: $unzip_name
8585
rm -rf ./$unzip_name/bin
8686
rm -f ./$unzip_name/commits

.github/ci/build/build_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ else
7979
echo unzip_name: $unzip_name
8080
curl -o $zip_name $sdk_url || exit 1
8181
7za x ./$zip_name -y > log.txt
82-
unzip_name=`ls -S -d */ | grep Agora`
82+
unzip_name=`ls -S -d */ | egrep 'Agora|Shengwang' | sed 's/\///g'`
8383
echo unzip_name: $unzip_name
8484

8585
rm -rf ./$unzip_name/bin

.github/ci/build/modify_ios_keycenter.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
def modfiy(path, isReset):
44
appId = os.environ.get('APP_ID')
5+
faceCaptureLicense = os.environ.get('FACE_CAPTURE_LICENSE')
56
with open(path, 'r', encoding='utf-8') as file:
67
contents = []
78
for num, line in enumerate(file):
@@ -16,6 +17,11 @@ def modfiy(path, isReset):
1617
line = "static let Certificate: String? = <#YOUR Certificate#>"
1718
else:
1819
line = 'static let Certificate: String? = nil'
20+
elif "static let FaceCaptureLicense" in line:
21+
if isReset:
22+
line = "static let FaceCaptureLicense: String? = nil"
23+
else:
24+
line = f'static let FaceCaptureLicense: String? = "{faceCaptureLicense}"'
1925
elif "static NSString * const APPID" in line:
2026
if isReset:
2127
line = "static NSString * const APPID = <#YOUR APPID#>"

iOS/APIExample-OC/APIExample-OC.xcodeproj/project.pbxproj

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
E70ADE7C2A612683009947CF /* LiveStreaming.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E70ADE7E2A612683009947CF /* LiveStreaming.storyboard */; };
5353
E70ADEA72A64E230009947CF /* RTMPStreaming.m in Sources */ = {isa = PBXBuildFile; fileRef = E70ADEA52A64E230009947CF /* RTMPStreaming.m */; };
5454
E70ADEA82A64EA5C009947CF /* RTMPStreaming.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E70ADEAA2A64EA5C009947CF /* RTMPStreaming.storyboard */; };
55-
E70ADEBF2A64ED3A009947CF /* FusionCDN.strings in Resources */ = {isa = PBXBuildFile; fileRef = E70ADEB82A64ED3A009947CF /* FusionCDN.strings */; };
56-
E70ADEC02A64ED3A009947CF /* FusionCDN.m in Sources */ = {isa = PBXBuildFile; fileRef = E70ADEBB2A64ED3A009947CF /* FusionCDN.m */; };
57-
E70ADEC12A64ED3A009947CF /* FusionCDN.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E70ADEBC2A64ED3A009947CF /* FusionCDN.storyboard */; };
5855
E70ADEC62A66306F009947CF /* VideoMetadata.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E70ADEC42A66306F009947CF /* VideoMetadata.storyboard */; };
5956
E70ADEC72A66306F009947CF /* VideoMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = E70ADEC52A66306F009947CF /* VideoMetadata.m */; };
6057
E70ADECC2A663A06009947CF /* VoiceChanger.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E70ADEC92A663A06009947CF /* VoiceChanger.storyboard */; };
@@ -250,11 +247,6 @@
250247
E70ADEA52A64E230009947CF /* RTMPStreaming.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTMPStreaming.m; sourceTree = "<group>"; };
251248
E70ADEAB2A64EA69009947CF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/RTMPStreaming.storyboard; sourceTree = "<group>"; };
252249
E70ADEAC2A64EA75009947CF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/RTMPStreaming.strings"; sourceTree = "<group>"; };
253-
E70ADEB92A64ED3A009947CF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/FusionCDN.strings"; sourceTree = "<group>"; };
254-
E70ADEBA2A64ED3A009947CF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/FusionCDN.strings; sourceTree = "<group>"; };
255-
E70ADEBB2A64ED3A009947CF /* FusionCDN.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FusionCDN.m; sourceTree = "<group>"; };
256-
E70ADEBD2A64ED3A009947CF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/FusionCDN.storyboard; sourceTree = "<group>"; };
257-
E70ADEBE2A64ED3A009947CF /* FusionCDN.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FusionCDN.h; sourceTree = "<group>"; };
258250
E70ADEC32A66306F009947CF /* VideoMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoMetadata.h; sourceTree = "<group>"; };
259251
E70ADEC42A66306F009947CF /* VideoMetadata.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = VideoMetadata.storyboard; sourceTree = "<group>"; };
260252
E70ADEC52A66306F009947CF /* VideoMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoMetadata.m; sourceTree = "<group>"; };
@@ -523,7 +515,6 @@
523515
E70ADED42A6A2BE6009947CF /* CustomPcmAudioSource */,
524516
E70ADEC82A663A06009947CF /* VoiceChanger */,
525517
E70ADEC22A66306F009947CF /* VideoMetadata */,
526-
E70ADEB72A64ED3A009947CF /* FusionCDN */,
527518
E70ADEA22A64E230009947CF /* RTMPStreaming */,
528519
E70ADE712A60EC74009947CF /* LiveStreaming */,
529520
);
@@ -657,17 +648,6 @@
657648
path = RTMPStreaming;
658649
sourceTree = "<group>";
659650
};
660-
E70ADEB72A64ED3A009947CF /* FusionCDN */ = {
661-
isa = PBXGroup;
662-
children = (
663-
E70ADEBC2A64ED3A009947CF /* FusionCDN.storyboard */,
664-
E70ADEB82A64ED3A009947CF /* FusionCDN.strings */,
665-
E70ADEBE2A64ED3A009947CF /* FusionCDN.h */,
666-
E70ADEBB2A64ED3A009947CF /* FusionCDN.m */,
667-
);
668-
path = FusionCDN;
669-
sourceTree = "<group>";
670-
};
671651
E70ADEC22A66306F009947CF /* VideoMetadata */ = {
672652
isa = PBXGroup;
673653
children = (
@@ -1142,9 +1122,7 @@
11421122
E7361F5F2A6E60B100925BD6 /* RawVideoData.storyboard in Resources */,
11431123
E72F61F22A73B93200C963D2 /* MediaChannelRelay.storyboard in Resources */,
11441124
E70ADE7C2A612683009947CF /* LiveStreaming.storyboard in Resources */,
1145-
E70ADEC12A64ED3A009947CF /* FusionCDN.storyboard in Resources */,
11461125
E72F620B2A78B31B00C963D2 /* MutliCamera.storyboard in Resources */,
1147-
E70ADEBF2A64ED3A009947CF /* FusionCDN.strings in Resources */,
11481126
E70ADE162A5D026E009947CF /* sample.yuv in Resources */,
11491127
E70ADE152A5D026E009947CF /* agora-logo.png in Resources */,
11501128
E72F61832A70C71200C963D2 /* JoinMultiChannel.storyboard in Resources */,
@@ -1322,7 +1300,6 @@
13221300
E7361F492A6E4CF500925BD6 /* AgoraYUVImageSourcePush.m in Sources */,
13231301
E70ADE3E2A5D4D05009947CF /* ToastView.swift in Sources */,
13241302
E7361F592A6E5E9300925BD6 /* RawAudioData.m in Sources */,
1325-
E70ADEC02A64ED3A009947CF /* FusionCDN.m in Sources */,
13261303
E70ADEF42A6A72C6009947CF /* AudioWriteToFile.m in Sources */,
13271304
E72F62002A7796A200C963D2 /* SpatialAudioActionSheet.swift in Sources */,
13281305
E72F61A52A710AB200C963D2 /* MediaPlayer.m in Sources */,
@@ -1451,23 +1428,6 @@
14511428
name = RTMPStreaming.storyboard;
14521429
sourceTree = "<group>";
14531430
};
1454-
E70ADEB82A64ED3A009947CF /* FusionCDN.strings */ = {
1455-
isa = PBXVariantGroup;
1456-
children = (
1457-
E70ADEB92A64ED3A009947CF /* zh-Hans */,
1458-
E70ADEBA2A64ED3A009947CF /* en */,
1459-
);
1460-
name = FusionCDN.strings;
1461-
sourceTree = "<group>";
1462-
};
1463-
E70ADEBC2A64ED3A009947CF /* FusionCDN.storyboard */ = {
1464-
isa = PBXVariantGroup;
1465-
children = (
1466-
E70ADEBD2A64ED3A009947CF /* Base */,
1467-
);
1468-
name = FusionCDN.storyboard;
1469-
sourceTree = "<group>";
1470-
};
14711431
E72F61902A70F9B700C963D2 /* StreamEncryption.storyboard */ = {
14721432
isa = PBXVariantGroup;
14731433
children = (

0 commit comments

Comments
 (0)