[Pull Request] Dev=UI separate si

KitX Dashboard/App.axaml

@@ -1,75 +1,79 @@
-<Application x:Class="KitX.Dashboard.App"
-             xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:fluent="using:FluentAvalonia.UI.Media"
-             xmlns:local="using:KitX.Dashboard"
-             xmlns:materialIcons="using:Material.Icons.Avalonia"
-             xmlns:sty="using:FluentAvalonia.Styling">
-
-    <Application.DataTemplates>
-        <local:ViewLocator/>
-    </Application.DataTemplates>
-
-    <Application.Resources>
-        <ResourceDictionary>
-            <SolidColorBrush x:Key="ThemePrimaryAccent" Color="#FF3873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentAA" Color="#AA3873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentBB" Color="#BB3873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentCC" Color="#CC3873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentDD" Color="#DD3873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentEE" Color="#EE3873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent99" Color="#993873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent88" Color="#883873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent77" Color="#773873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent66" Color="#663873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent55" Color="#553873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent44" Color="#443873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent33" Color="#333873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent22" Color="#223873D9"/>
-            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent11" Color="#113873D9"/>
-
-            <FontFamily x:Key="SarasaMonoCL">avares://KitX.Dashboard.Fonts/sarasa-mono-cl-regular.ttf#Sarasa Mono CL</FontFamily>
-            <FontFamily x:Key="SourceHanSans">avares://KitX.Dashboard.Fonts/SourceHanSans-VF.ttf#Source Han Sans VF</FontFamily>
-
-            <ResourceDictionary.MergedDictionaries>
-
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-
-    <Application.Styles>
-        <sty:FluentAvaloniaTheme/>
-        <materialIcons:MaterialIconStyles/>
-
-        <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml"/>
-        <StyleInclude Source="avares://AvaloniaProgressRing/Styles/ProgressRing.xaml"/>
-        <StyleInclude Source="/Styles/FontsStyles.axaml"/>
-    </Application.Styles>
-
-    <TrayIcon.Icons>
-        <TrayIcons>
-            <TrayIcon Command="{Binding TrayIconClickedCommand}"
-                      Icon="resm:KitX.Dashboard.Assets.KitX-Icon-256x256.ico"
-                      IsVisible="True"
-                      ToolTipText="{Binding TrayIconText}">
-                <TrayIcon.Menu>
-                    <NativeMenu>
-                        <NativeMenuItem Command="{Binding TrayIconClickedCommand}" Header="{DynamicResource Text_Public_ShowMainWindow}"/>
-                        <NativeMenuItem Command="{Binding PluginLauncherCommand}" Header="{DynamicResource Text_Public_ShowLauncherWindow}"/>
-                        <NativeMenuItemSeparator/>
-                        <NativeMenuItem Command="{Binding ViewLatestAnnouncementsCommand}" Header="{DynamicResource Text_Public_ShowAnnouncements}"/>
-                        <NativeMenuItem Header="{DynamicResource Text_Public_More}">
-                            <NativeMenu>
-                                <NativeMenuItem Command="{Binding OpenDebugToolCommand}" Header="{DynamicResource Text_Settings_General_OpenDebugTool}"/>
-                                <NativeMenuItemSeparator/>
-                                <NativeMenuItem Command="{Binding RestartCommand}" Header="{DynamicResource Text_Public_Restart}"/>
-                            </NativeMenu>
-                        </NativeMenuItem>
-                        <NativeMenuItemSeparator/>
-                        <NativeMenuItem Command="{Binding ExitCommand}" Header="{DynamicResource Text_Public_Exit}"/>
-                    </NativeMenu>
-                </TrayIcon.Menu>
-            </TrayIcon>
-        </TrayIcons>
-    </TrayIcon.Icons>
-</Application>
+<Application x:Class="KitX.Dashboard.App"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:fluent="using:FluentAvalonia.UI.Media"
+             xmlns:local="using:KitX.Dashboard"
+             xmlns:vm="using:KitX.Dashboard.ViewModels"
+             xmlns:conv="using:KitX.Dashboard.Converters"
+             xmlns:materialIcons="using:Material.Icons.Avalonia"
+             xmlns:sty="using:FluentAvalonia.Styling">
+
+    <Application.DataTemplates>
+        <local:ViewLocator/>
+    </Application.DataTemplates>
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <SolidColorBrush x:Key="ThemePrimaryAccent" Color="#FF3873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentAA" Color="#AA3873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentBB" Color="#BB3873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentCC" Color="#CC3873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentDD" Color="#DD3873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparentEE" Color="#EE3873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent99" Color="#993873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent88" Color="#883873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent77" Color="#773873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent66" Color="#663873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent55" Color="#553873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent44" Color="#443873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent33" Color="#333873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent22" Color="#223873D9"/>
+            <SolidColorBrush x:Key="ThemePrimaryAccentTransparent11" Color="#113873D9"/>
+
+            <FontFamily x:Key="SarasaMonoCL">avares://KitX.Dashboard.Fonts/sarasa-mono-cl-regular.ttf#Sarasa Mono CL</FontFamily>
+            <FontFamily x:Key="SourceHanSans">avares://KitX.Dashboard.Fonts/SourceHanSans-VF.ttf#Source Han Sans VF</FontFamily>
+
+            <ResourceDictionary.MergedDictionaries>
+
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+
+    <Application.Styles>
+        <sty:FluentAvaloniaTheme/>
+        <materialIcons:MaterialIconStyles/>
+
+        <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml"/>
+        <StyleInclude Source="avares://AvaloniaProgressRing/Styles/ProgressRing.xaml"/>
+        <StyleInclude Source="avares://NodifyM.Avalonia/Styles/ControlStyles.axaml"/>
+        <StyleInclude Source="/Styles/BlueprintNodeStyles.axaml"/>
+        <StyleInclude Source="/Styles/FontsStyles.axaml"/>
+    </Application.Styles>
+
+    <TrayIcon.Icons>
+        <TrayIcons>
+            <TrayIcon Command="{Binding TrayIconClickedCommand}"
+                      Icon="resm:KitX.Dashboard.Assets.KitX-Icon-256x256.ico"
+                      IsVisible="True"
+                      ToolTipText="{Binding TrayIconText}">
+                <TrayIcon.Menu>
+                    <NativeMenu>
+                        <NativeMenuItem Command="{Binding TrayIconClickedCommand}" Header="{DynamicResource Text_Public_ShowMainWindow}"/>
+                        <NativeMenuItem Command="{Binding PluginLauncherCommand}" Header="{DynamicResource Text_Public_ShowLauncherWindow}"/>
+                        <NativeMenuItemSeparator/>
+                        <NativeMenuItem Command="{Binding ViewLatestAnnouncementsCommand}" Header="{DynamicResource Text_Public_ShowAnnouncements}"/>
+                        <NativeMenuItem Header="{DynamicResource Text_Public_More}">
+                            <NativeMenu>
+                                <NativeMenuItem Command="{Binding OpenDebugToolCommand}" Header="{DynamicResource Text_Settings_General_OpenDebugTool}"/>
+                                <NativeMenuItemSeparator/>
+                                <NativeMenuItem Command="{Binding RestartCommand}" Header="{DynamicResource Text_Public_Restart}"/>
+                            </NativeMenu>
+                        </NativeMenuItem>
+                        <NativeMenuItemSeparator/>
+                        <NativeMenuItem Command="{Binding ExitCommand}" Header="{DynamicResource Text_Public_Exit}"/>
+                    </NativeMenu>
+                </TrayIcon.Menu>
+            </TrayIcon>
+        </TrayIcons>
+    </TrayIcon.Icons>
+</Application>

KitX Dashboard/App.axaml.cs

@@ -10,23 +10,115 @@
 using Avalonia.Media.Imaging;
 using Avalonia.Styling;
 using Common.BasicHelper.Utils.Extensions;
-using KitX.Dashboard.Managers;
+using KitX.Core.Announcement;
+using KitX.Core.Contract.Announcement;
+using KitX.Core.Contract.Configuration;
+using KitX.Core.Contract.Event;
+using KitX.Core.Contract.Workflow;
+using KitX.Core.DI;
+using KitX.Core.Event;
 using KitX.Dashboard.Services;
 using KitX.Dashboard.ViewModels;
+using KitX.Dashboard.ViewModels.Pages.Controls;
 using KitX.Dashboard.Views;
 using LiveChartsCore;
 using LiveChartsCore.SkiaSharpView;
+using Microsoft.Extensions.DependencyInjection;
 using Serilog;
 
+using ServiceHost = KitX.Core.DI.ServiceHost;
+
 namespace KitX.Dashboard;
 
 public partial class App : Application
 {
+    /// <summary>
+    /// Initialize DI container before UI framework starts
+    /// This should be called from AppFramework.RunFramework() before any UI code runs
+    /// Note: This is now called BEFORE Logger initialization (Phase 2 refactoring).
+    /// Log.Debug() calls in service constructors (e.g., ConfigManager) are no-ops
+    /// until Serilog Logger is configured later in RunFramework().
+    /// </summary>
+    internal static void InitializeServiceProvider()
+    {
+        if (ServiceHost.IsInitialized)
+            return;
+
+        Log.Information("Initializing service provider...");
+
+        // Initialize service provider with Core services
+        var services = new ServiceCollection();
+
+        // Register Core services from KitX.Core
+        services.AddCoreServices();
+
+        // Register Dashboard-specific services
+        services.AddSingleton<IFileDialogService, FileDialogService>();
+
+        // Register SignalTasksManager for signal-based coordination
+        services.AddSingleton<Common.BasicHelper.Core.TaskSystem.SignalTasksManager>();
+
+        // Register Dashboard ViewModels (for DI auto-resolution without ActivatorUtilities fallback)
+        services.AddTransient<WorkflowScriptEditorWindowViewModel>();
+        services.AddTransient<DebugWindowViewModel>();
+        services.AddTransient<BlueprintEditorViewModel>();
+        services.AddTransient<Settings_GeneralViewModel>();
+        services.AddTransient<Settings_PerformenceViewModel>();
+
+        // Build the SINGLE IServiceProvider — no duplicate BuildServiceProvider calls
+        var provider = services.BuildServiceProvider();
+
+        // Initialize ServiceHost with the single provider (centralized service access)
+        ServiceHost.Initialize(provider);
+
+        // Initialize the workflow library's own service locator with the same provider,
+        // so workflow code created outside DI (builtin functions, lazy singletons) can
+        // resolve shared services (IPluginService, IDeviceServer, workflow services, ...).
+        KitX.Workflow.Hosting.ServiceLocator.Initialize(provider);
+
+        // Pre-resolve the plugin manager bridge to force eager singleton construction
+        // (the concrete RealPluginManager subscribes to plugin events in its ctor).
+        var rpm = provider.GetRequiredService<IRealPluginManagerBridge>();
+        Log.Information("RealPluginManager pre-resolved. HashCode: {HashCode}", rpm.GetHashCode());
+
+        // Initialize TriggerManager from persisted workflow configurations
+        var triggerManager = provider.GetRequiredService<ITriggerManager>();
+        triggerManager.InitializeFromPersistedWorkflows();
+
+        Log.Information("Service provider initialized.");
+    }
+
+    /// <summary>
+    /// Gets service from DI container.
+    /// Throws if the service is not registered — all types must be explicitly registered.
+    /// </summary>
+    public static T GetService<T>() where T : class
+    {
+        Log.Debug($"Getting service: {typeof(T).Name}");
+
+        if (!ServiceHost.IsInitialized)
+        {
+            Log.Warning("ServiceHost not initialized, initializing now (this should not happen in normal flow)...");
+            InitializeServiceProvider();
+        }
+
+        var service = ServiceHost.ServiceProvider.GetService(typeof(T));
+        if (service != null)
+            return (T)service;
+
+        // Service not registered — throw to make missing registrations visible at runtime
+        throw new InvalidOperationException(
+            $"Service '{typeof(T).Name}' is not registered in the DI container. " +
+            "Ensure it is added via services.AddSingleton/AddTransient/AddScoped in InitializeServiceProvider()."
+        );
+    }
+
     public static Bitmap? DefaultIcon
     {
         get
         {
-            var path = Path.Combine(ConstantTable.AssetsPath, ConfigManager.Instance.AppConfig.App.CoverIconFileName).GetFullPath();
+            var configService = GetService<IConfigService>();
+            var path = Path.Combine(ConstantTable.AssetsPath, configService.AppConfig.App.CoverIconFileName).GetFullPath();
 
             if (Design.IsDesignMode)
                 return null;
@@ -57,7 +149,8 @@ public override void Initialize()
 
     private void LoadTheme()
     {
-        RequestedThemeVariant = ConfigManager.Instance.AppConfig.App.Theme switch
+        var configService = GetService<IConfigService>();
+        RequestedThemeVariant = configService.AppConfig.App.Theme switch
         {
             "Light" => ThemeVariant.Light,
             "Dark" => ThemeVariant.Dark,
@@ -68,7 +161,8 @@ private void LoadTheme()
 
     private void LoadLanguage()
     {
-        var config = ConfigManager.Instance.AppConfig;
+        var configService = GetService<IConfigService>();
+        var config = configService.AppConfig;
         var lang = config.App.AppLanguage;
         var backup_lang = config.App.SurpportLanguages.Keys.First();
         var path = $"{ConstantTable.LanguageFilePath}/{lang}.axaml".GetFullPath();
@@ -106,7 +200,8 @@ private void LoadLanguage()
 
         try
         {
-            EventService.Invoke(nameof(EventService.LanguageChanged));
+            var eventService = GetService<IEventService>();
+            eventService.Publish(EventNames.LanguageChanged, EventArgs.Empty);
         }
         catch (Exception e)
         {
@@ -116,7 +211,8 @@ private void LoadLanguage()
 
     private static void CalculateThemeColor()
     {
-        Color c = Color.Parse(ConfigManager.Instance.AppConfig.App.ThemeColor);
+        var configService = GetService<IConfigService>();
+        Color c = Color.Parse(configService.AppConfig.App.ThemeColor);
 
         if (Current is not null)
         {
@@ -147,15 +243,16 @@ private static void InitializeLiveCharts()
             );
         }
 
-        EventService.ThemeConfigChanged += () =>
+        var eventService = GetService<IEventService>();
+        eventService.Subscribe(EventNames.ThemeConfigChanged, (s, e) =>
         {
             var usingLightTheme = Current?.ActualThemeVariant == ThemeVariant.Light;
 
             LiveCharts.Configure(config =>
             {
                 config = usingLightTheme ? config.AddLightTheme() : config.AddDarkTheme();
             });
-        };
+        });
     }
 
     public override void OnFrameworkInitializationCompleted()
@@ -167,8 +264,12 @@ public override void OnFrameworkInitializationCompleted()
             desktop.MainWindow = new MainWindow { DataContext = new MainWindowViewModel() };
         }
 
-        if (ConfigManager.Instance.AppConfig.App.ShowAnnouncementWhenStart)
-            new Thread(async () => await AnnouncementManager.CheckNewAnnouncements()).Start();
+        var configService = GetService<IConfigService>();
+        if (configService.AppConfig.App.ShowAnnouncementWhenStart)
+        {
+            var announcementService = GetService<IAnnouncementService>();
+            new Thread(async () => await announcementService.CheckNewAnnouncementsAsync()).Start();
+        }
 
         base.OnFrameworkInitializationCompleted();
     }