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

fix the type mismatch issue while compiling. #178

Merged
merged 8 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 5 additions & 7 deletions lib/agora_uikit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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';
Expand Down
5 changes: 2 additions & 3 deletions lib/controllers/rtc_event_handlers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,8 @@ Future<RtcEngineEventHandler> 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) {
},
onChannelMediaRelayStateChanged: (state, code) {
agoraEventHandlers.onChannelMediaRelayStateChanged?.call(state, code);
}, onAudioPublishStateChanged:
(channel, oldState, newState, elapseSinceLastState) {
Expand Down
15 changes: 4 additions & 11 deletions lib/models/agora_rtc_event_handlers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
///
Expand Down Expand Up @@ -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(ChannelMediaRelayEvent code)? onChannelMediaRelayEvent;

/// @nodoc
final void Function(bool isFallbackOrRecover)?
onLocalPublishFallbackToAudioOnly;
Expand Down Expand Up @@ -805,7 +799,6 @@ class AgoraRtcEventHandlers {
this.onTranscodingUpdated,
this.onAudioRoutingChanged,
this.onChannelMediaRelayStateChanged,
this.onChannelMediaRelayEvent,
this.onLocalPublishFallbackToAudioOnly,
this.onRemoteSubscribeFallbackToAudioOnly,
this.onRemoteAudioTransportStats,
Expand Down
2 changes: 1 addition & 1 deletion lib/models/agora_rtm_mute_request.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, dynamic> json)
: platform = json['platform'],
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
Loading