충돌 병합

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

@@ -1,4 +1,5 @@
-using OHV.Common.Events;
+using GSG.NET.Extensions;
+using OHV.Common.Events;
 using OHV.Common.Shareds;
 using Prism.Commands;
 using Prism.Events;
@@ -71,7 +72,15 @@ namespace OHV.Module.Interactivity.PopUp
             {
                 if( _args.MessageKey.Equals(MessageKey.Vehicle))
                 {
-
+                    switch(_args.ModelPropertyName)
+                    {
+                        case "ObstacleStateProperty":
+                            {
+                                var reply = CastTo<eObstacleState>.From<object>( _args.Args );
+                                this.ChangeObstacleState( reply );
+                            }
+                            break;
+                    }
                 }
             }
 
@@ -100,6 +109,11 @@ namespace OHV.Module.Interactivity.PopUp
             }
         }
 
+        private void ChangeObstacleState( eObstacleState _reply )
+        {
+            
+        }
+
         private void ExecutePosMoveCommand( object obj )
         {
             this.messageController.ShowConfirmationPopupView( "Carrier Move To ?" , r =>

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 )
@@ -555,11 +555,7 @@ namespace OHV.Module.Interactivity.PopUp
             };
             this.PublishEvent(msg);
 
-<<<<<<< HEAD
-         //   this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish( new DriveControlEventArgs { EventDir = DriveControlEventArgs.eEventDir.ToBack , ControlKind = DriveControlEventArgs.eControlKind.ReqCurrentPos } );
-=======
-            this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish( new DriveControlEventArgs { EventDir = DriveControlEventArgs.eEventDir.ToBack , ControlKind = DriveControlEventArgs.eControlKind.VehicleState } );
->>>>>>> c46c4387a8ef1f5ab1ba5e83769ae8f84c3891dc
+            //this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish( new DriveControlEventArgs { EventDir = DriveControlEventArgs.eEventDir.ToBack , ControlKind = DriveControlEventArgs.eControlKind.VehicleState } );
         }
 
         private void CloseDialog(string parameter)

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

@@ -1,4 +1,5 @@
-using Prism.Commands;
+using OHV.Common.Events;
+using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
 using Prism.Services.Dialogs;
@@ -113,6 +114,19 @@ namespace OHV.Module.Interactivity.PopUp
             }
         }
 
+        private int _obstacleDrive;
+        public int ObstacleDrive
+        {
+            get { return this._obstacleDrive; }
+            set { this.SetProperty( ref this._obstacleDrive , value ); }
+        }
+        private int _obstacleCurve;
+        public int ObstacleCurve
+        {
+            get { return this._obstacleCurve; }
+            set { this.SetProperty( ref this._obstacleCurve , value ); }
+        }
+
         public ICommand DetectPatternSave { get; set; }
         public ICommand ResultPattern { get; set; }
         public ICommand PatternResultKyein { get; set; }
@@ -126,6 +140,9 @@ namespace OHV.Module.Interactivity.PopUp
         public OpticalReadingConfigViewModel( IEventAggregator _ea, MessageController _msg )
         {
             this.eventAggregator = _ea;
+            this.eventAggregator.GetEvent<GUIMessagePubSubEvent>().Unsubscribe( UICallbackCommunication );
+            this.eventAggregator.GetEvent<GUIMessagePubSubEvent>().Subscribe( UICallbackCommunication, ThreadOption.UIThread );
+
             this.messageController = _msg;
 
             this.DetectPatternSave = new DelegateCommand( ExecuteDetectPatternSave );
@@ -133,6 +150,11 @@ namespace OHV.Module.Interactivity.PopUp
             this.PatternResultKyein = new DelegateCommand<object>( ExecutePatternResultKyein );
         }
 
+        private void UICallbackCommunication( GUIMessageEventArgs obj )
+        {
+
+        }
+
         private void ExecutePatternResultKyein( object obj)
         {
             var numpad = new CalcuratorView();

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -331,15 +331,17 @@ namespace VehicleControlSystem.ControlLayer
 
         private void ReqVehicleState(DriveControlEventArgs args)
         {
-            VehicleState state = new VehicleState();
-            state.CurrentPosition = this.CurrentPosition;
-            state.CurrentSpeed = this.CurrentSpeed;
-            state.CurrentTag = this.CurrentTag;
-            state.CurrentTorque = this.CurrentTorque;
+            //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;
 
             var msg = new DriveControlEventArgs();
             msg.ControlKind = args.ControlKind;
-            msg.Args = state;
+            //msg.Args = state;
 
             DriveControlEventPublish(msg);
         }
@@ -347,16 +349,12 @@ namespace VehicleControlSystem.ControlLayer
         private void ReqMoveToPos( DriveControlEventArgs args )
         {
             //var result = drive.Move( args.PositionTag );
-<<<<<<< HEAD
-            this.MoveTo( "1111" );
-            var msg = new DriveControlEventArgs
-=======
+            //this.MoveTo( "1111" );
             var reply = new DriveControlEventArgs();
 
             int targetTag = args.TargetRouteID;
             var route = sql.RouteDal.GetK(targetTag);
             if ( route == null)
->>>>>>> c46c4387a8ef1f5ab1ba5e83769ae8f84c3891dc
             {
                 reply.Result = Results.Fail("Not Found Route");
                 this.DriveControlEventPublish(reply);