Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/4.5.0 #429

Merged
merged 227 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
227 commits
Select commit Hold shift + click to select a range
6f1ad6a
feat: add pip example
Aug 9, 2024
3306b94
fix: media relay bug fixed
tamworth Sep 11, 2024
c31801f
feat: 增加了透明背景交互入口
weileifrank Sep 11, 2024
4a5da3f
fix: media relay(mac) bug fixed
tamworth Sep 11, 2024
a3f32a7
feat: 增加了透明效果模块
weileifrank Sep 11, 2024
e734964
feat: 增加了视频播放逻辑
weileifrank Sep 12, 2024
88fd516
feat: windows增加了构建的时候拷贝视频文件到相应目录
weileifrank Sep 12, 2024
29f2fca
feat: 透明效果模块优化了代码逻辑
weileifrank Sep 12, 2024
99aa53b
feat: windows窗口增加了透明度支持
weileifrank Sep 19, 2024
2437aef
Merge branch 'dev/4.4.x' into dev/windows-alpha-frank
weileifrank Sep 20, 2024
bd579e2
fix: disable microphone track publishing in custom audio source cases.
tamworth Sep 23, 2024
c8d164e
Merge branch 'dev/4.4.x' into dev/pip_example
Sep 23, 2024
ab74cc4
fix: disable microphone track publishing in custom audio source cases.
tamworth Sep 23, 2024
6a356ee
Merge pull request #403 from AgoraIO/dev/pip_example
tamworth Sep 24, 2024
b592577
fix: audio source fixed
tamworth Sep 24, 2024
26d8449
Merge branch 'dev/4.4.x' of https://github.com/AgoraIO/API-Examples i…
tamworth Sep 24, 2024
34ac697
Merge pull request #402 from AgoraIO/dev/windows-alpha-frank
weileifrank Sep 24, 2024
ce4fcbe
fix: build fail
tamworth Sep 24, 2024
164ca6b
Merge branch 'dev/4.4.x' of https://github.com/AgoraIO/API-Examples i…
tamworth Sep 24, 2024
0af4707
fix build issues
Sep 24, 2024
4fe6c99
Merge branch 'dev/4.4.x' into dev/pip_example
Sep 24, 2024
c1c5c51
Merge pull request #404 from AgoraIO/dev/pip_example
tamworth Sep 24, 2024
ae09bc2
fix: audio render fixed
tamworth Sep 25, 2024
1d65d5b
fix: optimize play audio
tamworth Sep 25, 2024
e872aab
perf: rename pcmplayer
tamworth Sep 26, 2024
5388529
fix: resolve audio render issues in objective-c
tamworth Sep 26, 2024
e702b50
fix: pcm audio publish fixed
tamworth Sep 26, 2024
c09f4d9
fix: fix: resolve audio render issues in audio only project
tamworth Sep 26, 2024
714b79d
fix: resolve audio render issues in mac
tamworth Sep 26, 2024
a8db7ad
feat: add makeup & face shape
tamworth Sep 30, 2024
4038034
fix: update face shape fixed
tamworth Sep 30, 2024
af0c371
Merge pull request #405 from AgoraIO/dev/4.4.x
weileifrank Sep 30, 2024
1bbcc61
feat: mac makeup & beauty shape fixed
tamworth Sep 30, 2024
41e3369
fix: makeup fixed
tamworth Sep 30, 2024
46260ea
feat: add update render fps feature to iOS
tamworth Oct 8, 2024
26a62d5
feat: add update render fps feature to Mac
tamworth Oct 8, 2024
0def999
feat: add set video scenario to iOS
tamworth Oct 8, 2024
f23df2d
feat: add take local snapshot to iOS
tamworth Oct 8, 2024
1628cc2
feat: add record before join channel
tamworth Oct 9, 2024
a38228f
feat: add whitening process to iOS
tamworth Oct 9, 2024
3ba5623
feat: add whitening process to Mac
tamworth Oct 9, 2024
e01745e
fix: remove unuse code
tamworth Oct 9, 2024
d77982f
feat: add local composite graph case to iOS
tamworth Oct 9, 2024
dd6b08b
Synchronize the exact scene for the SwiftUI project
Oct 10, 2024
a0bc9ab
Merge pull request #409 from AgoraIO/dev/SwiftUI
tamworth Oct 10, 2024
66232f9
faet: add start local audio mixer
tamworth Oct 10, 2024
32b372e
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 10, 2024
604e224
Add cloud build script for SwiftUI project
Oct 11, 2024
4324596
Merge pull request #410 from AgoraIO/dev/SwiftUI
tamworth Oct 11, 2024
eb50074
Update SwiftUI Podfile
pandaBilbo Oct 11, 2024
cb69e73
Update package_script.sh,echo xcode version
pandaBilbo Oct 11, 2024
91ef520
echo xcode version
pandaBilbo Oct 11, 2024
5916a4e
fix: local audio mixer ui fixed
tamworth Oct 11, 2024
c52a3a0
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 11, 2024
555468d
feat: update podfile
tamworth Oct 11, 2024
204c584
Fix build error
Oct 11, 2024
c29b149
Merge pull request #411 from AgoraIO/dev/build-4.5.0
tamworth Oct 11, 2024
c3ed7e0
Fix build error
Oct 11, 2024
b7e570c
feat: add local audio mixer to Mac
tamworth Oct 11, 2024
1449b17
feat: update sdk to 4.5.0
weileifrank Sep 30, 2024
b7f980a
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 12, 2024
f56756c
fix: update localized string
tamworth Oct 12, 2024
d3c120b
Close bit code
Oct 12, 2024
69feb86
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
Oct 12, 2024
e602aae
feat: add AgoraALD.driver & remove sand box
tamworth Oct 12, 2024
ecbfc9b
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 12, 2024
2e7afcf
Merge remote-tracking branch 'origin/dev/4.4.x' into dev/4.5.0
tamworth Oct 12, 2024
9d0a5df
fix: data stream fixed
tamworth Oct 12, 2024
392f38f
SwiftUI project compatible with lower versions
Oct 12, 2024
a5ca6ae
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
Oct 12, 2024
ed1d280
Merge branch 'refs/heads/dev/4.5.0' into dev/4.5.0-android-frank
weileifrank Oct 12, 2024
f90115d
Add options plist for SwiftUI
Oct 12, 2024
44399da
Format code
Oct 14, 2024
a2910e5
SwiftUI Preview Template
Oct 14, 2024
d654dfb
feat: add rte player case
tamworth Oct 14, 2024
fb7246c
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 14, 2024
169d313
feat: add listener handler for startLocalAudioMixer case
weileifrank Oct 16, 2024
cea2ed0
feat: modify text for beauty light options
weileifrank Oct 16, 2024
4835aad
feat: improve rteplayer logic when failed
weileifrank Oct 16, 2024
e8b13f4
feat: add hdr yuv render & push
tamworth Oct 16, 2024
d257c58
feat: add rte player to mac
tamworth Oct 16, 2024
de694b7
fix: update rte player
tamworth Oct 16, 2024
222b928
feat: add hdr to mac
tamworth Oct 16, 2024
afbb335
feat: imporve logic for rteplayer case when failed
weileifrank Oct 16, 2024
2be4056
Merge remote-tracking branch 'origin/dev/4.5.0-android-frank' into de…
weileifrank Oct 16, 2024
9e60d2a
Merge branch 'refs/heads/dev/4.5.0' into dev/4.5.0-android-frank
weileifrank Oct 16, 2024
94f3f8e
Merge pull request #415 from AgoraIO/dev/4.5.0-android-frank
tamworth Oct 16, 2024
934b05f
fix: check hdr enable
tamworth Oct 16, 2024
1f23572
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 16, 2024
b7f8ec9
fix: minor change
tamworth Oct 16, 2024
98c7cf3
fix: update localized string
tamworth Oct 16, 2024
c540a4a
fix: join channel when video recorder vc view did load
tamworth Oct 17, 2024
ec29074
fix: set minimum os version to iOS13
tamworth Oct 17, 2024
9d4d2f6
Fix the problem that OC project PIP case does not take effect when cl…
Oct 17, 2024
c8fa0ce
Merge pull request #416 from AgoraIO/dev/fixPipBug_4.5.0
tamworth Oct 17, 2024
6e56b3c
feat: update sdk to 4.5.0 for windows
weileifrank Oct 12, 2024
19fcf44
Merge branch 'dev/4.5.0' into dev/4.5.0-windows
weileifrank Oct 18, 2024
0d10389
fix: build fail on xcode13 fixed
tamworth Oct 18, 2024
0722be3
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 18, 2024
6383ac3
fix: live stream ui minor fixed
tamworth Oct 18, 2024
2d5fffa
[windows]add cross channel media relay case.(pick from jira/DEVEX-88 …
weileifrank Oct 18, 2024
564a7df
feat: improve logic for beauty extention
weileifrank Oct 18, 2024
1d1cdb6
SwiftUI project low version adaptation, API adaptation to iOS14
Oct 18, 2024
7e7d77d
Merge branch 'dev/4.5.0' into dev/4.5.0-windows
weileifrank Oct 18, 2024
206e9e7
Merge pull request #417 from AgoraIO/dev/4.5.0-SwiftUI
tamworth Oct 18, 2024
8ff4d23
Fix the low-version compilation error problem
Oct 18, 2024
bb38955
Merge branch 'dev/4.5.0' into dev/4.5.0-SwiftUI
Oct 18, 2024
8ade95e
Merge pull request #419 from AgoraIO/dev/4.5.0-SwiftUI
tamworth Oct 18, 2024
6df8e47
The minimum version is changed to iOS15, check the compilation error …
Oct 18, 2024
a0e9cbb
Modify the minimum supported iOS version to iOS14
Oct 18, 2024
ebc9913
Merge pull request #418 from AgoraIO/dev/4.5.0-windows
tamworth Oct 18, 2024
501d0d1
fix: update face capture
tamworth Oct 21, 2024
a871d56
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 21, 2024
c215e7b
feat: add logic for push hdr file
weileifrank Oct 21, 2024
056ad5e
feat: add logic for push hdr file with encoder
weileifrank Oct 21, 2024
9f2c6b2
Fix the problem that the real-time live broadcast remote screen does …
Oct 21, 2024
022b8c4
Merge pull request #420 from AgoraIO/dev/fixbug-4.5.0
tamworth Oct 21, 2024
bc6a6e9
fix: update mac security for Non-Sandboxed Applications
tamworth Oct 21, 2024
ad74212
feat: improve logic for push hdr file
weileifrank Oct 22, 2024
8ba47a9
feat: update encoder config for hdr
weileifrank Oct 22, 2024
0468f79
fix: Turn off quick start for hardware decoding
tamworth Oct 22, 2024
3fddd75
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 22, 2024
6fdad40
fix: update color space for push hdr
tamworth Oct 22, 2024
d9af242
fix: pop window title color fixed
tamworth Oct 22, 2024
abf08f4
fix: hdr color space fixed
tamworth Oct 22, 2024
84bf58b
fix: update ktv integrate url
tamworth Oct 23, 2024
e8a0d3c
feat: update hdr login
weileifrank Oct 23, 2024
189701d
fix: update live stream ui when role did change
tamworth Oct 23, 2024
0f41d11
feat: update hdr logic
weileifrank Oct 23, 2024
7d9eddf
Bug fix for SwiftUI project
Oct 23, 2024
141c247
Merge pull request #424 from AgoraIO/dev/fixbug-4.5.0
tamworth Oct 23, 2024
471a3fb
fix: localized mp4 demuxer
tamworth Oct 23, 2024
6e566fa
feat: update hdr params
weileifrank Oct 23, 2024
605c381
fix: local fps fixed
tamworth Oct 23, 2024
c9c8dbc
fix: hdr encod capability check fixed
tamworth Oct 23, 2024
f11b4f4
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 23, 2024
a83e605
fix: update hdr yuv decode
tamworth Oct 23, 2024
643cdd0
feat: fix cross channel bug
weileifrank Oct 24, 2024
038aa2d
feat: fix livestreaming bug
weileifrank Oct 24, 2024
21de62a
feat: improve for NMS-23856
weileifrank Oct 24, 2024
34d4fe1
fix: multi push/render bug fixed
tamworth Oct 24, 2024
bab7e56
Merge branch 'refs/heads/dev/4.5.0' into dev/4.5.0_android
weileifrank Oct 24, 2024
d04d5b4
Merge pull request #425 from AgoraIO/dev/4.5.0_android
tamworth Oct 24, 2024
988dd46
fix: canvas minor change
tamworth Oct 24, 2024
459f489
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 24, 2024
e6bcded
feat: improve utf82cs function
weileifrank Oct 24, 2024
0b961f1
Merge branch 'dev/4.5.0' into dev/4.5.0-windows
weileifrank Oct 24, 2024
a87591b
Merge pull request #426 from AgoraIO/dev/4.5.0-windows
tamworth Oct 24, 2024
c1d0f2f
feat: improve logic for livestreaming screenshot
weileifrank Oct 24, 2024
350a1ac
fix: update download script version
tamworth Oct 24, 2024
8875f7c
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 24, 2024
86113b1
Merge pull request #427 from AgoraIO/dev/4.5.0_android
tamworth Oct 24, 2024
d7b5019
Merge remote-tracking branch 'origin/main' into dev/4.5.0
tamworth Oct 25, 2024
c88a995
feat: update beauty sdk to 1.0.7
weileifrank Oct 25, 2024
8c034e4
feat: improve logic for cp assets
weileifrank Oct 25, 2024
afa406c
Synchronize beauty code, synchronize tag: BeautyAPI project 1.0.7
Oct 25, 2024
8efc0ca
Add and download beauty resources CI script
Oct 25, 2024
0e74b63
Test Beauty Resources CI Script
Oct 25, 2024
f346d57
Delete useless scripts
Oct 25, 2024
d306efa
Delete the authpack file
Oct 25, 2024
7c0aaa0
Fix CI error
Oct 25, 2024
c7051e3
Add logs
Oct 25, 2024
687b882
Modify the download address of sense beauty SDK
Oct 28, 2024
582ecdf
Modify the certificate setting
Oct 28, 2024
173d354
Add a script log
Oct 28, 2024
8c53835
fix: transparent render fixed
tamworth Oct 28, 2024
9a0c6a8
Merge branch 'refs/heads/dev/4.5.0' into dev/4.5.0_android
weileifrank Oct 28, 2024
b184844
Modify the plist file
Oct 28, 2024
2d49a1e
Add logs
Oct 28, 2024
12d5faa
Merge pull request #432 from AgoraIO/dev/4.5.0_android
tamworth Oct 28, 2024
24ce108
Update plist and certificate
Oct 28, 2024
a7d0405
update plist
Oct 28, 2024
88077d9
update plist
Oct 28, 2024
1575950
Update plist
Oct 28, 2024
bf832e6
Update plist
Oct 28, 2024
fcdf4b2
Update plist
Oct 28, 2024
791a477
fix: custom audio render audio scenario changed
tamworth Oct 28, 2024
6043cb9
fix: custom audio render audio scenario changed for mac
tamworth Oct 28, 2024
878fe08
Merge branch 'dev/4.5.0' into dev/4.5.0-beauty
Oct 28, 2024
53f5d9c
feat: reset data when resumed for CAgoraCrossChannelDlg.cpp
weileifrank Oct 29, 2024
2cefbdb
Merge pull request #433 from AgoraIO/dev/4.5.0-windows
tamworth Oct 29, 2024
2542681
Add logs
Oct 29, 2024
d167b3c
Modify the beauty configuration script
Oct 29, 2024
463fe1b
update podfile
Oct 29, 2024
004cc14
Modify the script
Oct 29, 2024
c645637
Use the script to modify the content of ExportOption.plist, change b…
Oct 29, 2024
74c1970
Modify the script
Oct 29, 2024
a6919a9
Update cloud_build.sh
Oct 29, 2024
457a753
Modify sticker path
Oct 29, 2024
9be799c
Modify the script
Oct 29, 2024
3e65ab4
fix: destroy mediaplayer when pop vc
tamworth Oct 29, 2024
561e418
Merge branch 'dev/4.5.0' of https://github.com/AgoraIO/API-Examples i…
tamworth Oct 29, 2024
d2a01fd
Read bytes beauty license path from bundle, modify beauty installatio…
Oct 29, 2024
9e1f99c
feat: modify ci script
weileifrank Oct 29, 2024
6965055
Merge branch 'refs/heads/dev/4.5.0' into dev/4.5.0_android
weileifrank Oct 29, 2024
0fdc5f6
Merge pull request #431 from AgoraIO/dev/4.5.0-beauty
tamworth Oct 30, 2024
7c987bb
feat: modify ci build script for android
weileifrank Oct 29, 2024
04ae8a7
Merge branch 'refs/heads/dev/4.5.0' into dev/4.5.0_android
weileifrank Oct 30, 2024
7e6ddab
Merge pull request #434 from AgoraIO/dev/4.5.0_android
tamworth Oct 30, 2024
7d08dde
Modify the script and add SDK link empty judgment
Oct 30, 2024
e3a646b
Use the old version of SDK to test CI
Oct 30, 2024
352da81
Verification SDK link is empty
Oct 30, 2024
ae30a80
Modify the pod script
Oct 30, 2024
7201e1a
Modify script
Oct 30, 2024
b4c09cb
Modify script
Oct 30, 2024
efcf47b
Modify podfile
Oct 31, 2024
81e0ecc
Read the directory from the parameters
Oct 31, 2024
1a8f63a
Change the file name
Oct 31, 2024
70f247a
Modify build script for mac
Oct 31, 2024
ec9d9bc
feat: modify ci for no compile condition
weileifrank Oct 30, 2024
1937ee0
Merge pull request #437 from AgoraIO/dev/4.5.0_android
tamworth Oct 31, 2024
bcb589a
Merge pull request #436 from AgoraIO/dev/4.5.0-CI
tamworth Oct 31, 2024
f8a724b
feat: modify ci for windows
weileifrank Oct 31, 2024
2f998f0
Merge pull request #440 from AgoraIO/dev/4.5.0-windows
tamworth Nov 1, 2024
9a22b48
SwiftUI project shows sdk version number
Nov 8, 2024
9ca3b10
[Android] update ci
alienzh Nov 14, 2024
e9dadcf
[Android] update ci
alienzh Nov 14, 2024
373fa38
echo files
Nov 15, 2024
3944ddd
Delete the file
Nov 15, 2024
ef46ddb
Modify script
Nov 15, 2024
50caa68
modify script
Nov 15, 2024
eee30cc
Merge pull request #442 from AgoraIO/dev/4.5.0-script-ci
pandaBilbo Nov 15, 2024
1741236
Modify script
Nov 15, 2024
3cce750
Fix the error problem when the deleted file does not exist
Nov 25, 2024
854c5a0
Merge pull request #441 from AgoraIO/dev/4.50_android_test
HugoChaan Nov 26, 2024
3c45a97
[Fix][Android] fixs IndexOutOfBoundsException
alienzh Nov 26, 2024
51099e4
Merge pull request #444 from AgoraIO/dev/zw/4.5.0_fixs
HugoChaan Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
43 changes: 27 additions & 16 deletions .github/ci/build/build_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,34 @@ echo release_version: $release_version
echo short_version: $short_version
echo pwd: `pwd`
echo sdk_url: $sdk_url
unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
if [ -z "$sdk_url" ]; then
echo "sdk_url is empty"
echo unzip_name: $unzip_name
echo zip_name: $zip_name
else
zip_name=${sdk_url##*/}
echo zip_name: $zip_name

zip_name=${sdk_url##*/}
echo zip_name: $zip_name
# env LC_ALL=en_US.UTF-8 python3 $WORKSPACE/artifactory_utils.py --action=download_file --file=$sdk_url || exit 1
curl -o $zip_name $sdk_url || exit 1
7za x ./$zip_name -y > log.txt

# env LC_ALL=en_US.UTF-8 python3 $WORKSPACE/artifactory_utils.py --action=download_file --file=$sdk_url || exit 1
curl -o $zip_name $sdk_url || exit 1
7za x ./$zip_name -y > log.txt

unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
echo unzip_name: $unzip_name

rm -rf ./$unzip_name/rtc/bin
rm -rf ./$unzip_name/rtc/demo
rm ./$unzip_name/rtc/commits
rm ./$unzip_name/rtc/package_size_report.txt
mkdir ./$unzip_name/rtc/samples
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
echo unzip_name: $unzip_name

rm -rf ./$unzip_name/rtc/bin
rm -rf ./$unzip_name/rtc/demo
rm ./$unzip_name/rtc/commits
rm ./$unzip_name/rtc/package_size_report.txt
rm -rf ./$unzip_name/pom
fi
mkdir -p ./$unzip_name/rtc/samples
cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
7za a -tzip result.zip -r $unzip_name > log.txt
mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name


if [ $compile_project = true ]; then
# install android sdk
which java
Expand All @@ -79,7 +85,12 @@ if [ $compile_project = true ]; then
export ANDROID_HOME=/usr/lib/android_sdk
echo ANDROID_HOME: $ANDROID_HOME
cd ./$unzip_name/rtc/samples/API-Example || exit 1
./cloud_build.sh || exit 1
if [ -z "$sdk_url" ]; then
./cloud_build.sh false || exit 1
else
./cloud_build.sh true || exit 1
fi

fi


59 changes: 39 additions & 20 deletions .github/ci/build/build_ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
# pr: output test.zip to workspace dir
# others: Rename the zip package name yourself, But need copy it to workspace dir
##################################

xcode_version=$(xcodebuild -version | grep Xcode | awk '{print $2}')
echo "Xcode Version: $xcode_version"
echo ios_direction: $ios_direction
echo Package_Publish: $Package_Publish
echo is_tag_fetch: $is_tag_fetch
Expand All @@ -52,31 +53,49 @@ echo short_version: $short_version
echo pwd: `pwd`
echo sdk_url: $sdk_url

zip_name=${sdk_url##*/}
echo zip_name: $zip_name

curl -o $zip_name $sdk_url || exit 1
7za x ./$zip_name -y > log.txt

unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
echo unzip_name: $unzip_name
unzip_name=Agora_Native_SDK_for_iOS_FULL
zip_name=output.zip
sdk_url_flag=false
if [ -z "$sdk_url" ]; then
sdk_url_flag=false
echo "sdk_url is empty"
echo unzip_name: $unzip_name
mkdir -p ./$unzip_name/samples
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/${ios_direction} || exit 1
ls -al ./$unzip_name/samples/${ios_direction}/
else
sdk_url_flag=true
zip_name=${sdk_url##*/}
echo zip_name: $zip_name
curl -o $zip_name $sdk_url || exit 1
7za x ./$zip_name -y > log.txt
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
echo unzip_name: $unzip_name
rm -rf ./$unzip_name/bin
rm -f ./$unzip_name/commits
rm -f ./$unzip_name/package_size_report.txt

rm -rf ./$unzip_name/bin
rm ./$unzip_name/commits
rm ./$unzip_name/package_size_report.txt
mkdir ./$unzip_name/samples

cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/API-Example || exit 1
ls -al ./$unzip_name/samples/API-Example/
mv ./$unzip_name/samples/API-Example/sdk.podspec ./$unzip_name/ || exit 1
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/API-Example/Podfile || exit 1
rm -f ./$unzip_name/.commits
rm -f ./$unzip_name/AgoraInfra_iOS.swift
rm -f ./$unzip_name/AgoraRtcEngine_iOS.podspec
rm -f ./$unzip_name/AgoraAudio_iOS.podspec
rm -f ./$unzip_name/Package.swift
mkdir -p ./$unzip_name/samples
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/${ios_direction} || exit 1
ls -al ./$unzip_name/samples/${ios_direction}/
mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1
fi

python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1

echo "start compress"
7za a -tzip result.zip -r $unzip_name > log.txt
mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
echo "start move to"
echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name
mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name

if [ $compile_project = true ]; then
cd ./$unzip_name/samples/API-Example
cd ./$unzip_name/samples/${ios_direction}
./cloud_build.sh || exit 1
cd -
fi
Expand Down
50 changes: 33 additions & 17 deletions .github/ci/build/build_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,42 @@ echo short_version: $short_version
echo pwd: `pwd`
echo sdk_url: $sdk_url

zip_name=${sdk_url##*/}
echo zip_name: $zip_name

curl -o $zip_name $sdk_url || exit 1
7za x ./$zip_name -y > log.txt

unzip_name=`ls -S -d */ | grep Agora`
echo unzip_name: $unzip_name

rm -rf ./$unzip_name/bin
rm ./$unzip_name/commits
rm ./$unzip_name/package_size_report.txt
mkdir ./$unzip_name/samples
unzip_name=Agora_Native_SDK_for_iOS_FULL
zip_name=output.zip
sdk_url_flag=false

echo zip_name: $zip_name
if [ -z "$sdk_url" ]; then
sdk_url_flag=false
echo "sdk_url is empty"
echo unzip_name: $unzip_name
mkdir ./$unzip_name/samples
cp -rf ./macOS ./$unzip_name/samples/APIExample || exit 1
ls -al ./$unzip_name/samples/API-Example/
else
sdk_url_flag=true
zip_name=${sdk_url##*/}
echo unzip_name: $unzip_name
curl -o $zip_name $sdk_url || exit 1
7za x ./$zip_name -y > log.txt
unzip_name=`ls -S -d */ | grep Agora`
echo unzip_name: $unzip_name

cp -rf ./macOS ./$unzip_name/samples/APIExample || exit 1
ls -al ./$unzip_name/samples/API-Example/
mv ./$unzip_name/samples/APIExample/sdk.podspec ./$unzip_name/
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/APIExample/Podfile
rm -rf ./$unzip_name/bin
rm -f ./$unzip_name/commits
rm -f ./$unzip_name/package_size_report.txt
rm -f ./$unzip_name/.commits
rm -f ./$unzip_name/AgoraInfra_macOS.swift
rm -f ./$unzip_name/AgoraRtcEngine_macOS.podspec
rm -f ./$unzip_name/Package.swift

mkdir ./$unzip_name/samples
cp -rf ./macOS ./$unzip_name/samples/APIExample || exit 1
ls -al ./$unzip_name/samples/API-Example/
mv ./$unzip_name/samples/APIExample/sdk.podspec ./$unzip_name/
fi

python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/APIExample/Podfile $sdk_url_flag
7za a -tzip result.zip -r $unzip_name
cp result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name

Expand Down
8 changes: 6 additions & 2 deletions .github/ci/build/build_windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ echo short_version: %short_version%
echo pwd: %cd%
echo sdk_url: %sdk_url%

echo off

set zip_name=Agora_Native_SDK_for_Windows_FULL_DEFAULT.zip
if %compile_project% EQU false goto SKIP_DOWNLOAD
set zip_name=%sdk_url%
:LOOP
for /f "tokens=1* delims=</>" %%a in ("%zip_name%") do (
Expand All @@ -70,11 +72,13 @@ dir
curl %sdk_url% -o %zip_name%
REM python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
7z x ./%zip_name% -y

dir
rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\demo
del /F /Q Agora_Native_SDK_for_Windows_FULL\commits
del /F /Q Agora_Native_SDK_for_Windows_FULL\package_size_report.txt
:SKIP_DOWNLOAD


mkdir Agora_Native_SDK_for_Windows_FULL\samples
mkdir Agora_Native_SDK_for_Windows_FULL\samples\API-example
rmdir /S /Q windows\cicd
Expand Down
14 changes: 9 additions & 5 deletions .github/ci/build/modify_podfile.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import os, sys

def modfiy(path):
def modfiy(path, sdk_flag):
with open(path, 'r', encoding='utf-8') as file:
contents = []
for num, line in enumerate(file):
if "pod 'Agora" in line:
line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
if sdk_flag:
line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
elif "pod 'sdk" in line:
line = ""
if sdk_flag:
line = ""
elif 'sh .download_script' in line:
line = line.replace('true', 'false') + "\n"
contents.append(line)
Expand All @@ -19,6 +21,8 @@ def modfiy(path):
fw.close()



if __name__ == '__main__':
path = sys.argv[1:][0]
modfiy(path.strip())
path = sys.argv[1]
sdk_url_is_not_empty = sys.argv[2].lower() == 'true'
modfiy(path.strip(), sdk_url_is_not_empty)
10 changes: 8 additions & 2 deletions Android/APIExample-Audio/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
apply plugin: 'com.android.application'


def sdkVersionFile = file("../gradle.properties")
def properties = new Properties()
sdkVersionFile.withInputStream { stream ->
properties.load(stream)
}
def agoraSdkVersion = properties.getProperty("rtc_sdk_version")
println("${rootProject.project.name} agoraSdkVersion: ${agoraSdkVersion}")
def localSdkPath= "${rootProject.projectDir.absolutePath}/../../sdk"
def agoraSdkVersion = '4.4.1'

android {
compileSdkVersion 32
Expand Down Expand Up @@ -103,7 +110,6 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.2.0'
implementation 'com.yanzhenjie:permission:2.0.3'
implementation 'de.javagl:obj:0.2.1'

implementation "com.squareup.okhttp3:okhttp:4.10.0"
Expand Down
Loading
Loading