fix(startup): suppress legacy splash under WPF shell

This commit is contained in:
2026-07-29 12:48:35 +08:00
parent d96459d01b
commit 1fc67234ef
+16
View File
@@ -87,8 +87,12 @@ namespace Lskj.Main.Model
public static void StartForm() public static void StartForm()
{ {
bool isStart = true; bool isStart = true;
bool useLegacySplash = ExternalMainShell == null;
// 加载Splash动画界面 // 加载Splash动画界面
if (useLegacySplash)
{
SplashForm.ShowForm(); SplashForm.ShowForm();
}
//CheckLocalConfig(); //CheckLocalConfig();
// C#数据库连接检查 // C#数据库连接检查
bool isLocalConnect = false; bool isLocalConnect = false;
@@ -108,7 +112,10 @@ namespace Lskj.Main.Model
if (!DBConfig.Instance.CreateConnection(DBConfig.Instance.Connection)) if (!DBConfig.Instance.CreateConnection(DBConfig.Instance.Connection))
{ {
MessageUtil.Show(ResourceKeys.UnConnectServer); MessageUtil.Show(ResourceKeys.UnConnectServer);
if (useLegacySplash)
{
SplashForm.HideForm(); SplashForm.HideForm();
}
DialogResult result = RunConfigForm(); DialogResult result = RunConfigForm();
isStart = result == DialogResult.OK; isStart = result == DialogResult.OK;
} }
@@ -120,7 +127,10 @@ namespace Lskj.Main.Model
if (DelphiHelper.Delphi_Init(new StringBuilder(DBConfig.Instance.GetDelphiConnection(DBConfig.Instance.dephiConnection))) == 0) if (DelphiHelper.Delphi_Init(new StringBuilder(DBConfig.Instance.GetDelphiConnection(DBConfig.Instance.dephiConnection))) == 0)
{ {
MessageUtil.Show(ResourceKeys.UnConnectServer + "[By Delphi]"); MessageUtil.Show(ResourceKeys.UnConnectServer + "[By Delphi]");
if (useLegacySplash)
{
SplashForm.HideForm(); SplashForm.HideForm();
}
RunConfigForm(); RunConfigForm();
return; return;
} }
@@ -128,7 +138,10 @@ namespace Lskj.Main.Model
if (useLegacySplash)
{
SplashForm.HideForm(); SplashForm.HideForm();
}
// 汉化dev控件 // 汉化dev控件
BaseResources.Localization(LocalizationType.CHS); BaseResources.Localization(LocalizationType.CHS);
// 启动登录页面 // 启动登录页面
@@ -149,10 +162,13 @@ namespace Lskj.Main.Model
} }
} }
else else
{
if (useLegacySplash)
{ {
SplashForm.HideForm(); SplashForm.HideForm();
} }
} }
}
/// <summary> /// <summary>
/// <para>说明:重新启动</para> /// <para>说明:重新启动</para>