DESKTOP-Kang 6 лет назад
Родитель
Сommit
3bffaedf2c

BIN
Dev/OHV/Assambly/GSG.NET.WPF.dll


BIN
Dev/OHV/Assambly/GSG.NET.WPF.pdb


+ 4 - 4
Dev/OHV/OHV.Vehicle/Concept/D_MainWindow.xaml

@@ -70,28 +70,28 @@
                     </StackPanel>
                 </Button>
 
-                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding NavigateCommand}" CommandParameter="UnitView">
+                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding NavigateCommand}" CommandParameter="UnitView" IsEnabled="{Binding IsManualMode}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="SettingsTransferOutline" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,10,0" Height="30" Width="auto"/>
                         <TextBlock Text="SETTING" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="25"/>
                     </StackPanel>
                 </Button>
 
-                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding NavigateCommand}" CommandParameter="TeachView">
+                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding NavigateCommand}" CommandParameter="TeachView" IsEnabled="{Binding IsManualMode}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="AxisArrow" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,10,0" Height="30" Width="auto"/>
                         <TextBlock Text="{DynamicResource MainView_Teach}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="25"/>
                     </StackPanel>
                 </Button>
 
-                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding NavigateCommand}" CommandParameter="HistoryView">
+                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding NavigateCommand}" CommandParameter="HistoryView" IsEnabled="{Binding IsManualMode}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="PagePreviousOutline" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,10,0" Height="30" Width="auto"/>
                         <TextBlock Text="HISTORY" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="25"/>
                     </StackPanel>
                 </Button>
 
-                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding SystemOffCommand}">
+                <Button Margin="10,0" Background="{x:Null}" Height="Auto" BorderThickness="0" Command="{Binding SystemOffCommand}" IsEnabled="{Binding IsManualMode}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="ExitToApp" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,10,0" Height="30" Width="auto"/>
                         <TextBlock Text="EXIT" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="25"/>

+ 15 - 2
Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs

@@ -160,17 +160,27 @@ namespace OHV.Vehicle.Concept
 
         VCSMessagePubSubEvent vcsMessagePublisher;
 
+        #region Commands
         public ICommand TestCommand { get; set; }
         public ICommand NavigateCommand { get; set; }
         public ICommand SystemOffCommand { get; set; }
-
         public ICommand BuzzerStopCommand { get; set; }
         public ICommand EmergencyStopCommand { get; set; }
-
         public ICommand StartCommand { get; set; }
         public ICommand StopCommand { get; set; }
         public ICommand AlarmResetCommand { get; set; }
+        #endregion
+
+        #region Properties
+        private bool isManualMode = true;
+
+        public bool IsManualMode
+        {
+            get { return isManualMode; }
+            set { SetProperty(ref isManualMode, value); }
+        }
 
+        #endregion
         IRegionManager regionManager;
         public Common.Events.HostConnectedEventArgs.eConnectedState State { get; set; }
 
@@ -331,11 +341,14 @@ namespace OHV.Vehicle.Concept
             {
                 this.StartEnable = false;
                 this.StopEnable = true;
+                this.IsManualMode = false;
+                regionManager.RequestNavigate(RegionNames.MainView, "AutoView");
             }
             else
             {
                 this.StartEnable = true;
                 this.StopEnable = false;
+                this.IsManualMode = true;
             }
         }
 

+ 4 - 0
Dev/OHV/OHV.Vehicle/OHV.Vehicle.csproj

@@ -56,6 +56,10 @@
     <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
+    <Reference Include="DynamicExpresso.Core, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Assambly\DynamicExpresso.Core.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>