병합 충돌 정리

Dev/OHV/OHV.Module.MainViews/Views/HistoryView.xaml

@@ -9,7 +9,7 @@
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d" 
              Width="Auto"
-             Height="942"
+             Height="Auto"
              MinWidth="1386"
              Background="#37474f">
     

Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs

@@ -214,6 +214,7 @@ namespace OHV.Vehicle.Concept
         public ICommand AlarmResetCommand { get; set; }
         public ICommand ChangeLanguage { get; set; }
         public ICommand MachineModeChgCommand { get; set; }
+        public ICommand BatteryPopup { get; set; }
         #endregion
 
         IEventAggregator eventAggregator = null;
@@ -258,6 +259,7 @@ namespace OHV.Vehicle.Concept
             this.EmergencyStopCommand = new DelegateCommand( ExecuteEStop );
             this.BuzzerStopCommand = new DelegateCommand( ExecuteBuzzerStop );
             this.MachineModeChgCommand = new DelegateCommand<string>( ExecuteMachineModeChgCommand );
+            this.BatteryPopup = new DelegateCommand( ExecuteBatteryPopup );
 
             DispatcherTimer dateTimer = new DispatcherTimer();
             dateTimer.Tick += ( object sender, EventArgs e ) =>
@@ -273,6 +275,11 @@ namespace OHV.Vehicle.Concept
             GSG.NET.Quartz.QuartzUtils.Invoke( "RESOURCE_CHECK", GSG.NET.Quartz.QuartzUtils.GetExpnSecond( 1 ), QuzOnResourceUsage );
         }
 
+        private void ExecuteBatteryPopup( )
+        {
+            this.messageController.ShowBatteryPopupView();
+        }
+
         void QuzOnResourceUsage()
         {
             this.CPU = GSG.NET.OSView.Mgnt.CpuUseRate();
@@ -544,7 +551,7 @@ namespace OHV.Vehicle.Concept
                         break;
                     case "BatteryDisChargeTime":
                         {
-                            var cTime = CastTo<double>.From<object>( args.Args );
+                            var dTime = CastTo<double>.From<object>( args.Args );
                         }
                         break;
                 }