From 6d2c3edda0023f7e61e03b19e082fb737bc31a5f Mon Sep 17 00:00:00 2001 From: Mujahedul Islam <99077742+muj-i@users.noreply.github.com> Date: Mon, 4 Mar 2024 03:08:06 +0600 Subject: [PATCH 1/8] fix the type mismatch issue while compiling. --- lib/models/agora_rtc_event_handlers.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/models/agora_rtc_event_handlers.dart b/lib/models/agora_rtc_event_handlers.dart index ade586e..d59fe86 100644 --- a/lib/models/agora_rtc_event_handlers.dart +++ b/lib/models/agora_rtc_event_handlers.dart @@ -186,7 +186,7 @@ class AgoraRtcEventHandlers { /// * [state] The state of the local video, see LocalVideoStreamState . /// * [error] The detailed error information, see LocalVideoStreamError . final void Function(VideoSourceType source, LocalVideoStreamState state, - LocalVideoStreamError error)? onLocalVideoStateChanged; + LocalVideoStreamReason error)? onLocalVideoStateChanged; /// Occurs when the remote video stream state changes. /// This callback does not work properly when the number of users (in the communication profile) or hosts (in the live streaming channel) in a channel exceeds 17. @@ -351,7 +351,7 @@ class AgoraRtcEventHandlers { /// @nodoc final void Function( - RhythmPlayerStateType state, RhythmPlayerErrorType errorCode)? + RhythmPlayerStateType state, RhythmPlayerReason errorCode)? onRhythmPlayerStateChanged; /// Occurs when the SDK cannot reconnect to Agora's edge server 10 seconds after its connection to the server is interrupted. @@ -443,7 +443,7 @@ class AgoraRtcEventHandlers { /// * [state] The state of the local audio. See localaudiostreamstate . /// * [error] Local audio state error codes. See LocalAudioStreamError . final void Function(RtcConnection connection, LocalAudioStreamState state, - LocalAudioStreamError error)? onLocalAudioStateChanged; + LocalAudioStreamReason error)? onLocalAudioStateChanged; /// Occurs when the remote audio state changes. /// When the audio state of a remote user (in a voice/video call channel) or host (in a live streaming channel) changes, the SDK triggers this callback to report the current state of the remote audio stream.This callback does not work properly when the number of users (in the communication profile) or hosts (in the live streaming channel) in a channel exceeds 17. @@ -518,7 +518,7 @@ class AgoraRtcEventHandlers { /// * [state] The current state of the media push. See RtmpStreamPublishState . /// * [errCode] The detailed error information for the media push. See RtmpStreamPublishErrorType . final void Function(String url, RtmpStreamPublishState state, - RtmpStreamPublishErrorType errCode)? onRtmpStreamingStateChanged; + RtmpStreamPublishReason errCode)? onRtmpStreamingStateChanged; /// Reports events during the media push. /// @@ -551,7 +551,7 @@ class AgoraRtcEventHandlers { /// /// /// * [code] The event code of channel media relay. See ChannelMediaRelayEvent . - final void Function(ChannelMediaRelayEvent code)? onChannelMediaRelayEvent; + final void Function(dynamic code)? onChannelMediaRelayEvent; /// @nodoc final void Function(bool isFallbackOrRecover)? From 41234876cfc370435fefb4647e8222a8c01a0d84 Mon Sep 17 00:00:00 2001 From: Mujahedul Islam <99077742+muj-i@users.noreply.github.com> Date: Mon, 4 Mar 2024 03:14:25 +0600 Subject: [PATCH 2/8] Update agora_rtc_event_handlers.dart --- lib/models/agora_rtc_event_handlers.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/models/agora_rtc_event_handlers.dart b/lib/models/agora_rtc_event_handlers.dart index d59fe86..35d998e 100644 --- a/lib/models/agora_rtc_event_handlers.dart +++ b/lib/models/agora_rtc_event_handlers.dart @@ -551,7 +551,7 @@ class AgoraRtcEventHandlers { /// /// /// * [code] The event code of channel media relay. See ChannelMediaRelayEvent . - final void Function(dynamic code)? onChannelMediaRelayEvent; + final void Function(dynamic code)? onChannelMediaRelayEvent1; /// @nodoc final void Function(bool isFallbackOrRecover)? @@ -805,7 +805,7 @@ class AgoraRtcEventHandlers { this.onTranscodingUpdated, this.onAudioRoutingChanged, this.onChannelMediaRelayStateChanged, - this.onChannelMediaRelayEvent, + this.onChannelMediaRelayEvent1, this.onLocalPublishFallbackToAudioOnly, this.onRemoteSubscribeFallbackToAudioOnly, this.onRemoteAudioTransportStats, From 1429f9e4543354d55d5c477662285ae155167ede Mon Sep 17 00:00:00 2001 From: Mujahedul Islam <99077742+muj-i@users.noreply.github.com> Date: Mon, 4 Mar 2024 03:14:41 +0600 Subject: [PATCH 3/8] Update rtc_event_handlers.dart --- lib/controllers/rtc_event_handlers.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/controllers/rtc_event_handlers.dart b/lib/controllers/rtc_event_handlers.dart index 5317959..7351b6f 100644 --- a/lib/controllers/rtc_event_handlers.dart +++ b/lib/controllers/rtc_event_handlers.dart @@ -144,7 +144,7 @@ Future rtcEngineEventHandler( agoraEventHandlers.onStreamMessageError ?.call(connection, remoteUid, streamId, code, missed, cached); }, onChannelMediaRelayEvent: (code) { - agoraEventHandlers.onChannelMediaRelayEvent?.call(code); + agoraEventHandlers.onChannelMediaRelayEvent1?.call(code); }, onChannelMediaRelayStateChanged: (state, code) { agoraEventHandlers.onChannelMediaRelayStateChanged?.call(state, code); }, onAudioPublishStateChanged: From f2077bcfb3b47e268caa5b26f9f1b69768444ce1 Mon Sep 17 00:00:00 2001 From: Mujahedul Islam <99077742+muj-i@users.noreply.github.com> Date: Mon, 4 Mar 2024 03:27:27 +0600 Subject: [PATCH 4/8] added named parameter onChannelMediaRelayEvent --- lib/controllers/rtc_event_handlers.dart | 2 +- lib/models/agora_rtc_event_handlers.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/controllers/rtc_event_handlers.dart b/lib/controllers/rtc_event_handlers.dart index 7351b6f..5317959 100644 --- a/lib/controllers/rtc_event_handlers.dart +++ b/lib/controllers/rtc_event_handlers.dart @@ -144,7 +144,7 @@ Future rtcEngineEventHandler( agoraEventHandlers.onStreamMessageError ?.call(connection, remoteUid, streamId, code, missed, cached); }, onChannelMediaRelayEvent: (code) { - agoraEventHandlers.onChannelMediaRelayEvent1?.call(code); + agoraEventHandlers.onChannelMediaRelayEvent?.call(code); }, onChannelMediaRelayStateChanged: (state, code) { agoraEventHandlers.onChannelMediaRelayStateChanged?.call(state, code); }, onAudioPublishStateChanged: diff --git a/lib/models/agora_rtc_event_handlers.dart b/lib/models/agora_rtc_event_handlers.dart index 35d998e..d59fe86 100644 --- a/lib/models/agora_rtc_event_handlers.dart +++ b/lib/models/agora_rtc_event_handlers.dart @@ -551,7 +551,7 @@ class AgoraRtcEventHandlers { /// /// /// * [code] The event code of channel media relay. See ChannelMediaRelayEvent . - final void Function(dynamic code)? onChannelMediaRelayEvent1; + final void Function(dynamic code)? onChannelMediaRelayEvent; /// @nodoc final void Function(bool isFallbackOrRecover)? @@ -805,7 +805,7 @@ class AgoraRtcEventHandlers { this.onTranscodingUpdated, this.onAudioRoutingChanged, this.onChannelMediaRelayStateChanged, - this.onChannelMediaRelayEvent1, + this.onChannelMediaRelayEvent, this.onLocalPublishFallbackToAudioOnly, this.onRemoteSubscribeFallbackToAudioOnly, this.onRemoteAudioTransportStats, From 7d14acabbec6e5f3726d2f55705852ad3e497df0 Mon Sep 17 00:00:00 2001 From: Mujahedul Islam <99077742+muj-i@users.noreply.github.com> Date: Mon, 4 Mar 2024 03:37:52 +0600 Subject: [PATCH 5/8] remove onChannelMediaRelayEvent onChannelMediaRelayEvent is not defined as an instance field of the RtcEngineEventHandler any more --- lib/controllers/rtc_event_handlers.dart | 8 +++++--- lib/models/agora_rtc_event_handlers.dart | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/controllers/rtc_event_handlers.dart b/lib/controllers/rtc_event_handlers.dart index 5317959..2a118ee 100644 --- a/lib/controllers/rtc_event_handlers.dart +++ b/lib/controllers/rtc_event_handlers.dart @@ -143,9 +143,11 @@ Future rtcEngineEventHandler( (connection, remoteUid, streamId, code, missed, cached) { agoraEventHandlers.onStreamMessageError ?.call(connection, remoteUid, streamId, code, missed, cached); - }, onChannelMediaRelayEvent: (code) { - agoraEventHandlers.onChannelMediaRelayEvent?.call(code); - }, onChannelMediaRelayStateChanged: (state, code) { + }, + // onChannelMediaRelayEvent: (code) { + // agoraEventHandlers.onChannelMediaRelayEvent?.call(code); + // }, + onChannelMediaRelayStateChanged: (state, code) { agoraEventHandlers.onChannelMediaRelayStateChanged?.call(state, code); }, onAudioPublishStateChanged: (channel, oldState, newState, elapseSinceLastState) { diff --git a/lib/models/agora_rtc_event_handlers.dart b/lib/models/agora_rtc_event_handlers.dart index d59fe86..fe3c3bc 100644 --- a/lib/models/agora_rtc_event_handlers.dart +++ b/lib/models/agora_rtc_event_handlers.dart @@ -551,7 +551,7 @@ class AgoraRtcEventHandlers { /// /// /// * [code] The event code of channel media relay. See ChannelMediaRelayEvent . - final void Function(dynamic code)? onChannelMediaRelayEvent; + // final void Function(dynamic code)? onChannelMediaRelayEvent; /// @nodoc final void Function(bool isFallbackOrRecover)? @@ -805,7 +805,7 @@ class AgoraRtcEventHandlers { this.onTranscodingUpdated, this.onAudioRoutingChanged, this.onChannelMediaRelayStateChanged, - this.onChannelMediaRelayEvent, + // this.onChannelMediaRelayEvent, this.onLocalPublishFallbackToAudioOnly, this.onRemoteSubscribeFallbackToAudioOnly, this.onRemoteAudioTransportStats, From 2e1d232e3cd0f458a0fb2b65e50bfc6a11f837f0 Mon Sep 17 00:00:00 2001 From: Mujahedul Islam <99077742+muj-i@users.noreply.github.com> Date: Mon, 4 Mar 2024 11:27:42 +0600 Subject: [PATCH 6/8] remove commented out code for onChannelMediaRelayEvent --- lib/controllers/rtc_event_handlers.dart | 5 +---- lib/models/agora_rtc_event_handlers.dart | 7 ------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/controllers/rtc_event_handlers.dart b/lib/controllers/rtc_event_handlers.dart index 2a118ee..d439aa4 100644 --- a/lib/controllers/rtc_event_handlers.dart +++ b/lib/controllers/rtc_event_handlers.dart @@ -143,10 +143,7 @@ Future rtcEngineEventHandler( (connection, remoteUid, streamId, code, missed, cached) { agoraEventHandlers.onStreamMessageError ?.call(connection, remoteUid, streamId, code, missed, cached); - }, - // onChannelMediaRelayEvent: (code) { - // agoraEventHandlers.onChannelMediaRelayEvent?.call(code); - // }, + }, onChannelMediaRelayStateChanged: (state, code) { agoraEventHandlers.onChannelMediaRelayStateChanged?.call(state, code); }, onAudioPublishStateChanged: diff --git a/lib/models/agora_rtc_event_handlers.dart b/lib/models/agora_rtc_event_handlers.dart index fe3c3bc..4225eaf 100644 --- a/lib/models/agora_rtc_event_handlers.dart +++ b/lib/models/agora_rtc_event_handlers.dart @@ -547,12 +547,6 @@ class AgoraRtcEventHandlers { ChannelMediaRelayState state, ChannelMediaRelayError code)? onChannelMediaRelayStateChanged; - /// Reports events during the media stream relay. - /// - /// - /// * [code] The event code of channel media relay. See ChannelMediaRelayEvent . - // final void Function(dynamic code)? onChannelMediaRelayEvent; - /// @nodoc final void Function(bool isFallbackOrRecover)? onLocalPublishFallbackToAudioOnly; @@ -805,7 +799,6 @@ class AgoraRtcEventHandlers { this.onTranscodingUpdated, this.onAudioRoutingChanged, this.onChannelMediaRelayStateChanged, - // this.onChannelMediaRelayEvent, this.onLocalPublishFallbackToAudioOnly, this.onRemoteSubscribeFallbackToAudioOnly, this.onRemoteAudioTransportStats, From 1e7cb6466a388bacba1ef51d935567be52e0eaf5 Mon Sep 17 00:00:00 2001 From: Tadas Petra Date: Mon, 4 Mar 2024 09:21:41 -0600 Subject: [PATCH 7/8] Update version type --- CHANGELOG.md | 3 +++ lib/models/agora_rtm_mute_request.dart | 2 +- pubspec.yaml | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f64838a..a3e1863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.3.8 +- Update types from agora_rtc_engine 6.3.0 + ## 1.3.7 - Fixes active speaker bug when user overrides with manual pin - Updates permission_handler to v11.0.0 diff --git a/lib/models/agora_rtm_mute_request.dart b/lib/models/agora_rtm_mute_request.dart index 6c10e99..e30d355 100644 --- a/lib/models/agora_rtm_mute_request.dart +++ b/lib/models/agora_rtm_mute_request.dart @@ -99,7 +99,7 @@ class AgoraUIKit { String platform = platformStr(); String framework = "flutter"; - String version = "1.3.7"; + String version = "1.3.8"; AgoraUIKit.fromJson(Map json) : platform = json['platform'], diff --git a/pubspec.yaml b/pubspec.yaml index 146895e..574b903 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: agora_uikit description: Flutter plugin to simply integrate Agora Video Calling or Live Video Streaming to your app with just a few lines of code. -version: 1.3.7 +version: 1.3.8 homepage: https://www.agora.io/en/ repository: https://github.com/AgoraIO-Community/VideoUIKit-Flutter @@ -10,7 +10,7 @@ environment: flutter: ">=2.2.0" dependencies: - agora_rtc_engine: ^6.2.2 + agora_rtc_engine: ^6.3.0 agora_rtm: ^1.5.5 flutter: sdk: flutter From 59b2f10a1f3717b761f63883f3680abe5e898d8a Mon Sep 17 00:00:00 2001 From: Tadas Petra Date: Mon, 4 Mar 2024 09:32:30 -0600 Subject: [PATCH 8/8] Update type exports --- lib/agora_uikit.dart | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/agora_uikit.dart b/lib/agora_uikit.dart index c43c347..b109e8d 100644 --- a/lib/agora_uikit.dart +++ b/lib/agora_uikit.dart @@ -16,10 +16,10 @@ export 'package:agora_rtc_engine/agora_rtc_engine.dart' RemoteAudioState, RemoteAudioStateReason, LocalAudioStreamState, - LocalAudioStreamError, + LocalAudioStreamReason, AudioVolumeInfo, LocalVideoStreamState, - LocalVideoStreamError, + LocalVideoStreamReason, AreaCode, UserInfo, ConnectionStateType, @@ -34,11 +34,10 @@ export 'package:agora_rtc_engine/agora_rtc_engine.dart' AudioMixingStateType, AudioMixingReasonType, RtmpStreamPublishState, - RtmpStreamPublishErrorType, + RtmpStreamPublishReason, InjectStreamStatus, ChannelMediaRelayState, ChannelMediaRelayError, - ChannelMediaRelayEvent, StreamPublishState, StreamSubscribeState, RtmpStreamingEvent, @@ -63,16 +62,15 @@ export 'package:agora_rtm/agora_rtm.dart' RtmPeerOnlineState, RtmPeerSubscriptionOption, RtmRemoteInvitationState; - export 'package:permission_handler/permission_handler.dart'; export 'models/agora_channel_data.dart' show AgoraChannelData; export 'models/agora_connection_data.dart' show AgoraConnectionData; export 'models/agora_rtc_event_handlers.dart' show AgoraRtcEventHandlers; -export 'models/agora_rtm_client_event_handler.dart' - show AgoraRtmClientEventHandler; export 'models/agora_rtm_channel_event_handler.dart' show AgoraRtmChannelEventHandler; +export 'models/agora_rtm_client_event_handler.dart' + show AgoraRtmClientEventHandler; export 'src/agora_client.dart' show AgoraClient; export 'src/buttons/buttons.dart' show AgoraVideoButtons; export 'src/enums.dart';