Merge branch 'master' of http://10.10.28.13:8080/r/PDM/PdmSwPlugin2

chr

2024-08-21 9ee7d3bd9c58a204b1efe38e6be61155bbb15c16

 PdmAlert/App.xaml.cs

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows;

namespace PdmAlert
{
@@ -14,16 +8,27 @@
    public partial class App : Application
    {
        DockApp dockApp;
        LoginWindow loginWindow;
        protected override void OnStartup(StartupEventArgs e)
        {
            base.OnStartup(e);
            this.ShutdownMode = ShutdownMode.OnExplicitShutdown;
            dockApp.Run();
            if (LoginUser.TryAutoLogin())
            {

                dockApp = new DockApp();
                dockApp.Run();
            }
            else
            {
                loginWindow = new LoginWindow();
                loginWindow.Show();
            }
        }

        private void Application_Startup(object sender, StartupEventArgs e)
        {
            dockApp = new DockApp();

        }
    }
}