diff --git a/ACP.sln b/ACP.sln index 34931f0..b55c9d9 100644 --- a/ACP.sln +++ b/ACP.sln @@ -45,6 +45,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACP", "ACP\ACP.csproj", "{C EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TSMasterCAN", "TSMasterCAN\TSMasterCAN.csproj", "{B45DC94C-2CBB-4119-8787-B52A9E7EC58B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerAdaptabilityModule", "PowerAdaptabilityModule\PowerAdaptabilityModule.csproj", "{CCA6AA94-6105-4C0B-BCA9-D0712B1A7B89}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -131,6 +133,10 @@ Global {B45DC94C-2CBB-4119-8787-B52A9E7EC58B}.Debug|Any CPU.Build.0 = Debug|Any CPU {B45DC94C-2CBB-4119-8787-B52A9E7EC58B}.Release|Any CPU.ActiveCfg = Release|Any CPU {B45DC94C-2CBB-4119-8787-B52A9E7EC58B}.Release|Any CPU.Build.0 = Release|Any CPU + {CCA6AA94-6105-4C0B-BCA9-D0712B1A7B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CCA6AA94-6105-4C0B-BCA9-D0712B1A7B89}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CCA6AA94-6105-4C0B-BCA9-D0712B1A7B89}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CCA6AA94-6105-4C0B-BCA9-D0712B1A7B89}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -146,5 +152,6 @@ Global {AF2533DD-599D-49D7-942B-B0C26534D15F} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} {84006890-9288-44C4-9D17-FA88F3FDECFA} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} {8923122F-F7D3-4AE7-9E86-9E78F1296A11} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} + {CCA6AA94-6105-4C0B-BCA9-D0712B1A7B89} = {1E92D601-68FC-45F6-8251-BD0F39226E5B} EndGlobalSection EndGlobal diff --git a/ACP/ACP.csproj b/ACP/ACP.csproj index f159891..b8151fe 100644 --- a/ACP/ACP.csproj +++ b/ACP/ACP.csproj @@ -28,6 +28,7 @@ + diff --git a/ACP/ViewModels/ShellViewModel.cs b/ACP/ViewModels/ShellViewModel.cs index 4746303..00455f3 100644 --- a/ACP/ViewModels/ShellViewModel.cs +++ b/ACP/ViewModels/ShellViewModel.cs @@ -902,6 +902,10 @@ namespace ACP.ViewModels if (_globalInfo.CurrentScope != "default") return; _regionManager.RequestNavigate("ShellViewManager", "ExportView"); break; + case "电源适应性测试": + if (_globalInfo.CurrentScope != "default") return; + _regionManager.RequestNavigate("ShellViewManager", "PowerAdaptabilityView"); + break; } } diff --git a/ACP/Views/ShellView.xaml b/ACP/Views/ShellView.xaml index 3b66b38..736a740 100644 --- a/ACP/Views/ShellView.xaml +++ b/ACP/Views/ShellView.xaml @@ -98,6 +98,11 @@ CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}" Style="{StaticResource MaterialDesignFlatButton}" Margin="8" /> +