Merge branch 'master' of http://imaodou.com.cn:30030/c_jack/EICP3.0_69

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>
             参数在文件中的保存位置
@@ -6422,96 +6409,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>
             
@@ -7003,42 +6900,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>
             控制蜂鸣器
@@ -7336,39 +7197,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>
             
@@ -8254,13 +8082,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反序列化
@@ -8298,6 +8119,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
@@ -9189,19 +9017,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>
             自动匹配执行参数
@@ -11683,11 +11498,6 @@
             
             </summary>
         </member>
-        <member name="P:SCADA.CommonLib.Context.HttpContext">
-            <summary>
-            Http 上下文
-            </summary>
-        </member>
         <member name="T:SCADA.CommonLib.RpcPara">
             <summary>
             远程调用参数

SCADA_DAQ/App.config

@@ -19,14 +19,6 @@
         <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Xceed.Wpf.AvalonDock" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.1.0.0" />
@@ -66,12 +58,6 @@
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-    </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />