Merge branch 'master' of http://private.flyautomation.net:82/panruising/thick_public

Project.FLY.OBJComponents/OBJComponents/Server/WarningSystem.cs

@@ -41,31 +41,24 @@ namespace FLY.OBJComponents.Server
             ReasonList = new Buffer<FlyData_WarningHistory>();
             NewestList = new BufferStorage<FlyData_WarningHistory>("warning_newest.csv");
         }
-        /// <summary>
-        /// 报警复位!!!!
-        /// </summary>
+
         public Action ResetEvent;
         public void Reset()
         {
-            ReasonList.Reset();
             ResetEvent?.Invoke();
         }
-        /// <summary>
-        /// 正在报警!!!
-        /// </summary>
-        public Action RingEvent;
-
         #region IWarningServiceSimple
 
 
         public void Add(byte errcode, string description, ERR_STATE state)
         {
-            FlyData_WarningHistory reason = new FlyData_WarningHistory();
-            reason.Time = DateTime.Now;
-
-            reason.ErrCode = errcode;
-            reason.Description = description;
-            reason.State = state;
+            FlyData_WarningHistory reason = new FlyData_WarningHistory
+            {
+                Time = DateTime.Now,
+                ErrCode = errcode,
+                Description = description,
+                State = state
+            };
 
             FlyData_WarningHistory error = null;
             Buffer<FlyData_WarningHistory> reasonList = ReasonList as Buffer<FlyData_WarningHistory>;
@@ -85,7 +78,7 @@ namespace FLY.OBJComponents.Server
                 case ERR_STATE.ON:
                     if (error == null)
                     {
-                        ((Buffer<FlyData_WarningHistory>)ReasonList).Add(reason.Clone());
+                        reasonList.Add(reason.Clone());
 
                     }
                     else
@@ -103,20 +96,12 @@ namespace FLY.OBJComponents.Server
                     else
                     {
                         error.State = state;
-                        ((Buffer<FlyData_WarningHistory>)ReasonList).Remove(error_id);
+                        reasonList.Remove(error_id);
 
                     }
                     break;
             }
             ((Buffer<FlyData_WarningHistory>)NewestList).Add(reason);
-            if (reasonList.Count > 0)
-            {
-                RingEvent?.Invoke();
-            }
-            else
-            {
-                Reset();
-            }
         }
 
         #endregion