升级库

Lib/SCADA.CommonLib.xml

@@ -580,19 +580,6 @@
             <param name="isEncrypt">是否加密</param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.CommonLib.AutoSaveParameterItem.Create``1(System.String,``0,System.String,System.String,System.Windows.Data.Binding,System.Boolean)">
-            <summary>
-            创建一个自动保存参数的对象
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="parameterName">参数名称</param>
-            <param name="defaulValue">默认值</param>
-            <param name="displayName">显示名称</param>
-            <param name="isEnableBinding">使能绑定</param>
-            <param name="unit">单位</param>
-            <param name="isEncrypt">是否加密</param>
-            <returns></returns>
-        </member>
         <member name="P:SCADA.CommonLib.AutoSaveParameterItem.ParameterPath">
             <summary>
             参数在文件中的保存位置
@@ -930,6 +917,11 @@
             </summary>
             <param name="table"></param>
         </member>
+        <member name="M:SCADA.CommonLib.CommonModel.BaseQuery.#ctor">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="M:SCADA.CommonLib.CommonModel.BaseQuery.#ctor(SCADA.CommonLib.Data.DIL.IDB,System.String)">
             <summary>
             
@@ -974,6 +966,11 @@
             </summary>
             <param name="table"></param>
         </member>
+        <member name="M:SCADA.CommonLib.CommonModel.CommonQuery.#ctor">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:SCADA.CommonLib.CommonModel.CommonQuery.CreateTime">
             <summary>
             
@@ -6438,96 +6435,6 @@
             </summary>
             <param name="eventData"></param>
         </member>
-        <member name="T:SCADA.CommonLib.EventBus.EventBus">
-            <summary>
-            事件总线
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.EventBus.EventBus.IocContainer">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.EventBus.EventBus.Default">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.#ctor">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Register``1(SCADA.CommonLib.EventBus.IEventHandler)">
-            <summary>
-            手动绑定事件源与事件处理
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="eventHandler"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Register``1(System.Action{``0})">
-            <summary>
-            注册Action事件处理器
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="action"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Register(System.Type,System.Type)">
-            <summary>
-            手动绑定事件源与事件处理
-            </summary>
-            <param name="eventType"></param>
-            <param name="handlerType"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.RegisterAllEventHandlerFromAssembly(System.Reflection.Assembly)">
-            <summary>
-            提供入口支持注册其它程序集中实现的IEventHandler
-            </summary>
-            <param name="assembly"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.UnRegister``1(System.Type)">
-            <summary>
-            手动解除事件源与事件处理的绑定
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="handlerType"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.UnRegisterAll``1">
-            <summary>
-            卸载指定事件源上绑定的所有事件
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Trigger``1(``0)">
-            <summary>
-            根据事件源触发绑定的事件处理
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="eventData"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Trigger``1(System.Type,``0)">
-            <summary>
-            触发指定EventHandler
-            </summary>
-            <param name="eventHandlerType"></param>
-            <param name="eventData"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.TriggerAsync``1(``0)">
-            <summary>
-            异步触发
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="eventData"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.TriggerAsycn``1(System.Type,``0)">
-            <summary>
-            异步触发指定EventHandler
-            </summary>
-            <param name="eventHandlerType"></param>
-            <param name="eventData"></param>
-            <returns></returns>
-        </member>
         <member name="T:SCADA.CommonLib.EventBus.IEventBus">
             <summary>
             
@@ -7019,42 +6926,6 @@
             
             </summary>
         </member>
-        <member name="T:SCADA.CommonLib.Helper.BartenderHelper">
-            <summary>
-            bartender 标签打印帮助类
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.BartenderHelper.GetPrintPreviewImage``1(``0,System.String,System.String,System.Boolean,System.Collections.Generic.Dictionary{System.String,System.String})">
-            <summary>
-            
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="obj"></param>
-            <param name="templetPath"></param>
-            <param name="imageFilePath"></param>
-            <param name="autoMapper"></param>
-            <param name="mapping"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.BartenderHelper.Print(System.Collections.Generic.Dictionary{System.String,System.String},System.String,System.String)">
-            <summary>
-            以键值对方式打印标签,key为标签中的数据标签
-            </summary>
-            <param name="printValues"></param>
-            <param name="templetPath"></param>
-            <param name="printer"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.BartenderHelper.Print``1(``0,System.String,System.String,System.Boolean,System.Collections.Generic.Dictionary{System.String,System.String})">
-            <summary>
-            
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="obj"></param>
-            <param name="templetPath"></param>
-            <param name="printer"></param>
-            <param name="autoMapper"></param>
-            <param name="mapping"></param>
-        </member>
         <member name="T:SCADA.CommonLib.Helper.BeepHelper">
             <summary>
             控制蜂鸣器
@@ -7352,39 +7223,6 @@
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="T:SCADA.CommonLib.Helper.ColorHelper">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.ColorHelper.ColorToHexString(System.Windows.Media.Color)">
-            <summary>
-            将ARGB颜色转换成16进制字符
-            </summary>
-            <param name="color">Color 类型的 ARGB颜色</param>
-            <returns>返回string 16进制的ARGB颜色</returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.ColorHelper.HexStringToColor(System.String)">
-            <summary>
-            将16进制类型的ARGB颜色 转换成 Color 类型
-            </summary>
-            <param name="strcolor">string类型的16进制ARGB颜色,00FF0000</param>
-            <returns>返回 Color 类型的ARGB颜色</returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.ColorHelper.ColorToArgbString(System.Windows.Media.Color)">
-            <summary>
-            将ARGB颜色转换成string
-            </summary>
-            <param name="color">Color 类型的 ARGB颜色</param>
-            <returns>返回string类型的ARGB颜色</returns>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.ColorHelper.ArgbStringToColor(System.String)">
-            <summary>
-            将string类型的ARGB颜色 转换成 Color 类型
-            </summary>
-            <param name="strcolor">string类型的ARGB颜色,以逗号分隔。如：255,255,128,255</param>
-            <returns>返回 Color 类型的ARGB颜色</returns>
-        </member>
         <member name="T:SCADA.CommonLib.Helper.ConvertEx">
             <summary>
             
@@ -8188,6 +8026,17 @@
             <param name="fileSize"></param>
             <param name="completedSize"></param>
         </member>
+        <member name="T:SCADA.CommonLib.Helper.GuidHelper">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:SCADA.CommonLib.Helper.GuidHelper.GetShortGuid">
+            <summary>
+            获取短Guid
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:SCADA.CommonLib.Helper.GzipHelper">
             <summary>
             
@@ -8270,13 +8119,6 @@
             <param name="obj"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.CommonLib.Helper.JsonHelper.IsJsonString(System.String)">
-            <summary>
-            判断字符串是Json
-            </summary>
-            <param name="str"></param>
-            <returns></returns>
-        </member>
         <member name="M:SCADA.CommonLib.Helper.JsonHelper.JsonDeserialize``1(System.String)">
             <summary>
             JSON反序列化
@@ -8314,6 +8156,13 @@
             <param name="type"></param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.CommonLib.Helper.JsonHelper.IsJsonString(System.String)">
+            <summary>
+            判断字符串是Json
+            </summary>
+            <param name="str"></param>
+            <returns></returns>
+        </member>
         <member name="T:SCADA.CommonLib.Helper.WhereBuilder">
             <summary>
             Generating SQL from expression trees, Part 2
@@ -9205,19 +9054,6 @@
             </summary>
             <param name="random">随机数填充</param>
         </member>
-        <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.SetBindingValue(System.Windows.Data.Binding,System.Object)">
-            <summary>
-            
-            </summary>
-            <param name="binding"></param>
-            <param name="value"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.GetBindingValue(System.Windows.Data.Binding)">
-            <summary>
-            
-            </summary>
-            <param name="binding"></param>
-        </member>
         <member name="M:SCADA.CommonLib.Helper.ReflectionHelper.InvokeMatchPara(System.Reflection.MethodInfo,System.Object,System.Object)">
             <summary>
             自动匹配执行参数
@@ -11699,11 +11535,6 @@
             
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.Context.HttpContext">
-            <summary>
-            Http 上下文
-            </summary>
-        </member>
         <member name="T:SCADA.CommonLib.RpcPara">
             <summary>
             远程调用参数

Lib/SCADA.xml

@@ -3255,14 +3255,17 @@
             接收到数据
             </summary>
         </member>
-        <member name="P:SCADA.Comm.DataReceivedEventArg.ReceivedData">
+        <member name="P:SCADA.Comm.DataReceivedEventArg.Comm">
             <summary>
             
             </summary>
         </member>
+        <member name="P:SCADA.Comm.DataReceivedEventArg.ReceivedData">
+            <summary> 
+            </summary>
+        </member>
         <member name="P:SCADA.Comm.DataReceivedEventArg.EF">
-            <summary>
-            
+            <summary> 
             </summary>
         </member>
         <member name="P:SCADA.Comm.DataReceivedEventArg.ResponseInfo">
@@ -3797,6 +3800,117 @@
             
             </summary>
         </member>
+        <member name="P:SCADA.Comm.Session.IsDisposed">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(System.Collections.Generic.List{System.Byte},SCADA.Comm.CommEndFlag)">
+            <summary>
+            
+            </summary>
+            <param name="bytesToSend"></param>
+            <param name="EF"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(System.Collections.Generic.List{System.Byte},SCADA.Comm.ResponseInfo)">
+            <summary>
+            
+            </summary>
+            <param name="bytesToSend"></param>
+            <param name="responseInfo"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(System.Collections.Generic.List{System.Byte},System.Collections.Generic.List{SCADA.Comm.CommEndFlag})">
+            <summary>
+            
+            </summary>
+            <param name="bytesToSend"></param>
+            <param name="efs"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(System.Collections.Generic.List{System.Byte},System.Collections.Generic.List{SCADA.Comm.ResponseInfo})">
+            <summary>
+            
+            </summary>
+            <param name="bytesToSend"></param>
+            <param name="responseInfos"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(SCADA.Comm.CommEndFlag)">
+            <summary>
+            
+            </summary>
+            <param name="EF"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(SCADA.Comm.ResponseInfo)">
+            <summary>
+            
+            </summary>
+            <param name="responseInfo"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(System.Collections.Generic.List{SCADA.Comm.CommEndFlag})">
+            <summary>
+            
+            </summary>
+            <param name="efs"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReadBytes(System.Collections.Generic.List{SCADA.Comm.ResponseInfo})">
+            <summary>
+            
+            </summary>
+            <param name="responseInfos"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.SendBytes(System.Collections.Generic.IEnumerable{System.Byte})">
+            <summary>
+            
+            </summary>
+            <param name="bytes"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.OnBeginConnect">
+            <summary>
+            
+            </summary>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.OnConnected">
+            <summary>
+            
+            </summary>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.OnUnConnected">
+            <summary>
+            
+            </summary>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:SCADA.Comm.Session.ReceiveBytes(System.Collections.Generic.IEnumerable{SCADA.Comm.ResponseInfo})">
+            <summary>
+            
+            </summary>
+            <param name="responseInfos"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.Comm.Session.Dispose">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:SCADA.Comm.SocketEx">
             <summary>
             
@@ -6421,7 +6535,7 @@
         </member>
         <member name="T:SCADA.Drive.Inovance.H5UModbusRtu">
             <summary>
-            汇川PLC
+            汇川PLC  
             </summary>
         </member>
         <member name="M:SCADA.Drive.Inovance.H5UModbusRtu.#ctor(System.String)">
@@ -7721,6 +7835,16 @@
             <param name="dataLength"></param>
             <returns></returns>
         </member>
+        <member name="T:SCADA.Drive.Modbus.BaseModbusCmd">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:SCADA.Drive.Modbus.BaseModbusCmd.IsFiveBitAddress">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:SCADA.Drive.Modbus.ModbusASCII">
             <summary>
             ModbusASCII  协议
@@ -7892,6 +8016,16 @@
             <param name="cmd"></param>
             <returns></returns>
         </member>
+        <member name="T:SCADA.Drive.Modbus.ModbusRtuCmd">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:SCADA.Drive.Modbus.ModbusRtuCmd.#ctor">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="M:SCADA.Drive.Modbus.ModbusRtuCmd.#ctor(System.Collections.Generic.List{System.Byte})">
             <summary>
             解码
@@ -24067,25 +24201,28 @@
             <param name="regNames"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.Drive.TagExtersion.TowByteSwap(System.Byte[])">
+        <member name="M:SCADA.Drive.TagExtersion.TowByteSwap(System.Byte[],System.Int32)">
             <summary>
             
             </summary>
             <param name="src"></param>
+            <param name="width"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.Drive.TagExtersion.FourByteSwap(System.Byte[])">
+        <member name="M:SCADA.Drive.TagExtersion.FourByteSwap(System.Byte[],System.Int32)">
             <summary>
             
             </summary>
             <param name="src"></param>
+            <param name="width"></param>
             <returns></returns>
         </member>
-        <member name="M:SCADA.Drive.TagExtersion.OCTByteSwap(System.Byte[])">
+        <member name="M:SCADA.Drive.TagExtersion.OCTByteSwap(System.Byte[],System.Int32)">
             <summary>
             
             </summary>
             <param name="src"></param>
+            <param name="width">交换宽度</param>
             <returns></returns>
         </member>
         <member name="T:SCADA.Drive.TCPModel">
@@ -36565,6 +36702,13 @@
             虚拟设备
             </summary>
         </member>
+        <member name="M:SCADA.VirtualDevice.OnBeforeScan(System.Collections.Generic.List{System.String})">
+            <summary>
+            
+            </summary>
+            <param name="regNames"></param>
+            <returns></returns>
+        </member>
         <member name="T:SCADA.XmlHelper">
             <summary>
             Xml序列化

SCADA_DAQ/Env.cs

@@ -84,7 +84,7 @@ namespace SCADA_DAQ
                             {
                                 ResourceName="AlarmDB",
                                 DBType = DatabaseType.Sqlite,
-                                FilePath = @"Data\Platform.db"
+                                FilePath = @"Data\Aalarmdb.db"
                             },
                             new DataBaseConfig()
                             {