修复用户登录功能
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
<Application x:Class="XplorePlane.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:converters="clr-namespace:XplorePlane.Converters">
|
||||
xmlns:converters="clr-namespace:XplorePlane.Converters"
|
||||
ShutdownMode="OnMainWindowClose">
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
|
||||
@@ -349,6 +349,10 @@ namespace XplorePlane
|
||||
//}
|
||||
|
||||
// ── 登录认证:在显示主窗口前弹出登录对话框 ──
|
||||
// 临时切换 ShutdownMode,防止 LoginDialog 关闭时 WPF 自动退出应用
|
||||
var previousShutdownMode = Application.Current.ShutdownMode;
|
||||
Application.Current.ShutdownMode = ShutdownMode.OnExplicitShutdown;
|
||||
|
||||
var loginViewModel = Container.Resolve<LoginDialogViewModel>();
|
||||
var loginDialog = new LoginDialog(loginViewModel);
|
||||
var loginResult = loginDialog.ShowDialog();
|
||||
@@ -364,6 +368,9 @@ namespace XplorePlane
|
||||
Log.Information("登录认证成功,角色: {Role}",
|
||||
Container.Resolve<IPermissionService>().CurrentRole);
|
||||
|
||||
// 恢复 ShutdownMode,让主窗口关闭时正常退出
|
||||
Application.Current.ShutdownMode = ShutdownMode.OnMainWindowClose;
|
||||
|
||||
var shell = Container.Resolve<MainWindow>();
|
||||
|
||||
// 主窗体加载完成后再连接相机,确保所有模块和原生 DLL 已完成初始化
|
||||
|
||||
Reference in New Issue
Block a user