From 48454483734d1c7f71fb074719ea47d10114c52f Mon Sep 17 00:00:00 2001 From: fyf Date: Fri, 21 Oct 2022 16:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=AF=E8=A7=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BPASmartClient.DATABUS.csproj | 9 ------ .../BPASmartClient.SCADAControl.csproj | 1 - .../CustomerControls/Silos.xaml.cs | 1 - .../CustomerControls/SwitchButton.cs | 1 - .../CustomerControls/TheAPI.xaml.cs | 2 +- .../CustomerControls/TheButton.xaml.cs | 2 +- .../CustomerControls/TheCheckBox.xaml.cs | 2 +- .../CustomerControls/TheCylinder.xaml.cs | 2 +- .../CustomerControls/TheDataGrid.xaml.cs | 2 +- .../CustomerControls/TheListBox.xaml.cs | 2 +- .../CustomerControls/TheMQTT.xaml.cs | 2 +- .../CustomerControls/TheRedis.xaml.cs | 2 +- .../CustomerControls/TheTextBlock.cs | 2 +- .../CustomerControls/TheTextBox.cs | 2 +- .../CustomerControls/TheToggleButton.xaml.cs | 2 +- .../CustomerControls/TheWuLiaoControl.xaml.cs | 2 +- .../DATABUS}/Class_DataBus.cs | 22 +++++++++---- BeDesignerSCADA/BeDesignerSCADA.csproj | 2 -- .../Controls/CanvasPanelNew.xaml.cs | 1 - .../Controls/MainCanvasPanel.xaml.cs | 1 - BeDesignerSCADA/Helper/SystemHelper.cs | 14 ++++---- SmartClient.sln | 32 ++----------------- 22 files changed, 37 insertions(+), 71 deletions(-) delete mode 100644 BPASmartClient.DATABUS/BPASmartClient.DATABUS.csproj rename {BPASmartClient.DATABUS => BPASmartClient.SCADAControl/DATABUS}/Class_DataBus.cs (69%) diff --git a/BPASmartClient.DATABUS/BPASmartClient.DATABUS.csproj b/BPASmartClient.DATABUS/BPASmartClient.DATABUS.csproj deleted file mode 100644 index 132c02c5..00000000 --- a/BPASmartClient.DATABUS/BPASmartClient.DATABUS.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - net6.0 - enable - enable - - - diff --git a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj index 4fd8fe4e..2c7b15a9 100644 --- a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj +++ b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj @@ -92,7 +92,6 @@ - diff --git a/BPASmartClient.SCADAControl/CustomerControls/Silos.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/Silos.xaml.cs index a287087e..285345d9 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/Silos.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/Silos.xaml.cs @@ -1,5 +1,4 @@ using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; using Newtonsoft.Json; using System; using System.Collections; diff --git a/BPASmartClient.SCADAControl/CustomerControls/SwitchButton.cs b/BPASmartClient.SCADAControl/CustomerControls/SwitchButton.cs index aaf874e6..8550a017 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/SwitchButton.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/SwitchButton.cs @@ -1,6 +1,5 @@ using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; using Newtonsoft.Json; using System; using System.Collections.Generic; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheAPI.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheAPI.xaml.cs index 62e9c41b..cc40df81 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheAPI.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheAPI.xaml.cs @@ -1,6 +1,6 @@ using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl; using BPASmartClient.SCADAControl.EnumClass; using Newtonsoft.Json; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheButton.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheButton.xaml.cs index 3b08cec5..3ae26d08 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheButton.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheButton.xaml.cs @@ -1,5 +1,5 @@ using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs index 9896f911..b592039c 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs @@ -1,6 +1,6 @@ using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl; using Newtonsoft.Json; using System; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheCylinder.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheCylinder.xaml.cs index 6d127154..b90da1c6 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheCylinder.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheCylinder.xaml.cs @@ -1,5 +1,5 @@ using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using System; using System.Collections.Generic; using System.Linq; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheDataGrid.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheDataGrid.xaml.cs index 2d469710..84a36784 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheDataGrid.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheDataGrid.xaml.cs @@ -1,5 +1,5 @@ using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl.Converters; using BPASmartClient.SCADAControl.EnumClass; using Newtonsoft.Json; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheListBox.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheListBox.xaml.cs index 74438559..97bd436a 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheListBox.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheListBox.xaml.cs @@ -1,5 +1,5 @@ using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl.Converters; using BPASmartClient.SCADAControl.EnumClass; using Newtonsoft.Json; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheMQTT.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheMQTT.xaml.cs index 37152e1c..2029b74d 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheMQTT.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheMQTT.xaml.cs @@ -1,6 +1,6 @@ using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl; using Newtonsoft.Json; using StackExchange.Redis; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheRedis.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheRedis.xaml.cs index a2214fe5..32449edc 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheRedis.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheRedis.xaml.cs @@ -1,6 +1,6 @@ using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl; using Newtonsoft.Json; using StackExchange.Redis; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs b/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs index 5d07439f..6f25ef93 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs @@ -1,5 +1,5 @@ using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl; using Newtonsoft.Json; using System; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs b/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs index d5068762..99c26dd5 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs @@ -1,6 +1,6 @@ using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl; using Newtonsoft.Json; using System; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheToggleButton.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheToggleButton.xaml.cs index ccfedf69..15a514b5 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheToggleButton.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheToggleButton.xaml.cs @@ -1,6 +1,6 @@ using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using BPASmartClient.SCADAControl; using Newtonsoft.Json; using System; diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheWuLiaoControl.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheWuLiaoControl.xaml.cs index e83c2318..bc0399e4 100644 --- a/BPASmartClient.SCADAControl/CustomerControls/TheWuLiaoControl.xaml.cs +++ b/BPASmartClient.SCADAControl/CustomerControls/TheWuLiaoControl.xaml.cs @@ -1,5 +1,5 @@ using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; + using Newtonsoft.Json; using System; using System.Collections; diff --git a/BPASmartClient.DATABUS/Class_DataBus.cs b/BPASmartClient.SCADAControl/DATABUS/Class_DataBus.cs similarity index 69% rename from BPASmartClient.DATABUS/Class_DataBus.cs rename to BPASmartClient.SCADAControl/DATABUS/Class_DataBus.cs index 9278865b..e96275e0 100644 --- a/BPASmartClient.DATABUS/Class_DataBus.cs +++ b/BPASmartClient.SCADAControl/DATABUS/Class_DataBus.cs @@ -1,6 +1,11 @@ -using System.Collections.Concurrent; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace BPASmartClient.DATABUS +namespace BPASmartClient.SCADAControl { /// /// 数据总线 @@ -29,10 +34,14 @@ namespace BPASmartClient.DATABUS /// /// 绑定数据 /// - public Dictionary Dic_RedisDataBinding=new Dictionary(); + public Dictionary Dic_RedisDataBinding = new Dictionary(); + /// + /// 刷新数据 + /// + /// public void refreshDataAction(string Name) { - BindingAction?.Invoke(Name,null); + BindingAction?.Invoke(Name, null); } /// /// 缓存Redis数据 @@ -42,15 +51,14 @@ namespace BPASmartClient.DATABUS /// 缓存Redis数据相关类型 /// public ConcurrentDictionary> Dic_RedisDataType = new ConcurrentDictionary>(); - /// /// API数据 /// - public ConcurrentDictionary Dic_APIData = new ConcurrentDictionary(); + public ConcurrentDictionary Dic_APIData = new ConcurrentDictionary(); #endregion #region 配置数据 #endregion } -} \ No newline at end of file +} diff --git a/BeDesignerSCADA/BeDesignerSCADA.csproj b/BeDesignerSCADA/BeDesignerSCADA.csproj index 8b480328..558cd109 100644 --- a/BeDesignerSCADA/BeDesignerSCADA.csproj +++ b/BeDesignerSCADA/BeDesignerSCADA.csproj @@ -91,7 +91,6 @@ - @@ -125,7 +124,6 @@ - diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs index cf552687..add8f814 100644 --- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs +++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs @@ -4,7 +4,6 @@ using Newtonsoft.Json; using BeDesignerSCADA.ViewModel; using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs index 3bee9c26..76c1476f 100644 --- a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs +++ b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml.cs @@ -3,7 +3,6 @@ using BeDesignerSCADA.View; using BeDesignerSCADA.ViewModel; using BPASmart.Model; using BPASmartClient.Compiler; -using BPASmartClient.DATABUS; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/BeDesignerSCADA/Helper/SystemHelper.cs b/BeDesignerSCADA/Helper/SystemHelper.cs index b8466704..3a20c467 100644 --- a/BeDesignerSCADA/Helper/SystemHelper.cs +++ b/BeDesignerSCADA/Helper/SystemHelper.cs @@ -259,7 +259,7 @@ namespace BeDesignerSCADA.Helper for (int i = 0; i < strChinese.Length; i++) { var chr = strChinese[i]; - fullSpell.Append(GetSpell(chr)); + //fullSpell.Append(GetSpell(chr)); } return fullSpell.ToString().ToUpper(); } @@ -286,7 +286,7 @@ namespace BeDesignerSCADA.Helper for (int i = 0; i < strChinese.Length; i++) { var chr = strChinese[i]; - fullSpell.Append(GetSpell(chr)[0]); + //fullSpell.Append(GetSpell(chr)[0]); } return fullSpell.ToString().ToUpper(); } @@ -299,11 +299,11 @@ namespace BeDesignerSCADA.Helper return string.Empty; } - private static string GetSpell(char chr) - { - var coverchr = NPinyin.Pinyin.GetPinyin(chr); - return coverchr; - } + //private static string GetSpell(char chr) + //{ + // var coverchr = NPinyin.Pinyin.GetPinyin(chr); + // return coverchr; + //} } [StructLayout(LayoutKind.Sequential)] diff --git a/SmartClient.sln b/SmartClient.sln index fd280f95..720ca8d9 100644 --- a/SmartClient.sln +++ b/SmartClient.sln @@ -136,13 +136,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPFDemo", "WPFDemo\WPFDemo. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.SCADA", "0.SCADA", "{7B0175AD-BB74-4A98-B9A7-1E289032485E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DATABUS", "BPASmartClient.DATABUS\BPASmartClient.DATABUS.csproj", "{7C1AF86E-867C-427E-90DB-6473D88F51EB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.SCADAControl", "BPASmartClient.SCADAControl\BPASmartClient.SCADAControl.csproj", "{6A3FC66D-0B89-45E8-B39B-9D81538002D1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.可视化内存数据", "1.可视化内存数据", "{7BED8969-7EA7-409C-8BBC-D2777ECDA2F1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.可视化控件集", "2.可视化控件集", "{5300552F-560D-474A-8D96-0A2747D08F64}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "可视化控件集", "可视化控件集", "{5300552F-560D-474A-8D96-0A2747D08F64}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.VariableManager", "BPASmart.VariableManager\BPASmart.VariableManager.csproj", "{2C17B9A9-B27B-4F07-AFB0-0F56A975D501}" EndProject @@ -156,7 +152,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.Server", "BPASmart EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputerTestDemo", "ComputerTestDemo\ComputerTestDemo.csproj", "{8940F1E2-693D-407E-AD03-722718860609}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.可视化配置工具", "3.可视化配置工具", "{06F0B369-0483-46DD-82D2-70431FB505C1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "可视化配置工具", "可视化配置工具", "{06F0B369-0483-46DD-82D2-70431FB505C1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeDesignerSCADA", "BeDesignerSCADA\BeDesignerSCADA.csproj", "{DF8B4C38-39DE-4220-AB60-885CAE6D1E47}" EndProject @@ -180,7 +176,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMOC", "B EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.DosingHKProject", "BPASmartClient.DosingProject\BPASmartClient.DosingHKProject.csproj", "{6763F73A-555C-41E2-91F7-ADF26C59A946}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmart.MenuLoad", "BPASmart.MenuLoad\BPASmart.MenuLoad.csproj", "{7A7547D3-F2EF-4DA4-AD45-D1B49210082B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.MenuLoad", "BPASmart.MenuLoad\BPASmart.MenuLoad.csproj", "{7A7547D3-F2EF-4DA4-AD45-D1B49210082B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1336,26 +1332,6 @@ Global {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x64.Build.0 = Release|Any CPU {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x86.ActiveCfg = Release|Any CPU {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x86.Build.0 = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|ARM.Build.0 = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|ARM64.Build.0 = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|x64.ActiveCfg = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|x64.Build.0 = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|x86.ActiveCfg = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Debug|x86.Build.0 = Debug|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|Any CPU.Build.0 = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|ARM.ActiveCfg = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|ARM.Build.0 = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|ARM64.ActiveCfg = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|ARM64.Build.0 = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|x64.ActiveCfg = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|x64.Build.0 = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|x86.ActiveCfg = Release|Any CPU - {7C1AF86E-867C-427E-90DB-6473D88F51EB}.Release|x86.Build.0 = Release|Any CPU {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -1778,9 +1754,7 @@ Global {FA695D7E-6F12-4483-A16D-8494609FAE68} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {D609C4CF-FA5C-4D39-B12F-07A60FFE5E40} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {A456D582-D910-4CA2-8620-6D8F63344B47} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} - {7C1AF86E-867C-427E-90DB-6473D88F51EB} = {7BED8969-7EA7-409C-8BBC-D2777ECDA2F1} {6A3FC66D-0B89-45E8-B39B-9D81538002D1} = {5300552F-560D-474A-8D96-0A2747D08F64} - {7BED8969-7EA7-409C-8BBC-D2777ECDA2F1} = {7B0175AD-BB74-4A98-B9A7-1E289032485E} {5300552F-560D-474A-8D96-0A2747D08F64} = {7B0175AD-BB74-4A98-B9A7-1E289032485E} {2C17B9A9-B27B-4F07-AFB0-0F56A975D501} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} {00C5B45D-9799-43F1-B07B-9F638AA9FF72} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086}