Merge branch 'rc/3.4.+' into rc/4.0.+

# Conflicts: # lib/src/rtc_channel.dart
KevalPrajapati · May 17, 2021 · 216c5ba · 216c5ba
2 parents 4d05a50 + 366eef1
commit 216c5ba
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/lib/agora_rtc_engine_web.dart b/lib/agora_rtc_engine_web.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-
 // In order to *not* need this ignore, consider extracting the "web" version
 // of your plugin as a separate package, instead of inlining it in the same
 // package as the core of your plugin.

diff --git a/lib/rtc_local_view.dart b/lib/rtc_local_view.dart
@@ -3,8 +3,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 
-import './src/enums.dart';
-import './src/rtc_render_view.dart';
+import 'src/enums.dart';
+import 'src/rtc_render_view.dart';
 
 /// SurfaceView.
 class SurfaceView extends RtcSurfaceView {

diff --git a/lib/rtc_remote_view.dart b/lib/rtc_remote_view.dart
@@ -2,8 +2,8 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/services.dart';
 
-import './src/enums.dart';
-import './src/rtc_render_view.dart';
+import 'src/enums.dart';
+import 'src/rtc_render_view.dart';
 
 /// SurfaceView.
 class SurfaceView extends RtcSurfaceView {

diff --git a/lib/src/enums.dart b/lib/src/enums.dart
@@ -1,7 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
 import 'events.dart';
-import 'rtc_engine.dart';
 
 /// The area of connection.
 enum AreaCode {

diff --git a/lib/src/rtc_channel.dart b/lib/src/rtc_channel.dart
@@ -6,7 +6,6 @@ import 'classes.dart';
 import 'enum_converter.dart';
 import 'enums.dart';
 import 'events.dart';
-import 'rtc_engine.dart';
 
 /// The RtcChannel class.
 class RtcChannel with RtcChannelInterface {
@@ -317,8 +316,7 @@ class RtcChannel with RtcChannelInterface {
 
   @override
   Future<int?> createDataStreamWithConfig(DataStreamConfig config) {
-    return _invokeMethod(
-        'createDataStream', {'config': config.toJson()});
+    return _invokeMethod('createDataStream', {'config': config.toJson()});
   }
 
   @override

diff --git a/lib/src/rtc_render_view.dart b/lib/src/rtc_render_view.dart
@@ -6,8 +6,6 @@ import 'package:flutter/widgets.dart';
 
 import 'enum_converter.dart';
 import 'enums.dart';
-import 'rtc_channel.dart';
-import 'rtc_engine.dart';
 
 final Map<int, MethodChannel> _channels = {};