Browse Source

Pull Commit

ys-hwang 6 years ago
parent
commit
4d99e31853

+ 7 - 0
Dev/OHV/OHV.Module.Status/VehicleStatusViewModel.cs

@@ -26,6 +26,13 @@ namespace OHV.Module.Status
             this.eventAggregator = _ea;
 
             this.vcSystem = _vcSystem;
+
+            this.vcSystem.autoManager.OperationModeChanged += () => { };//AutoManager_OperationModeChanged;
+        }
+
+        private void AutoManager_OperationModeChanged( )
+        {
+            
         }
 
         public void Init( ) { }

+ 5 - 5
Dev/OHV/OHV.SqliteDAL/DAL/AbstractDAL.cs

@@ -22,7 +22,7 @@ namespace OHV.SqliteDAL.DAL
         public delegate void DlgChangedProperty();
         public event DlgChangedProperty ChangedProperty;
 
-        protected virtual void OnChangedPropertiy()
+        protected virtual void OnChangedProperty()
         {
             ChangedProperty?.BeginInvoke(null, null);
         }
@@ -90,7 +90,7 @@ namespace OHV.SqliteDAL.DAL
                 db.Set<T>().Add(entity);
                 db.SaveChanges();
             }
-            OnChangedPropertiy();
+            OnChangedProperty();
         }
 
         public void Delete(T entity)
@@ -101,7 +101,7 @@ namespace OHV.SqliteDAL.DAL
                 //db.Set<T>().Remove(entity);
                 db.SaveChanges();
             }
-            OnChangedPropertiy();
+            OnChangedProperty();
         }
 
         public virtual void Update(T entity)
@@ -111,7 +111,7 @@ namespace OHV.SqliteDAL.DAL
                 db.Entry(entity).State = EntityState.Modified;
                 db.SaveChanges();
             }
-            OnChangedPropertiy();
+            OnChangedProperty();
         }
 
         public void Clean()
@@ -121,7 +121,7 @@ namespace OHV.SqliteDAL.DAL
                 db.Set<T>().RemoveRange(db.Set<T>());
                 db.SaveChanges();
             }
-            OnChangedPropertiy();
+            OnChangedProperty();
         }
     }
 

+ 2 - 2
Dev/OHV/OHV.SqliteDAL/DAL/CommandDAL.cs

@@ -26,7 +26,7 @@ namespace OHV.SqliteDAL.DAL
             var cmd = GetK(id);
             cmd.State = state;
             Update(cmd);
-            base.OnChangedPropertiy();
+            base.OnChangedProperty();
         }
 
         public void UpdateResult(string id, eCommandResult result)
@@ -37,7 +37,7 @@ namespace OHV.SqliteDAL.DAL
                 cmd.Result = result;
                 db.SaveChanges();
             }
-            base.OnChangedPropertiy();
+            base.OnChangedProperty();
         }
 
         public int GetCount()

+ 5 - 0
Dev/OHV/VehicleControlSystem/Managers/AutoManager.cs

@@ -37,9 +37,14 @@ namespace VehicleControlSystem.Managers
 
                 operationMode = value;
                 logger.D($"[AutoManager] OperationMode - {value}");
+
+                this.OperationModeChanged?.Invoke(this.operationMode);
             }
         }
 
+        private delegate void OperationModeChanging();
+        public event Action OperationModeChanged;
+
         private eAutoModeState autoModeState;
         public eAutoModeState AutoModeStateProperty
         {