Merge branch '71博创自动立库' of http://www.imaodou.com.cn:30030/c_jack/EICP3.0_69 into 71博创自动立库

Lib/SCADA.CommonCtrl.xml

@@ -2847,235 +2847,6 @@
             
             </summary>
         </member>
-        <member name="T:SCADA.CommonCtrl.SCADAUI.RegViewPanel">
-            <summary>
-            RegViewPanel.xaml 的交互逻辑
-            </summary>
-            <summary>
-            RegViewPanel
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanel.#ctor">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.RegStyleModel">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.RegStyleModelProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.IsReadOnly">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.IsReadOnlyProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanel.Init(SCADA.BaseDevice)">
-            <summary>
-            
-            </summary>
-            <param name="device"></param>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.ShowHeader">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.ShowHeaderProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanel.Init(SCADA.BaseDevice,System.String[])">
-            <summary>
-            
-            </summary>
-            <param name="device"></param>
-            <param name="regName"></param>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanel.Init(SCADA.BaseDevice,System.Collections.Generic.IEnumerable{SCADA.Drive.RegInfo})">
-            <summary>
-            
-            </summary>
-            <param name="device"></param>
-            <param name="regs"></param>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanel.Init(System.Collections.Generic.IEnumerable{SCADA.Drive.RegInfo})">
-            <summary>
-            
-            </summary>
-            <param name="regs"></param>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.Header">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.HeaderProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.Orientation">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.OrientationProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.ItemHeight">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.ItemHeightProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.ItemWidth">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.ItemWidthProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.FilterStr">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.VerticalScrollBarVisibility">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.VerticalScrollBarVisibilityProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanel.HorizontalScrollBarVisibility">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanel.HorizontalScrollBarVisibilityProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanel.InitializeComponent">
-            <summary>
-            InitializeComponent
-            </summary>
-        </member>
-        <member name="T:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup">
-            <summary>
-            RegViewPanelGroup.xaml 的交互逻辑
-            </summary>
-            <summary>
-            RegViewPanelGroup
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.#ctor">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.RegStyleModel">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.RegStyleModelProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.Init(SCADA.BaseDevice)">
-            <summary>
-            
-            </summary>
-            <param name="device"></param>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.Init(System.Collections.Generic.IEnumerable{SCADA.Drive.RegInfo})">
-            <summary>
-            
-            </summary>
-            <param name="regs"></param>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.ItemHeight">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.ItemHeightProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.ItemWidth">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.ItemWidthProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.IsReadOnly">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.IsReadOnlyProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.MachineType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.MachineTypeProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.MachineDesc">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.MachineDescProperty">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonCtrl.SCADAUI.RegViewPanelGroup.InitializeComponent">
-            <summary>
-            InitializeComponent
-            </summary>
-        </member>
         <member name="T:SCADA.CommonCtrl.SCADAUI.BaseRegReadingView">
             <summary>
             

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>
             参数在文件中的保存位置
@@ -623,21 +610,6 @@
             
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.IsEnableBinding">
-            <summary>
-            绑定使能
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.VisibilityBinding">
-            <summary>
-            可视性绑定
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.Command">
-            <summary>
-            
-            </summary>
-        </member>
         <member name="M:SCADA.CommonLib.AutoSaveParameterItem.OnParameterChanged">
             <summary>
             
@@ -6040,6 +6012,21 @@
             
             </summary>
         </member>
+        <member name="T:SCADA.CommonLib.ExcuteModel">
+            <summary>
+            执行模式
+            </summary>
+        </member>
+        <member name="F:SCADA.CommonLib.ExcuteModel.Release">
+            <summary>
+            发行模式
+            </summary>
+        </member>
+        <member name="F:SCADA.CommonLib.ExcuteModel.Debug">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:SCADA.CommonLib.FileType">
             <summary>
             文件类型
@@ -6988,42 +6975,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>
             控制蜂鸣器
@@ -7321,39 +7272,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>
             
@@ -8239,13 +8157,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反序列化
@@ -8283,6 +8194,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
@@ -9174,19 +9092,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>
             自动匹配执行参数
@@ -11668,11 +11573,6 @@
             
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.Context.HttpContext">
-            <summary>
-            Http 上下文
-            </summary>
-        </member>
         <member name="T:SCADA.CommonLib.RpcPara">
             <summary>
             远程调用参数
@@ -12019,6 +11919,13 @@
             <summary>自动更新
             </summary>
         </member>
+        <member name="P:SCADA.CommonLib.SystemConfig.ExcuteModel">
+            <summary>
+            
+            </summary>
+            <summary>设备配置
+            </summary>
+        </member>
         <member name="P:SCADA.CommonLib.SystemConfig.DeviceCfgFile">
             <summary>设备配置
             </summary>

Lib/SCADA.xml

@@ -1288,13 +1288,11 @@
             </summary>
         </member>
         <member name="P:SCADA.BaseDevice.StartTime">
-            <summary>
-            启动时间
+            <summary> 启动时间
             </summary>
         </member>
         <member name="P:SCADA.BaseDevice.ListenRegNames">
-            <summary>
-            监听寄存器地址
+            <summary> 监听寄存器地址
             </summary>
         </member>
         <member name="F:SCADA.BaseDevice.SystemTag_ConnectState">
@@ -1549,18 +1547,15 @@
             </summary>
         </member>
         <member name="P:SCADA.BaseDevice.SystemReg">
-            <summary>
-            系统寄存器
+            <summary>系统寄存器
             </summary>
         </member>
         <member name="P:SCADA.BaseDevice.ListenReg">
-            <summary>
-            当前监听的寄存器
+            <summary> 当前监听的寄存器
             </summary>
         </member>
         <member name="P:SCADA.BaseDevice.UserDefinedReg">
-            <summary>
-            用户定义寄存器
+            <summary>用户定义寄存器
             </summary>
         </member>
         <member name="P:SCADA.BaseDevice.DeviceID">
@@ -1824,7 +1819,7 @@
             <param name="regAnnotations"></param>
         </member>
         <member name="M:SCADA.BaseDevice.RegGroupSplit(System.String)">
-            <summary>
+            <summary> 
             分割寄存器组
             </summary>
             <param name="regNames"></param>
@@ -2563,6 +2558,22 @@
             通信通道基类
             </summary>
         </member>
+        <member name="P:SCADA.Comm.BaseComm.SendCount">
+            <summary> 发送的字节数
+            </summary>
+        </member>
+        <member name="P:SCADA.Comm.BaseComm.ReceiveCount">
+            <summary> 收到的字节数
+            </summary>
+        </member>
+        <member name="P:SCADA.Comm.BaseComm.SendPackagesCount">
+            <summary> 发送的数据包数
+            </summary>
+        </member>
+        <member name="P:SCADA.Comm.BaseComm.ReceivePackagesCount">
+            <summary> 收到的数据包数 
+            </summary>
+        </member>
         <member name="P:SCADA.Comm.BaseComm.LastPrintConnectLogTime">
             <summary>
             最后打印连接日志的时间
@@ -2838,7 +2849,7 @@
             开始接收数据
             </summary>
         </member>
-        <member name="M:SCADA.Comm.BaseComm.OnDataReceived">
+        <member name="M:SCADA.Comm.BaseComm.OnDataReceived(SCADA.Comm.DataArrived)">
             <summary>
             数据已经接收
             </summary>
@@ -3224,56 +3235,40 @@
             不清楚连接状态
             </summary>
         </member>
-        <member name="T:SCADA.Comm.DataReceivedEventArg">
-            <summary>
-            接收到数据
-            </summary>
-        </member>
-        <member name="P:SCADA.Comm.DataReceivedEventArg.ReceivedData">
+        <member name="T:SCADA.Comm.DataArrived">
             <summary>
             
             </summary>
         </member>
-        <member name="P:SCADA.Comm.DataReceivedEventArg.EF">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.Comm.DataReceivedEventArg.ResponseInfo">
+        <member name="P:SCADA.Comm.DataArrived.ArrivedDataCount">
             <summary>
             
             </summary>
         </member>
-        <member name="P:SCADA.Comm.DataReceivedEventArg.ReceiveMsg">
+        <member name="T:SCADA.Comm.DataReceivedEventArg">
             <summary>
-            消息字符串默认是UTF8 编码格式的，如需要其他格式请行用 ReceiveData进行转换
+            接收到数据
             </summary>
         </member>
-        <member name="T:SCADA.Comm.GOTTcpComm">
+        <member name="P:SCADA.Comm.DataReceivedEventArg.ReceivedData">
             <summary>
-            Tcp通信通道
+            
             </summary>
         </member>
-        <member name="M:SCADA.Comm.GOTTcpComm.#ctor(System.String,System.Int32)">
+        <member name="P:SCADA.Comm.DataReceivedEventArg.EF">
             <summary>
             
             </summary>
-            <param name="iPAddr"></param>
-            <param name="port"></param>
         </member>
-        <member name="M:SCADA.Comm.GOTTcpComm.SendBytes(System.Collections.Generic.IEnumerable{System.Byte})">
+        <member name="P:SCADA.Comm.DataReceivedEventArg.ResponseInfo">
             <summary>
             
             </summary>
-            <param name="bytes"></param>
         </member>
-        <member name="M:SCADA.Comm.GOTTcpComm.ReadBytes(System.Collections.Generic.List{System.Byte},SCADA.Comm.CommEndFlag)">
+        <member name="P:SCADA.Comm.DataReceivedEventArg.ReceiveMsg">
             <summary>
-            读取数据
+            消息字符串默认是UTF8 编码格式的，如需要其他格式请行用 ReceiveData进行转换
             </summary>
-            <param name="bytesToSend"></param>
-            <param name="EF"></param>
-            <returns></returns>
         </member>
         <member name="T:SCADA.Comm.IComm">
             <summary>
@@ -5179,7 +5174,6 @@
         </member>
         <member name="M:SCADA.Drive.BaseProtocol.OnBeforeScan(System.Collections.Generic.List{System.String})">
             <summary>
-            
             </summary>
             <param name="regNames"></param>
             <returns></returns>
@@ -6517,101 +6511,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="T:SCADA.Drive.Koyo.BaseKoyoPLC">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.BaseKoyoPLC.#ctor(SCADA.Comm.IComm,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="comm"></param>
-            <param name="address"></param>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.BaseKoyoPLC.#ctor(SCADA.Comm.IComm,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="CommWay"></param>
-            <param name="Address"></param>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.BaseKoyoPLC.GetRegistersByRangeName(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="regNameRange"></param>
-            <returns></returns>
-        </member>
-        <member name="T:SCADA.Drive.Koyo.CCMPLC">
-            <summary>
-            光洋PLC CCM协议(Hex)
-            </summary>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.#ctor(SCADA.Comm.IComm,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="comm"></param>
-            <param name="address"></param>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.#ctor(SCADA.Comm.IComm,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="CommWay"></param>
-            <param name="Address"></param>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.Handshake">
-             <summary>
-            CCM 通信前要握手  ccm 每次通信前都要先握手
-             </summary>
-             <returns></returns>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.ReadNReg(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="regNameRange"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.ReadNReg(System.String,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="regName"></param>
-            <param name="length"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.ResetBit(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="regName"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.SetBit(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="regName"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.WriteReg(System.String,System.Int32[])">
-            <summary>
-            写多个寄存器
-            </summary>
-            <param name="regName">起始寄存器的名称</param>
-            <param name="params">要写入的数据</param>
-            <returns>执行结果 成功:true 失败:false</returns>
-        </member>
-        <member name="M:SCADA.Drive.Koyo.CCMPLC.SendCmd(SCADA.BaseCmd)">
-            <summary>
-            
-            </summary>
-            <param name="cmd"></param>
-            <returns></returns>
-        </member>
         <member name="T:SCADA.Drive.Koyo.SJEtherNetCmd">
             <summary>
             
@@ -9442,6 +9341,11 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="P:SCADA.Drive.RegInfo.IsUserDefined">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="M:SCADA.Drive.RegInfo.OnCustomEventTrigger(SCADA.Drive.RegCustomerEventTriggerEventArgs)">
             <summary>
             
@@ -23985,6 +23889,22 @@
             <param name="encoding">编码方式,默认使用UTF8</param>
             <returns></returns>
         </member>
+        <member name="M:SCADA.Drive.TagExtersion.IntToAddr(System.Int32,SCADA.AddressType)">
+            <summary>
+            
+            </summary>
+            <param name="addr"></param>
+            <param name="addressType"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.Drive.TagExtersion.IntToAddr(System.Int32,SCADA.RegArea)">
+            <summary>
+            
+            </summary>
+            <param name="addr"></param>
+            <param name="regArea"></param>
+            <returns></returns>
+        </member>
         <member name="M:SCADA.Drive.TagExtersion.SplitRegNames(System.String)">
             <summary>
             分割寄存器分组
@@ -31433,25 +31353,6 @@
             <param name="params"></param>
             <returns></returns>
         </member>
-        <member name="T:SCADA.Instrument.ChangChuang.CC7110">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.Instrument.ChangChuang.CC7110.#ctor(SCADA.Comm.IComm,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="comm"></param>
-            <param name="address"></param>
-        </member>
-        <member name="M:SCADA.Instrument.ChangChuang.CC7110.Comm_DataReceived(System.Object,SCADA.Comm.DataReceivedEventArg)">
-            <summary>
-            
-            </summary>
-            <param name="sender"></param>
-            <param name="e"></param>
-        </member>
         <member name="T:SCADA.Instrument.InstrumentParaReceivedEventArgs">
             <summary>
             
@@ -31930,64 +31831,6 @@
             圈数
             </summary>
         </member>
-        <member name="T:SCADA.Instrument.OMKQN.YG110A">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.Instrument.OMKQN.YG110A.#ctor(SCADA.Comm.IComm,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="comm"></param>
-            <param name="address"></param>
-        </member>
-        <member name="M:SCADA.Instrument.OMKQN.YG110A.Comm_DataReceived(System.Object,SCADA.Comm.DataReceivedEventArg)">
-            <summary>
-            
-            </summary>
-            <param name="sender"></param>
-            <param name="e"></param>
-        </member>
-        <member name="T:SCADA.Instrument.OMKQN.YG211S">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.Instrument.OMKQN.YG211S.#ctor(SCADA.Comm.IComm,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="comm"></param>
-            <param name="address"></param>
-        </member>
-        <member name="M:SCADA.Instrument.OMKQN.YG211S.#ctor(SCADA.Comm.IComm,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="comm"></param>
-            <param name="address"></param>
-        </member>
-        <member name="M:SCADA.Instrument.OMKQN.YG211S.Comm_DataReceived(System.Object,SCADA.Comm.DataReceivedEventArg)">
-            <summary>
-            
-            </summary>
-            <param name="sender"></param>
-            <param name="e"></param>
-        </member>
-        <member name="M:SCADA.Instrument.OMKQN.YG211S.OnParaReceived``1(``0)">
-            <summary>
-            
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="parameter"></param>
-        </member>
-        <member name="M:SCADA.Instrument.OMKQN.YG211S.Start(SCADA.Instrument.InstrumentRequestPara)">
-            <summary>
-            
-            </summary>
-            <param name="para"></param>
-        </member>
         <member name="T:SCADA.Instrument.OMKQN.YG211SResultResponse">
             <summary>
             YG211S 设备响应
@@ -34025,6 +33868,11 @@
             负脉冲
             </summary>
         </member>
+        <member name="T:SCADA.RealDevcie">
+            <summary>
+            实物设备
+            </summary>
+        </member>
         <member name="T:SCADA.RegArea">
             <summary>
             寄存器信息
@@ -36557,6 +36405,11 @@
             最后扫描时间
             </summary>
         </member>
+        <member name="T:SCADA.VirtualDevice">
+            <summary>
+            虚拟设备
+            </summary>
+        </member>
         <member name="T:SCADA.XmlHelper">
             <summary>
             Xml序列化

SCADA_DAQ/App.xaml

@@ -221,9 +221,6 @@
             <Style TargetType="{x:Type wpf:Card}"
                    BasedOn="{StaticResource BaseControl}"/>
             
-            <Style TargetType="{x:Type scadaui:RegViewPanelGroup}"
-                   BasedOn="{StaticResource BaseControl}"/>
-
             <Style TargetType="{x:Type wpf:BaseUserControl}"
                    BasedOn="{StaticResource BaseControl}"/>
         </ResourceDictionary>