Shun 2 年之前
父節點
當前提交
013bdd1444

+ 1 - 1
src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.26</Version>
+    <Version>1.0.0.27</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

+ 1 - 5
src/YSAI.DAQ/YSAI.Core/interface/IBaseAbstract.cs

@@ -20,11 +20,7 @@ namespace YSAI.Core.@interface
         /// <param name="e">事件结果</param>
         protected virtual void OnEventHandler(object? sender, EventResult e)
         {
-            EventHandler<EventResult> handler = OnEvent;
-            if (handler != null)
-            {
-                handler(sender, e);
-            }
+            OnEvent?.Invoke(sender, e);
         }
     }
 

+ 5 - 5
src/YSAI.DAQ/YSAI.Test.All/Program.cs

@@ -9,7 +9,7 @@ Address address = new Address()
     SN = Guid.NewGuid().ToString(),
     AddressArray = new List<AddressDetails>()
 };
-for (int i = 0; i < 100000; i++)
+for (int i = 0; i < 1000; i++)
 {
     address.AddressArray.Add(new AddressDetails
     {
@@ -27,7 +27,7 @@ SubscribeOperate subscribeOperate = SubscribeOperate.Instance(new SubscribeData.
     Address = address,
     Function = tEST.Read,
 });
-//subscribeOperate.OnEvent += SubscribeOperate_OnEvent;
+subscribeOperate.OnEvent += SubscribeOperate_OnEvent;
 OperateResult operateResult = subscribeOperate.On();
 
 
@@ -45,9 +45,9 @@ void SubscribeOperate_OnEvent(object? sender, EventResult e)
     ConcurrentDictionary<string, AddressValue> param = e.RData as ConcurrentDictionary<string, AddressValue>;
     foreach (var item in param)
     {
-        //Console.WriteLine(item.Value.AddressName);
-        //Console.WriteLine(item.Value.Value);
-        //Console.WriteLine("---------------------");
+        Console.WriteLine(item.Value.AddressName);
+        Console.WriteLine(item.Value.Value);
+        Console.WriteLine("---------------------");
     }
 }