diff --git a/ADP.sln b/ADP.sln index 35c3475..8070f1d 100644 --- a/ADP.sln +++ b/ADP.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.12.35527.113 d17.12 +VisualStudioVersion = 17.12.35527.113 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ADP", "ADP\ADP.csproj", "{8B48B0CD-55F9-4623-9A10-BFE25B21EBD6}" EndProject @@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonitorModule", "MonitorMod EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CAN驱动", "CAN驱动\CAN驱动.csproj", "{D1868672-0132-4B1A-A393-C2CF49A25E74}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceEditModule", "DeviceEditModule\DeviceEditModule.csproj", "{170AD4C1-189D-4FBE-B10D-2A4304527834}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -107,6 +109,10 @@ Global {D1868672-0132-4B1A-A393-C2CF49A25E74}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1868672-0132-4B1A-A393-C2CF49A25E74}.Release|Any CPU.ActiveCfg = Release|Any CPU {D1868672-0132-4B1A-A393-C2CF49A25E74}.Release|Any CPU.Build.0 = Release|Any CPU + {170AD4C1-189D-4FBE-B10D-2A4304527834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {170AD4C1-189D-4FBE-B10D-2A4304527834}.Debug|Any CPU.Build.0 = Debug|Any CPU + {170AD4C1-189D-4FBE-B10D-2A4304527834}.Release|Any CPU.ActiveCfg = Release|Any CPU + {170AD4C1-189D-4FBE-B10D-2A4304527834}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -118,5 +124,6 @@ Global {DFC084AE-FE45-4492-A2DA-EAE2941F26E9} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} {3456C3AC-E7FF-45F8-A68F-BEED9969812C} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} {850A5BE8-0BC1-4D6A-8351-DD812C9C4427} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} + {170AD4C1-189D-4FBE-B10D-2A4304527834} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} EndGlobalSection EndGlobal diff --git a/ADP/ADP.csproj b/ADP/ADP.csproj index 6c43360..f3a35ad 100644 --- a/ADP/ADP.csproj +++ b/ADP/ADP.csproj @@ -16,6 +16,7 @@ + diff --git a/ADP/App.xaml b/ADP/App.xaml index ec1b892..069a956 100644 --- a/ADP/App.xaml +++ b/ADP/App.xaml @@ -9,6 +9,7 @@ + diff --git a/ADP/ViewModels/ShellViewModel.cs b/ADP/ViewModels/ShellViewModel.cs index 1d1e396..eca07c9 100644 --- a/ADP/ViewModels/ShellViewModel.cs +++ b/ADP/ViewModels/ShellViewModel.cs @@ -144,6 +144,7 @@ namespace ADP.ViewModels public ICommand OpenCommand { get; set; } public ICommand NewCommand { get; set; } public ICommand SetDefaultCommand { get; set; } + public ICommand ShowDialogManagerViewCommand { get; set; } #endregion public ShellViewModel(IContainerProvider containerProvider) @@ -154,8 +155,8 @@ namespace ADP.ViewModels _regionManager = containerProvider.Resolve(); _notificationManager = containerProvider.Resolve(); _moduleManager = containerProvider.Resolve(); - LeftDrawerOpenCommand = new DelegateCommand(LeftDrawerOpen); + ShowDialogManagerViewCommand = new DelegateCommand(ShowDialogManagerView); MinimizeCommand = new DelegateCommand(MinimizeWindow); MaximizeCommand = new DelegateCommand(MaximizeWindow); CloseCommand = new DelegateCommand(CloseWindow); @@ -194,6 +195,8 @@ namespace ADP.ViewModels _uiRefreshTimer.Start(); } + + private void RefreshAllContextProperties() { RaisePropertyChanged(nameof(RunState)); @@ -204,6 +207,10 @@ namespace ADP.ViewModels } #region 命令处理与事件 + private void ShowDialogManagerView() + { + _eventAggregator.GetEvent().Publish(); + } private async void OnRunning() { string runningScope = _globalInfo.CurrentScope; diff --git a/ADP/Views/ShellView.xaml b/ADP/Views/ShellView.xaml index f1049e0..eb17dcd 100644 --- a/ADP/Views/ShellView.xaml +++ b/ADP/Views/ShellView.xaml @@ -49,7 +49,7 @@ Command="{Binding NavigateCommand}" CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}" Style="{StaticResource MaterialDesignFlatButton}" - Margin="8" /> + Margin="8" /> + +