Fixed ViewService from IOC speed up

InvertGames · Oct 21, 2015 · 9328a3e · 9328a3e
1 parent a92d4ca
commit 9328a3e
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 20 deletions.
diff --git a/Base.meta b/Base.meta
diff --git a/Base/Bindings.meta b/Base/Bindings.meta
diff --git a/Base/Views.meta b/Base/Views.meta
diff --git a/Editor/UndoSystem.meta b/Editor/UndoSystem.meta
diff --git a/Editor/uFrameEditors/GameManagerInspector.cs b/Editor/uFrameEditors/GameManagerInspector.cs
@@ -30,12 +30,12 @@ public override void OnInspectorGUI()
                     if (GUIHelpers.DoTriggerButton(new UFStyle()
                     {
                         Label =
-                            string.Format("'{0}': {1}->{2}", instance.Name, instance.Base.Name,
-                                instance.Instance.GetType().Name),
+                            string.Format("'{0}': {1}->{2}", instance.Key.Item1, instance.Key.Item2,
+                                instance.Value.GetType().Name),
                         BackgroundStyle = ElementDesignerStyles.EventButtonStyleSmall
                     }))
                     {
-                        Debug.Log(instance.Instance);
+                        Debug.Log(instance.Value);
                     }
 
 
@@ -50,7 +50,7 @@ public override void OnInspectorGUI()
                     if (GUIHelpers.DoTriggerButton(new UFStyle()
                     {
                         BackgroundStyle = ElementDesignerStyles.EventButtonStyleSmall,
-                        Label = string.Format("{0}: {1}->{2}", instance.Name, instance.From.Name, instance.To.Name)
+                        Label = string.Format("{0}: {1}->{2}", instance.Key.Item2, instance.Key.Item1.Name, instance.Value.Name)
                     }))
                     {
 

diff --git a/Editor/uFrameEditors/uFrameMVVMKernelInspector.cs b/Editor/uFrameEditors/uFrameMVVMKernelInspector.cs
@@ -104,12 +104,12 @@ public override void OnInspectorGUI()
                     if (GUIHelpers.DoTriggerButton(new UFStyle()
                     {
                         Label =
-                            string.Format("'{0}': {1}->{2}", instance.Name, instance.Base.Name,
-                                instance.Instance.GetType().Name),
+                            string.Format("'{0}': {1}->{2}", instance.Key.Item1, instance.Key.Item2,
+                                instance.Value.GetType().Name),
                         BackgroundStyle = ElementDesignerStyles.EventButtonStyleSmall
                     }))
                     {
-                        Debug.Log(instance.Instance);
+                        Debug.Log(instance.Value);
                     }
 
 
@@ -124,7 +124,7 @@ public override void OnInspectorGUI()
                     if (GUIHelpers.DoTriggerButton(new UFStyle()
                     {
                         BackgroundStyle = ElementDesignerStyles.EventButtonStyleSmall,
-                        Label = string.Format("{0}: {1}->{2}", instance.Name, instance.From.Name, instance.To.Name)
+                        Label = string.Format("{0}: {1}->{2}", instance.Key.Item2, instance.Key.Item1.Name, instance.Value.Name)
                     }))
                     {
                     }

diff --git a/Kernel.meta b/Kernel.meta
diff --git a/Kernel/Serialization.meta b/Kernel/Serialization.meta
diff --git a/Kernel/Serialization/Json.meta b/Kernel/Serialization/Json.meta
diff --git a/Kernel/Serialization/Storage.meta b/Kernel/Serialization/Storage.meta
diff --git a/MVVM/Services/ViewService.cs b/MVVM/Services/ViewService.cs
@@ -35,8 +35,8 @@ public override void Setup()
 
             this.OnEvent<ViewDestroyedEvent>()
                 .Subscribe(ViewDestroyed);
-				
-			this.OnEvent<ViewModelDestroyedEvent>()
+
+            this.OnEvent<ViewModelDestroyedEvent>()
                 .Subscribe(ViewModelDestroyed);
         }
 
@@ -99,7 +99,7 @@ protected virtual void ViewCreated(ViewCreatedEvent viewCreatedEvent)
             if (view.ViewModelObject == null && view.BindOnStart)
             {
                 var viewModel = FetchViewModel(viewCreatedEvent.View);
-                
+
             }
             Views.Add(view);
         }
@@ -116,14 +116,13 @@ protected virtual void ViewDestroyed(ViewDestroyedEvent data)
                 });
             }
         }
-		
-		protected virtual void ViewModelDestroyed(ViewModelDestroyedEvent data)
+
+        protected virtual void ViewModelDestroyed(ViewModelDestroyedEvent data)
         {
-            var instanceIndex = uFrameKernel.Container.Instances.FindIndex(x => x.Name == data.ViewModel.Identifier);
-            if (instanceIndex >= 0)
-            {
-                uFrameKernel.Container.Instances.RemoveAt(instanceIndex);
-            }
+            var instanceIndex = uFrameKernel.Container.Instances.FirstOrDefault(x => x.Key.Item2 == data.ViewModel.Identifier);
+
+            uFrameKernel.Container.Instances.Remove(instanceIndex.Key);
+
         }
 
         /// <summary>
@@ -138,7 +137,7 @@ public static ViewModel FetchViewModel(ViewBase viewBase)
             {
                 return viewBase.ViewModelObject;
             }
-            
+
             // Attempt to resolve it by the identifier 
             //var contextViewModel = uFrameMVVMKernel.Container.Resolve<ViewModel>(viewBase.Identifier);
             // It now only registers under the viewmodeltype to allow multip different view-models with the same identifier
@@ -174,7 +173,7 @@ public static ViewModel FetchViewModel(ViewBase viewBase)
                 }
                 return viewBase.ViewModelObject = contextViewModel;
             }
-          
+
             return contextViewModel;
         }