Fix controller singleton

Author: Ortes

android/src/main/kotlin/com/xraph/plugin/flutter_unity_widget/DataStreamHandler.kt

@@ -30,6 +30,8 @@ enum class DataStreamEventTypes {
     OnUnityPlayerQuited,
     OnUnitySceneLoaded,
     OnUnityMessage,
+    OnViewAttached,
+    OnViewDetached,
 }
 
 class DataStreamHandler: EventChannel.StreamHandler {

android/src/main/kotlin/com/xraph/plugin/flutter_unity_widget/FlutterUnityWidgetController.kt

@@ -246,18 +246,23 @@ class FlutterUnityWidgetController(
         UnityPlayerUtils.addUnityViewToGroup(view)
         UnityPlayerUtils.focus()
 
-        attached = true
-
         if (UnityPlayerUtils.controllers.size >= 2) {
-            for (controller in UnityPlayerUtils.controllers.subList(0, UnityPlayerUtils.controllers.size - 1)) {
+            for (controller in UnityPlayerUtils.controllers.values) {
                 if (controller.attached) {
                     controller.detach()
                 }
             }
         }
+        attached = true
+
 
         Handler(Looper.getMainLooper()).post {
-            methodChannel.invokeMethod("events#onViewAttached", null)
+            DataStreamEventNotifier.notifier.onNext(
+                DataStreamEvent(
+                    DataStreamEventTypes.OnViewAttached.name,
+                    viewId,
+                )
+            )
         }
     }
 
@@ -305,7 +310,12 @@ class FlutterUnityWidgetController(
 
     private fun detach() {
         Handler(Looper.getMainLooper()).post {
-            methodChannel.invokeMethod("events#onViewDetached", null)
+            DataStreamEventNotifier.notifier.onNext(
+                DataStreamEvent(
+                    DataStreamEventTypes.OnViewDetached.name,
+                    viewId,
+                )
+            )
         }
         attached = false
     }

lib/src/helpers/types.dart

@@ -88,6 +88,12 @@ class EventDataPayload {
       case 'OnViewReattached':
         eventType = UnityEventTypes.OnViewReattached;
         break;
+      case 'OnViewAttached':
+        eventType = UnityEventTypes.OnViewAttached;
+        break;
+      case 'OnViewDetached':
+        eventType = UnityEventTypes.OnViewDetached;
+        break;
     }
 
     return EventDataPayload(

lib/src/io/device_method.dart

@@ -87,10 +87,12 @@ class MethodChannelUnityWidget extends UnityWidgetPlatform {
               .add(UnitySceneLoadedEvent(0, SceneLoaded.fromMap(event.data)));
           break;
         case UnityEventTypes.OnViewAttached:
-          _unityStreamController.add(UnityAttachedEvent(0, event.data));
+          _unityStreamController
+              .add(UnityAttachedEvent(int.parse((event.data as String).split('-').last), event.data));
           break;
         case UnityEventTypes.OnViewDetached:
-          _unityStreamController.add(UnityDetachedEvent(0, event.data));
+          _unityStreamController
+              .add(UnityDetachedEvent(int.parse((event.data as String).split('-').last), event.data));
           break;
         case UnityEventTypes.OnUnityPlayerReInitialize:
         case UnityEventTypes.OnViewReattached:

lib/src/io/flutter_unity_device_method.dart

@@ -70,8 +70,15 @@ class FlutterUnityMethodChannel extends FlutterUnityPlatform {
             _unityStreamController.add(UnityMessageEvent(0, payload.data));
             break;
           case UnityEventTypes.OnUnitySceneLoaded:
-            _unityStreamController.add(
-                UnitySceneLoadedEvent(0, SceneLoaded.fromMap(payload.data)));
+            _unityStreamController.add(UnitySceneLoadedEvent(0, SceneLoaded.fromMap(payload.data)));
+            break;
+          case UnityEventTypes.OnViewAttached:
+            _unityStreamController
+                .add(UnityAttachedEvent(int.parse((payload.data as String).split('-').last), payload.data));
+            break;
+          case UnityEventTypes.OnViewDetached:
+            _unityStreamController
+                .add(UnityDetachedEvent(int.parse((payload.data as String).split('-').last), payload.data));
             break;
           case UnityEventTypes.OnUnityPlayerReInitialize:
           case UnityEventTypes.OnViewReattached:

lib/src/io/mobile_unity_widget_controller.dart

@@ -32,10 +32,12 @@ class MobileUnityWidgetController extends UnityWidgetController {
       int id, MobileUnityWidgetState unityWidgetState) async {
     await UnityWidgetPlatform.instance.init(id);
     FlutterUnityController.instance.lastUnityId = id;
-    return MobileUnityWidgetController._(
+    var controller = MobileUnityWidgetController._(
       unityWidgetState,
       unityId: id,
     );
+    await UnityWidgetPlatform.instance.init(id);
+    return controller;
   }
 
   void _connectStreams(int unityId) {

lib/src/io/unity_widget.dart

@@ -204,9 +204,6 @@ class _UnityWidgetState extends State<UnityWidget> {
       widget.onUnityCreated!(controller);
     }
 
-    // if (widget.onUnityAttached != null)
-    //   widget.onUnityAttached!();
-
     if (widget.printSetupLog) {
       log('*********************************************');
       log('** flutter unity controller setup complete **');