Skip to content

Commit

Permalink
feat: upgrade native sdk 4.1.1.21 (#1433)
Browse files Browse the repository at this point in the history
Update native sdk 4.1.1.21 dependencies

> This pull request is trigger by bot, you can checkout this branch and
update it.

---------

Co-authored-by: littleGnAl <[email protected]>
Co-authored-by: guoxianzhe <[email protected]>
  • Loading branch information
3 people authored Nov 21, 2023
1 parent ba02c05 commit 16089ab
Show file tree
Hide file tree
Showing 71 changed files with 14,124 additions and 6,661 deletions.
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ dependencies {
if (isDev(project)) {
implementation fileTree(dir: "libs", include: ["*.jar"])
} else {
api 'io.agora.rtc:iris-rtc:4.1.1.6-banban.3'
api 'io.agora.rtc:agora-special-full:4.1.1.155'
api 'io.agora.rtc:full-screen-sharing:4.1.1.155'
api 'io.agora.rtc:iris-rtc:4.1.1.21-banban.1'
api 'io.agora.rtc:agora-special-full:4.1.1.21'
api 'io.agora.rtc:full-screen-sharing:4.1.1.21'
}
}

Expand Down
5 changes: 3 additions & 2 deletions example/lib/examples/advanced/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ final advanced = [
'name': 'StartLocalVideoTranscoder',
'widget': const StartLocalVideoTranscoder()
},
{'name': 'ProcessVideoRawData', 'widget': const ProcessVideoRawData()},
{'name': 'ProcessAudioRawData', 'widget': const ProcessAudioRawData()},
// TODO(littlegnal): Not supported for this special version
// {'name': 'ProcessVideoRawData', 'widget': const ProcessVideoRawData()},
// {'name': 'ProcessAudioRawData', 'widget': const ProcessAudioRawData()},
{'name': 'AudioSpectrum', 'widget': const AudioSpectrum()},
{'name': 'MediaRecorder', 'widget': const MediaRecorder()},
{'name': 'PushVideoFrame', 'widget': const PushVideoFrame()},
Expand Down
86 changes: 47 additions & 39 deletions example/lib/examples/advanced/music_player/music_player.dart
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,7 @@ class _MusicPlayerExampleState extends State<MusicPlayerExample> {
if (!isPreloaded) {
_preloadCompleted = Completer();
_getLyricCompleted = Completer();
await _musicContentCenter.preload(
songCode: _selectedMusic.songCode!);
await _musicContentCenter.preload(_selectedMusic.songCode!);
_getLyricRequestId = await _musicContentCenter.getLyric(
songCode: _selectedMusic.songCode!);
} else {
Expand Down Expand Up @@ -282,46 +281,55 @@ class _MusicPlayerExampleState extends State<MusicPlayerExample> {
));

_musicContentCenter.registerEventHandler(MusicContentCenterEventHandler(
onMusicChartsResult: (requestId, result, status) {
logSink.log(
'[onMusicChartsResult], requestId: $requestId, status: $status, result: ${result.toString()}');
if (status == MusicContentCenterStatusCode.kMusicContentCenterStatusOk) {
if (_currentRequestId == requestId) {
onMusicChartsResult: (requestId, result, status) {
logSink.log(
'[onMusicChartsResult], requestId: $requestId, status: $status, result: ${result.toString()}');
if (status ==
MusicContentCenterStatusCode.kMusicContentCenterStatusOk) {
if (_currentRequestId == requestId) {
setState(() {
_musicChartInfos = result;
});
}
}
},
onMusicCollectionResult: (String requestId, MusicCollection result,
MusicContentCenterStatusCode errorCode) {
logSink.log(
'[onMusicCollectionResult], requestId: $requestId, errorCode: $errorCode, result: ${result.toString()}');

if (_musicCollectionRequestId == requestId) {
setState(() {
_musicChartInfos = result;
_musicCollection = result;
});
} else if (_searchMusicRequestId == requestId) {
setState(() {
_searchedMusicCollection = result;
});
}
}
}, onMusicCollectionResult: (String requestId, MusicCollection result,
MusicContentCenterStatusCode errorCode) {
logSink.log(
'[onMusicCollectionResult], requestId: $requestId, errorCode: $errorCode, result: ${result.toString()}');

if (_musicCollectionRequestId == requestId) {
setState(() {
_musicCollection = result;
});
} else if (_searchMusicRequestId == requestId) {
setState(() {
_searchedMusicCollection = result;
});
}
}, onPreLoadEvent: (int songCode, int percent, String lyricUrl,
PreloadStatusCode status, MusicContentCenterStatusCode errorCode) {
logSink.log(
'[onPreLoadEvent], songCode: $songCode, percent: $percent status: $status, errorCode: $errorCode, lyricUrl: $lyricUrl');
if (_selectedMusic.songCode == songCode &&
status == PreloadStatusCode.kPreloadStatusCompleted) {
_preloadCompleted?.complete();
_preloadCompleted = null;
}
}, onLyricResult: (String requestId, String lyricUrl,
MusicContentCenterStatusCode errorCode) {
if (_getLyricRequestId == requestId) {
_getLyricCompleted?.complete(lyricUrl);
_getLyricCompleted = null;
}
}));
},
onPreLoadEvent: (String requestId,
int songCode,
int percent,
String lyricUrl,
PreloadStatusCode status,
MusicContentCenterStatusCode errorCode) {
logSink.log(
'[onPreLoadEvent], songCode: $songCode, percent: $percent status: $status, errorCode: $errorCode, lyricUrl: $lyricUrl');
if (_selectedMusic.songCode == songCode &&
status == PreloadStatusCode.kPreloadStatusCompleted) {
_preloadCompleted?.complete();
_preloadCompleted = null;
}
},
onLyricResult: (String requestId, int songCode, String lyricUrl,
MusicContentCenterStatusCode errorCode) {
if (_getLyricRequestId == requestId) {
_getLyricCompleted?.complete(lyricUrl);
_getLyricCompleted = null;
}
},
));

_musicPlayer = await _musicContentCenter.createMusicPlayer();

Expand Down
3 changes: 2 additions & 1 deletion example/lib/examples/advanced/precall_test/precall_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,8 @@ class _State extends State<PreCallTest> {
_isStartEchoTest = !_isStartEchoTest;

if (_isStartEchoTest) {
await _engine.startEchoTest();
await _engine
.startEchoTest(const EchoTestConfiguration());
} else {
await _engine.stopEchoTest();
}
Expand Down
5 changes: 2 additions & 3 deletions ios/agora_rtc_engine.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ Pod::Spec.new do |s|
s.source = { :path => '.' }
s.source_files = 'Classes/**/*.{h,mm,m,swift}'
s.dependency 'Flutter'
s.dependency 'AgoraIrisRTC_iOS', '4.1.1.6-banban.3'
s.dependency 'AgoraRtcEngine_Special_iOS', '4.1.1.155'
s.weak_frameworks = 'AgoraAiEchoCancellationExtension', 'AgoraAiNoiseSuppressionExtension', 'AgoraAudioBeautyExtension', 'AgoraClearVisionExtension', 'AgoraContentInspectExtension', 'AgoraDrmLoaderExtension', 'AgoraFaceDetectionExtension', 'AgoraReplayKitExtension', 'AgoraSpatialAudioExtension', 'AgoraVideoQualityAnalyzerExtension', 'AgoraVideoSegmentationExtension'
s.dependency 'AgoraIrisRTC_iOS', '4.1.1.21-banban.1'
s.dependency 'AgoraRtcEngine_Special_iOS', '4.1.1.21'
# s.dependency 'AgoraRtcWrapper'
s.platform = :ios, '9.0'
s.swift_version = '5.0'
Expand Down
Loading

0 comments on commit 16089ab

Please sign in to comment.