fix: Web call Platform API error

AgoraIO-Extensions · May 20, 2021 · d760093 · d760093
1 parent 6795c0b
commit d760093
Show file tree

Hide file tree

Showing 8 changed files with 224 additions and 203 deletions.
diff --git a/example/lib/examples/advanced/multi_channel.dart b/example/lib/examples/advanced/multi_channel.dart
@@ -235,7 +235,7 @@ class _State extends State<MultiChannel> {
     return Expanded(
       child: Stack(
         children: [
-          RtcLocalView.TextureView(
+          RtcLocalView.SurfaceView(
             channelId: renderChannelId,
           ),
           if (remoteUid != null)
@@ -248,7 +248,7 @@ class _State extends State<MultiChannel> {
                     (e) => Container(
                       width: 120,
                       height: 120,
-                      child: RtcRemoteView.TextureView(
+                      child: RtcRemoteView.SurfaceView(
                         uid: e,
                         channelId: renderChannelId,
                       ),

diff --git a/example/lib/examples/basic/join_channel_video.dart b/example/lib/examples/basic/join_channel_video.dart
@@ -173,7 +173,8 @@ class _State extends State<JoinChannelVideo> {
     return Expanded(
       child: Stack(
         children: [
-          if (startPreview) RtcLocalView.TextureView(),
+          if (startPreview)
+            kIsWeb ? RtcLocalView.SurfaceView() : RtcLocalView.TextureView(),
           Align(
             alignment: Alignment.topLeft,
             child: SingleChildScrollView(
@@ -185,10 +186,15 @@ class _State extends State<JoinChannelVideo> {
                     child: Container(
                       width: 120,
                       height: 120,
-                      child: RtcRemoteView.TextureView(
-                        uid: e,
-                        channelId: channelId,
-                      ),
+                      child: kIsWeb
+                          ? RtcRemoteView.SurfaceView(
+                              uid: e,
+                              channelId: channelId,
+                            )
+                          : RtcRemoteView.TextureView(
+                              uid: e,
+                              channelId: channelId,
+                            ),
                     ),
                   ),
                 )),

diff --git a/lib/rtc_local_view.dart b/lib/rtc_local_view.dart
@@ -41,6 +41,7 @@ class TextureView extends RtcTextureView {
     mirrorMode = VideoMirrorMode.Disabled,
     PlatformViewCreatedCallback? onPlatformViewCreated,
     Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers,
+    useFlutterTexture = true,
   }) : super(
           key: key,
           uid: 0,
@@ -49,5 +50,6 @@ class TextureView extends RtcTextureView {
           mirrorMode: mirrorMode,
           onPlatformViewCreated: onPlatformViewCreated,
           gestureRecognizers: gestureRecognizers,
+          useFlutterTexture: useFlutterTexture,
         );
 }
diff --git a/lib/rtc_remote_view.dart b/lib/rtc_remote_view.dart
@@ -43,6 +43,7 @@ class TextureView extends RtcTextureView {
     mirrorMode = VideoMirrorMode.Auto,
     PlatformViewCreatedCallback? onPlatformViewCreated,
     Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers,
+    useFlutterTexture = true,
   })  : assert(uid != 0),
         super(
           key: key,
@@ -52,5 +53,6 @@ class TextureView extends RtcTextureView {
           mirrorMode: mirrorMode,
           onPlatformViewCreated: onPlatformViewCreated,
           gestureRecognizers: gestureRecognizers,
+          useFlutterTexture: useFlutterTexture,
         );
 }
diff --git a/lib/src/events.dart b/lib/src/events.dart
@@ -1,6 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
+
 import 'classes.dart';
 import 'enum_converter.dart';
 import 'enums.dart';
@@ -1101,7 +1103,7 @@ class RtcEngineEventHandler {
   // ignore: public_member_api_docs
   void process(String methodName, dynamic data) {
     List<dynamic> newData;
-    if (Platform.isWindows) {
+    if (!kIsWeb && Platform.isWindows) {
       methodName = methodName.substring(2);
       newData = List<dynamic>.from(
           Map<String, dynamic>.from(jsonDecode(data as String)).values);
@@ -1840,7 +1842,7 @@ class RtcChannelEventHandler {
   // ignore: public_member_api_docs
   void process(String methodName, dynamic data) {
     List<dynamic> newData;
-    if (Platform.isWindows) {
+    if (!kIsWeb && Platform.isWindows) {
       methodName = methodName.substring(2);
       newData = List<dynamic>.from(
           Map<String, dynamic>.from(jsonDecode(data as String)).values);