Pull Commit

Dev/OHV/OHV.Vehicle/Concept/D_MainWindow.xaml

@@ -39,21 +39,6 @@
             </StackPanel>
 
             <StackPanel Margin="0,0,50,0" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Right">
-                <!--<Button Margin="1"
-                   Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"     
-                   materialDesign:ShadowAssist.ShadowDepth="Depth5" Background="{Binding OcsBrush, FallbackValue={x:Null}}">
-                    OCS
-                </Button>-->
-
-                <!--<Button Margin="0" Width="47" Height="60"
-                   Style="{DynamicResource MaterialDesignFloatingActionButton}"     
-                   materialDesign:ShadowAssist.ShadowDepth="Depth5" Background="{Binding BatteryBrush, FallbackValue={x:Null}}">
-                    <StackPanel>
-                        <materialDesign:PackIcon Kind="BatteryCharging" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,0" Height="20" Width="auto"/>
-                        <TextBlock Text="{Binding SOC, StringFormat={}{0}%, FallbackValue=0%}"/>
-                    </StackPanel>
-                </Button>-->
-
                 <Button Margin="1" HorizontalAlignment="Left" Height="40" BorderBrush="Gray" BorderThickness="0" Background="{x:Null}"
                         >
                     <StackPanel Orientation="Horizontal">
@@ -65,8 +50,8 @@
                     </StackPanel>
                 </Button>
 
-                <Button Margin="1" HorizontalAlignment="Center" Height="40" BorderBrush="Gray" BorderThickness="0" Background="{x:Null}"
-                        HorizontalContentAlignment="Left">
+                <Button Margin="1" HorizontalAlignment="Center" Height="40" BorderBrush="{DynamicResource PrimaryHueMidBrush}" BorderThickness="1" Background="{x:Null}"
+                        HorizontalContentAlignment="Left" Command="{Binding BatteryPopup}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon HorizontalContentAlignment="Left" Kind="BatteryOff" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,0,0,0" Height="30" Width="AUto" Foreground="Red"
                                                  Visibility="{c:Binding 'BatteryState == local:eBatteryState.DisConnect'}"/>

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

@@ -161,22 +161,13 @@ namespace OHV.Vehicle.Concept
             get { return this.ocsState; }
             set { this.SetProperty( ref this.ocsState, value ); }
         }
-<<<<<<< HEAD
-
-=======
->>>>>>> 69c47f10da3d0471e11a86cb5cebfd28044ec0fd
 
 
         eBatteryState batteryState = eBatteryState.DisConnect;
         public eBatteryState BatteryState
         {
-<<<<<<< HEAD
-            get { return this.batteryConnectState; }
-            set { this.SetProperty( ref this.batteryConnectState, value ); }
-=======
             get { return this.batteryState; }
             set { this.SetProperty( ref this.batteryState , value ); }
->>>>>>> 69c47f10da3d0471e11a86cb5cebfd28044ec0fd
         }
 
         #endregion
@@ -224,6 +215,8 @@ 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;
@@ -268,6 +261,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( ExecuteBatteryCommand );
 
             DispatcherTimer dateTimer = new DispatcherTimer();
             dateTimer.Tick += ( object sender, EventArgs e ) =>
@@ -283,6 +277,11 @@ namespace OHV.Vehicle.Concept
             GSG.NET.Quartz.QuartzUtils.Invoke( "RESOURCE_CHECK", GSG.NET.Quartz.QuartzUtils.GetExpnSecond( 1 ), QuzOnResourceUsage );
         }
 
+        private void ExecuteBatteryCommand( )
+        {
+            this.messageController.ShowBatteryPopupView();
+        }
+
         void QuzOnResourceUsage()
         {
             this.CPU = GSG.NET.OSView.Mgnt.CpuUseRate();
@@ -423,7 +422,7 @@ namespace OHV.Vehicle.Concept
             {
                 this.StartEnable = false;
                 this.StopEnable = true;
-                this.IsManualMode = false;
+                //this.IsManualMode = false;
                 regionManager.RequestNavigate( RegionNames.MainView, "AutoView" );
             }
             else
@@ -436,20 +435,6 @@ namespace OHV.Vehicle.Concept
 
         private void UICallbackCommunication( GUIMessageEventArgs obj )
         {
-<<<<<<< HEAD
-=======
-            if ( obj.Kind == GUIMessageEventArgs.eGUIMessageKind.ModelPropertyChange )
-            {
-                if ( obj.MessageKey.Equals( MessageKey.Vehicle ) )
-                {
-                    switch ( obj.ModelPropertyName )
-                    {
-                        
-                    }
-                }
-            }
-
->>>>>>> 69c47f10da3d0471e11a86cb5cebfd28044ec0fd
             switch ( obj.Kind )
             {
                 case GUIMessageEventArgs.eGUIMessageKind.ModelPropertyChange:
@@ -540,11 +525,7 @@ namespace OHV.Vehicle.Concept
 
             if ( args.MessageKey.Equals( MessageKey.Vehicle ) )
             {
-<<<<<<< HEAD
-                switch ( args.ModelPropertyName )
-=======
                 switch(args.ModelPropertyName)
->>>>>>> 69c47f10da3d0471e11a86cb5cebfd28044ec0fd
                 {
                     case "VehicleStateProperty":
                         {
@@ -555,7 +536,6 @@ namespace OHV.Vehicle.Concept
                                 this.IsVehicleAlarm = false;
                         }
                         break;
-<<<<<<< HEAD
 
                     case "MachineMode":
                         this.MachineMode = CastTo<eMachineMode>.From<object>( args.Args );
@@ -569,28 +549,17 @@ namespace OHV.Vehicle.Concept
                         this.SOC = CastTo<double>.From<object>( args.Args );
                         break;
 
-                    default:
-=======
-                    case "MachineMode":
-                        this.MachineMode = CastTo<eMachineMode>.From<object>( args.Args );
-                        break;
-                    case "BatteryIsConnect":
-                        this.RspBatteryConnected( args );
-                        break;
-                    case "BatteryStateOfCharge":
-                        this.SOC = CastTo<double>.From<object>( args.Args );
-                        break;
                     case "BatteryChargeTime":
                         {
                             var cTime = CastTo<double>.From<object>( args.Args );
                             this.BatteryState = eBatteryState.Charge;
                         }
                         break;
+
                     case "BatteryDisChargeTime":
                         {
                             var cTime = CastTo<double>.From<object>( args.Args );
                         }
->>>>>>> 69c47f10da3d0471e11a86cb5cebfd28044ec0fd
                         break;
                 }
             }

Dev/OHV/VehicleControlSystem/ControlLayer/Clamp.cs

@@ -142,7 +142,7 @@ namespace VehicleControlSystem.ControlLayer
             else
                 this.ClampState = eClampState.NONE;
 
-            this.ClampState = eClampState.NONE;
+            //this.ClampState = eClampState.NONE;
 
             var msg = new AxisControlEventArgs
             {

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -122,6 +122,8 @@ namespace VehicleControlSystem.ControlLayer
         public int ObstacleDrive { get { return this._obstacleDrive; } set { SetField( ref this._obstacleDrive, value ); } }
         private int _obstacleCurve;
         public int ObstacleCurve { get { return this._obstacleCurve; } set { SetField( ref this._obstacleCurve, value ); } }
+        private int obstacleCurrent;
+        public int ObstacleCurrent { get { return this.ObstacleCurrent; } set { SetField( ref this.obstacleCurrent , value ); } }
 
         private eObstacleState obstacleState = eObstacleState.Normal;
         public eObstacleState ObstacleStateProperty
@@ -263,8 +265,7 @@ namespace VehicleControlSystem.ControlLayer
         {
             get
             {
-                this.BatteryIsConnect = this.bMUManager.IsConnected;
-                return this.bMUManager.IsConnected;
+                return batteryIsConnect;
             }
             set { this.SetField( ref this.batteryIsConnect, value ); }
         }
@@ -375,6 +376,7 @@ namespace VehicleControlSystem.ControlLayer
                                 ControlKind = ObstacleControlEventArgs.eControlKind.INFO,
                                 Drive = this.ObstacleDrive,
                                 Curve = this.ObstacleCurve,
+                                Current = this.GetObstacleDetectPattern(),
                                 ObstacleState = this.ObstacleStateProperty.ToString()
                             };
                             this.ObstacleControlEventPublish( msg );
@@ -542,18 +544,6 @@ namespace VehicleControlSystem.ControlLayer
             state.CurrentTag = this.CurrentTag;
             state.CurrentTorque = this.CurrentTorque;
 
-            state.Voltage = this.BatteryVoltage;
-            state.Current = this.BatteryCurrent;
-            state.BatteryState = this.BatteryState;
-            state.ChargeTime = this.BatteryChargeTime;
-            state.DisChargeTime = this.BatteryDisChargeTime;
-            state.SOC = this.BatteryStateOfCharge;
-            state.SOH = this.BatteryStateOfHealth;
-            state.Capacity = this.BatteryCapacity;
-            state.Energy = this.BatteryEnergy;
-            state.Temperature = this.BatteryTemperature;
-            state.BatteryIsConnect = this.BatteryIsConnect;
-
             var msg = new DriveControlEventArgs();
             msg.ControlKind = args.ControlKind;
             msg.Args = state;
@@ -1445,15 +1435,15 @@ namespace VehicleControlSystem.ControlLayer
             this.bMUManager.Connect( canType );
         }
 
-        private void BMUManager_OnDisconnect( string obj, bool state )
+        private void BMUManager_OnDisconnect( string obj)
         {
-            this.BatteryIsConnect = state;
+            this.BatteryIsConnect = false;
             this.OccurVehicleAlarm( 32 );
         }
 
-        private void BMUManager_OnConnect( string obj, bool state )
+        private void BMUManager_OnConnect( string obj )
         {
-            this.BatteryIsConnect = state;
+            this.BatteryIsConnect = true;
         }
 
         private void BMUManager_OnFirstColtd( List<ReceivedData> obj )