add RegisterPage

EasyMicroservices · Dec 22, 2023 · 00a04fb · 00a04fb
1 parent baaa521
commit 00a04fb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/NavigationManagerBase.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/NavigationManagerBase.cs
@@ -1,4 +1,7 @@
-using System.IO;
+using EasyMicroservices.UI.Cores.Interfaces;
+using System;
+using System.Collections.Concurrent;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace EasyMicroservices.UI.Cores;
@@ -11,6 +14,10 @@ public abstract class NavigationManagerBase
     /// 
     /// </summary>
     public static NavigationManagerBase Current { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    protected ConcurrentDictionary<string, Type> Pages { get; set; } = new ConcurrentDictionary<string, Type>();
 
     /// <summary>
     /// 
@@ -62,4 +69,13 @@ public abstract class NavigationManagerBase
     /// <param name="url"></param>
     /// <returns></returns>
     public abstract Task<bool> OpenBrowser(string url);
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="pageName"></param>
+    public void RegisterPage<T>(string pageName)
+        where T : IPage, new()
+    {
+        Pages.TryAdd(pageName, typeof(T));
+    }
 }
diff --git a/...auiComponents/EasyMicroservices.UI.MauiComponents/Navigations/DefaultNavigationManager.cs b/...auiComponents/EasyMicroservices.UI.MauiComponents/Navigations/DefaultNavigationManager.cs
@@ -11,7 +11,6 @@ public DefaultNavigationManager(INavigation navigation)
         _navigation = navigation;
     }
 
-    ConcurrentDictionary<string, IPage> Pages { get; set; } = new ConcurrentDictionary<string, IPage>();
     public override Task PopAsync()
     {
         return _navigation.PopAsync();
@@ -24,8 +23,9 @@ public override Task<TResponseData> PushAsync<TResponseData>(string pageName, bo
 
     public override async Task<TResponseData> PushDataAsync<TData, TResponseData>(TData data, string pageName, bool doClear = false)
     {
-        if (!Pages.TryGetValue(pageName, out IPage findPage))
+        if (!Pages.TryGetValue(pageName, out Type pageTpe))
             throw new Exception($"Page {pageName} not found, did you register it?");
+        var findPage = Activator.CreateInstance(pageTpe);
         Page page = findPage as Page;
         if (page == null)
             throw new NotImplementedException($"Page {pageName} is not inherit Page!");