From 1fc67234efe31819730f5a6e2b8479daa9340495 Mon Sep 17 00:00:00 2001
From: SugarChes <T884096904@126.com>
Date: Wed, 29 Jul 2026 12:48:35 +0800
Subject: [PATCH] fix(startup): suppress legacy splash under WPF shell

---
 插件库/Lskj.Main/Model/Manager.cs | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/插件库/Lskj.Main/Model/Manager.cs b/插件库/Lskj.Main/Model/Manager.cs
index 2faece4..99e2fd5 100644
--- a/插件库/Lskj.Main/Model/Manager.cs
+++ b/插件库/Lskj.Main/Model/Manager.cs
@@ -87,8 +87,12 @@ namespace Lskj.Main.Model
         public static void StartForm()
         {
             bool isStart = true;
+            bool useLegacySplash = ExternalMainShell == null;
             // 加载Splash动画界面
-            SplashForm.ShowForm();
+            if (useLegacySplash)
+            {
+                SplashForm.ShowForm();
+            }
             //CheckLocalConfig();
             // C#数据库连接检查
             bool isLocalConnect = false;
@@ -108,27 +112,36 @@ namespace Lskj.Main.Model
             if (!DBConfig.Instance.CreateConnection(DBConfig.Instance.Connection))
             {
                 MessageUtil.Show(ResourceKeys.UnConnectServer);
-                SplashForm.HideForm();
+                if (useLegacySplash)
+                {
+                    SplashForm.HideForm();
+                }
                 DialogResult result = RunConfigForm();
                 isStart = result == DialogResult.OK;
             }
             if (isStart)
             {
                 // Delphi数据库连接检查
-                if (!DBConfig.Instance.ServerType.Equals("达梦数据库")) 
+                if (!DBConfig.Instance.ServerType.Equals("达梦数据库"))
                 {
                     if (DelphiHelper.Delphi_Init(new StringBuilder(DBConfig.Instance.GetDelphiConnection(DBConfig.Instance.dephiConnection))) == 0)
                     {
                         MessageUtil.Show(ResourceKeys.UnConnectServer + "[By Delphi]");
-                        SplashForm.HideForm();
+                        if (useLegacySplash)
+                        {
+                            SplashForm.HideForm();
+                        }
                         RunConfigForm();
                         return;
                     }
                 }
-                    
 
 
-                SplashForm.HideForm();
+
+                if (useLegacySplash)
+                {
+                    SplashForm.HideForm();
+                }
                 // 汉化dev控件
                 BaseResources.Localization(LocalizationType.CHS);
                 // 启动登录页面
@@ -150,7 +163,10 @@ namespace Lskj.Main.Model
             }
             else
             {
-                SplashForm.HideForm();
+                if (useLegacySplash)
+                {
+                    SplashForm.HideForm();
+                }
             }
         }