Pull Merge

Dev/OHV/OHV.Common/OHV.Common.csproj

@@ -79,6 +79,7 @@
     <Compile Include="Model\SelectionItem.cs" />
     <Compile Include="Model\SelectionList.cs" />
     <Compile Include="Model\SubCmd.cs" />
+    <Compile Include="Model\VehicleState.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Shareds\ConstString.cs" />
     <Compile Include="Shareds\SharedEnumType.cs" />

Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs

@@ -296,8 +296,8 @@ namespace OHV.Module.Interactivity.PopUp
 
         private void ResponseVehicleState(DriveControlEventArgs args)
         {
-            //var state = CastTo<VehicleState>.From<object>(args.Args);
-            //this.CurrentDrive = state.CurrentPosition;
+            var state = CastTo<VehicleState>.From<object>( args.Args );
+            this.CurrentDrive = state.CurrentPosition;
         }
 
         private void ResponseMove( DriveControlEventArgs args )
@@ -513,6 +513,11 @@ namespace OHV.Module.Interactivity.PopUp
             {
                 if ( r.Result == ButtonResult.OK )
                 {
+                    //TODO:[20/03/20 ys-hwang] RoutList.IsSelected Check
+                    //if(this.RouteList.Any( x => x.IsSelected != true ))
+                    //    return;
+                    var result = this.RouteList.Any( x => x.IsSelected != false );
+
                     var ll = this.RouteList.Where(x => x.IsSelected).FirstOrDefault();
 
                     var msg = new DriveControlEventArgs

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -333,15 +333,17 @@ namespace VehicleControlSystem.ControlLayer
         {
             //TODO:[20/03/20 ys-hwang] VehicleState Class Not Assign
 
-            //VehicleState state = new VehicleState();
-            //state.CurrentPosition = this.CurrentPosition;
-            //state.CurrentSpeed = this.CurrentSpeed;
-            //state.CurrentTag = this.CurrentTag;
-            //state.CurrentTorque = this.CurrentTorque;
+            VehicleState state = new VehicleState
+            {
+                CurrentPosition = this.CurrentPosition ,
+                CurrentSpeed = this.CurrentSpeed ,
+                CurrentTag = this.CurrentTag ,
+                CurrentTorque = this.CurrentTorque
+            };
 
             var msg = new DriveControlEventArgs();
             msg.ControlKind = args.ControlKind;
-            //msg.Args = state;
+            msg.Args = state;
 
             DriveControlEventPublish(msg);
         }