diff --git a/Common/.vs/Common/config/applicationhost.config b/Common/.vs/Common/config/applicationhost.config index 8f2db308..5616ab8b 100644 --- a/Common/.vs/Common/config/applicationhost.config +++ b/Common/.vs/Common/config/applicationhost.config @@ -171,7 +171,7 @@ - + diff --git a/Common/CommonCore.Configuration/ServiceUrls.cs b/Common/CommonCore.Configuration/ServiceUrls.cs index 27e0834c..76eae864 100644 --- a/Common/CommonCore.Configuration/ServiceUrls.cs +++ b/Common/CommonCore.Configuration/ServiceUrls.cs @@ -7,7 +7,7 @@ namespace Xylem.Common.CommonCore.Configuration /// /// Urls for data base accesses /// - public static class ServiceUrls + public static class ServiceUrls_oldBackup { diff --git a/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs b/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs index c943e33c..829cf82f 100644 --- a/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs +++ b/Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs @@ -7,7 +7,7 @@ namespace Xylem.Common.CommonCore.Configuration /// /// Urls for data base accesses /// - public static class ServiceUrls_NewBack + public static class ServiceUrls { #if URI_OLD_DNS // this is defined in build configuration 'VPN_Debug' as the new DNS cannot be reached via VPN private const String ServerDns = "http://sla12iis01.emea.sensus.net"; diff --git a/Common/CordonelPreadjustmentUi/Processes/Actions/PreparationProcess.cs b/Common/CordonelPreadjustmentUi/Processes/Actions/PreparationProcess.cs index d4cfd4b3..4a006fe9 100644 --- a/Common/CordonelPreadjustmentUi/Processes/Actions/PreparationProcess.cs +++ b/Common/CordonelPreadjustmentUi/Processes/Actions/PreparationProcess.cs @@ -7,10 +7,10 @@ using CordonelPreadjustmentUi.Processes.Itinerary; using System.Threading; using static CordonelPreadjustmentUi.PreAdjustmentControl; using System.Threading.Tasks; -using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; using Xylem.Common.Logic.SoftwareAccessHelper; using Xylem.Common.CommonCore.Configuration; using Newtonsoft.Json; +using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; namespace CordonelPreadjustmentUi.Processes.Actions { diff --git a/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPPreparationProcess.cs b/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPPreparationProcess.cs index b8e7991e..9d26719c 100644 --- a/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPPreparationProcess.cs +++ b/Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPPreparationProcess.cs @@ -7,10 +7,11 @@ using CordonelPreadjustmentUi.Processes.Itinerary; using System.Threading; using static CordonelPreadjustmentUi.PreAdjustmentControl; using System.Threading.Tasks; -using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; + using Xylem.Common.Logic.SoftwareAccessHelper; using Xylem.Common.CommonCore.Configuration; using Newtonsoft.Json; +using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; namespace CordonelPreadjustmentUi.Processes.Actions { diff --git a/Common/Service/MeterProcessState/Controllers/LUControler.cs b/Common/Service/MeterProcessState/Controllers/LUControler.cs index 5baaa6b9..83c8b323 100644 --- a/Common/Service/MeterProcessState/Controllers/LUControler.cs +++ b/Common/Service/MeterProcessState/Controllers/LUControler.cs @@ -14,7 +14,6 @@ using System.Text; using System.Threading.Tasks; using System.Web.Helpers; using System.Web.Http; -using Xylem.Common.Hardware.WaterMeter.Genesis.Registers.Json; using Xylem.Common.Logic.ServiceCore; diff --git a/Common/Service/MeterProcessState/MeterProcessState.csproj b/Common/Service/MeterProcessState/MeterProcessState.csproj index 2db1ad07..a35b9fa9 100644 --- a/Common/Service/MeterProcessState/MeterProcessState.csproj +++ b/Common/Service/MeterProcessState/MeterProcessState.csproj @@ -453,10 +453,6 @@ {0f646872-d8dc-4ee5-989f-d4c73f0ace3f} GenesisStatus - - {F4AAF7E6-7333-4284-B735-E32DEB076C64} - Registers - {8203ABB8-38E5-472E-A742-33F38B7A74A6} WaterMeterCore diff --git a/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs b/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs index b7c347ed..aee21245 100644 --- a/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs +++ b/Common/Ui/GenesisToolBox/FrmLowLevelTools.cs @@ -352,46 +352,46 @@ namespace Xylem.Common.Ui.GenesisToolBox } else if (_currentGenesis.Region.Equals("NA")) { - // var url = ServiceUrls.GetExportDataServiceUrl(); - // var retStr = LocalWebRequest.GetRequestWithError(url + _currentGenesis.PcbId, out var errorCode, 30000); - // if (errorCode == HttpStatusCode.OK.GetHashCode()) - // { - // var retExport = JsonConvert.DeserializeObject>(retStr); - // if (retExport.Count == 0) - // { - // sb.AppendLine(@"Export entry hasn't been found [E1]"); - // //request - // sb.AppendLine(@"Export returns no password [E2]"); - // } - // else - // { - // if (retExport.Count == 1) - // { - // sb.AppendLine(@"Found export entry"); - // } - // else - // { - // sb.AppendLine(@"More than one export entry was found [E4]"); - // } + var url = ServiceUrls.GetExportDataServiceUrl(); + var retStr = LocalWebRequest.GetRequestWithError(url + _currentGenesis.PcbId, out var errorCode, 30000); + if (errorCode == HttpStatusCode.OK.GetHashCode()) + { + var retExport = JsonConvert.DeserializeObject>(retStr); + if (retExport.Count == 0) + { + sb.AppendLine(@"Export entry hasn't been found [E1]"); + //request + sb.AppendLine(@"Export returns no password [E2]"); + } + else + { + if (retExport.Count == 1) + { + sb.AppendLine(@"Found export entry"); + } + else + { + sb.AppendLine(@"More than one export entry was found [E4]"); + } - // foreach (var item in retExport) - // { - // if (item.PWD == pwdContainer.Password) - // { - // sb.AppendLine($"{item.ID} is Password LVL 8"); - // } - // else if (item.PWD == pwdContainer.Skeleton) - // { - // sb.AppendLine($"{item.ID} is Skeleton [E3]"); - // } - // else - // { - // sb.AppendLine($"{item.ID} is not LVL 8 or Skeleton [E3]"); - // } - // } - // } - // } - //} + foreach (var item in retExport) + { + if (item.PWD == pwdContainer.Password) + { + sb.AppendLine($"{item.ID} is Password LVL 8"); + } + else if (item.PWD == pwdContainer.Skeleton) + { + sb.AppendLine($"{item.ID} is Skeleton [E3]"); + } + else + { + sb.AppendLine($"{item.ID} is not LVL 8 or Skeleton [E3]"); + } + } + } + } + } MessageBox.Show(sb.ToString()); }// use skeletonKey diff --git a/Common/Ui/GenesisToolBox/GenesisToolBox.csproj b/Common/Ui/GenesisToolBox/GenesisToolBox.csproj index 0fb8536a..60f3aa44 100644 --- a/Common/Ui/GenesisToolBox/GenesisToolBox.csproj +++ b/Common/Ui/GenesisToolBox/GenesisToolBox.csproj @@ -748,7 +748,7 @@ StreamingProtocol - {f4aaf7e6-7333-4284-b735-e32deb076c64} + {F4AAF7E6-7333-4284-B735-E32DEB076C64} Registers diff --git a/Common/Ui/IrdaDemo/IrdaDemo.csproj b/Common/Ui/IrdaDemo/IrdaDemo.csproj index d676ffa9..3408be46 100644 --- a/Common/Ui/IrdaDemo/IrdaDemo.csproj +++ b/Common/Ui/IrdaDemo/IrdaDemo.csproj @@ -138,10 +138,6 @@ {04201E95-90A0-4B73-A72F-379739B2A3AE} GenesisCore - - {F4AAF7E6-7333-4284-B735-E32DEB076C64} - Registers - {8203ABB8-38E5-472E-A742-33F38B7A74A6} WaterMeterCore diff --git a/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj b/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj index ec3f4195..8036f8a7 100644 --- a/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj +++ b/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj @@ -140,10 +140,6 @@ {AC434B18-4D7B-49BA-9AD5-0527C79E8297} GenesisPwd - - {F4AAF7E6-7333-4284-B735-E32DEB076C64} - Registers - {d0c859d9-d55e-4e85-ac50-0ff31b1ce50d} Logic.ProductionToProductMapper diff --git a/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj b/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj index e80867c7..2f22e469 100644 --- a/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj +++ b/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj @@ -128,10 +128,6 @@ {2C6378C6-6BA1-4CEE-8992-8404D8369A90} GenesisFile - - {F4AAF7E6-7333-4284-B735-E32DEB076C64} - Registers - {d0c859d9-d55e-4e85-ac50-0ff31b1ce50d} Logic.ProductionToProductMapper