update mainAgoraUser logic

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.4
+
+- Fixes error [#137](https://github.com/AgoraIO-Community/VideoUIKit-Flutter/issues/137)
+
 ## 1.3.3
 
 - BREAKING CHANGE: VideoSourceType for `onFirstLocalVideoFrame` callback

example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,9 +6,9 @@ import FlutterMacOS
 import Foundation
 
 import agora_rtc_engine
-import iris_event
+import iris_method_channel
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AgoraRtcNgPlugin.register(with: registry.registrar(forPlugin: "AgoraRtcNgPlugin"))
-  IrisEventPlugin.register(with: registry.registrar(forPlugin: "IrisEventPlugin"))
+  IrisMethodChannelPlugin.register(with: registry.registrar(forPlugin: "IrisMethodChannelPlugin"))
 }

example/test/widget_test.dart

@@ -19,7 +19,7 @@ void main() {
     expect(
       find.byWidgetPredicate(
         (Widget widget) =>
-            widget is Text && widget.data.startsWith('Running on:'),
+            widget is Text && widget.data!.startsWith('Running on:'),
       ),
       findsOneWidget,
     );

example/windows/flutter/generated_plugin_registrant.cc

@@ -7,14 +7,14 @@
 #include "generated_plugin_registrant.h"
 
 #include <agora_rtc_engine/agora_rtc_engine_plugin.h>
-#include <iris_event/iris_event_plugin.h>
+#include <iris_method_channel/iris_method_channel_plugin_c_api.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   AgoraRtcEnginePluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("AgoraRtcEnginePlugin"));
-  IrisEventPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("IrisEventPlugin"));
+  IrisMethodChannelPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("IrisMethodChannelPluginCApi"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
 }

example/windows/flutter/generated_plugins.cmake

@@ -4,7 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   agora_rtc_engine
-  iris_event
+  iris_method_channel
   permission_handler_windows
 )
 

lib/controllers/rtc_event_handlers.dart

@@ -235,7 +235,7 @@ Future<RtcEngineEventHandler> rtcEngineEventHandler(
       if (state == RemoteVideoState.remoteVideoStateStopped) {
         sessionController.updateUserVideo(uid: remoteUid, videoDisabled: true);
       } else if (state == RemoteVideoState.remoteVideoStateDecoding &&
-          (reason == RemoteVideoState.remoteVideoStateStarting ||
+          (state == RemoteVideoState.remoteVideoStateStarting ||
               reason ==
                   RemoteVideoStateReason.remoteVideoStateReasonRemoteUnmuted)) {
         sessionController.updateUserVideo(uid: remoteUid, videoDisabled: false);

lib/src/layout/floating_layout.dart

@@ -439,7 +439,9 @@ class _FloatingLayoutState extends State<FloatingLayout> {
                 ),
               ),
               widget.client.sessionController.value.mainAgoraUser.uid !=
-                      widget.client.sessionController.value.localUid
+                          widget.client.sessionController.value.localUid &&
+                      widget.client.sessionController.value.mainAgoraUser.uid !=
+                          0
                   ? Expanded(
                       child: Stack(
                         children: [

pubspec.yaml

@@ -10,7 +10,7 @@ environment:
   flutter: ">=2.2.0"
 
 dependencies:
-  agora_rtc_engine: ">= 6.1.0 <6.2.0"
+  agora_rtc_engine: ">= 6.1.1 <6.2.0"
   agora_rtm: ^1.5.0
   flutter:
     sdk: flutter