marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Roland Drabesch
2025-10-15 15:55:37 +02:00
parent e6801bb115
commit 58713d7b54
12 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.vs/Common/config/applicationhost.config
+1 -1
View File
@@ -171,7 +171,7 @@
</site> </site>
<site name="MeterProcessState(2)" id="4"> <site name="MeterProcessState(2)" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\LAA_PRODUCTION\Common\Service\MeterProcessState" /> <virtualDirectory path="/" physicalPath="E:\REPO\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:50075:localhost" /> <binding protocol="http" bindingInformation="*:50075:localhost" />
Common/CommonCore.Configuration/ServiceUrls.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Xylem.Common.CommonCore.Configuration
/// <summary> /// <summary>
/// Urls for data base accesses /// Urls for data base accesses
/// </summary> /// </summary>
public static class ServiceUrls public static class ServiceUrls_oldBackup
{ {
Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Xylem.Common.CommonCore.Configuration
/// <summary> /// <summary>
/// Urls for data base accesses /// Urls for data base accesses
/// </summary> /// </summary>
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 #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"; private const String ServerDns = "http://sla12iis01.emea.sensus.net";
Common/CordonelPreadjustmentUi/Processes/Actions/PreparationProcess.cs
+1 -1
View File
@@ -7,10 +7,10 @@ using CordonelPreadjustmentUi.Processes.Itinerary;
using System.Threading; using System.Threading;
using static CordonelPreadjustmentUi.PreAdjustmentControl; using static CordonelPreadjustmentUi.PreAdjustmentControl;
using System.Threading.Tasks; using System.Threading.Tasks;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.SoftwareAccessHelper; using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.CommonCore.Configuration; using Xylem.Common.CommonCore.Configuration;
using Newtonsoft.Json; using Newtonsoft.Json;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
namespace CordonelPreadjustmentUi.Processes.Actions namespace CordonelPreadjustmentUi.Processes.Actions
{ {
Common/CordonelPreadjustmentUi/Processes/ActionsSinglePath/SPPreparationProcess.cs
+2 -1
View File
@@ -7,10 +7,11 @@ using CordonelPreadjustmentUi.Processes.Itinerary;
using System.Threading; using System.Threading;
using static CordonelPreadjustmentUi.PreAdjustmentControl; using static CordonelPreadjustmentUi.PreAdjustmentControl;
using System.Threading.Tasks; using System.Threading.Tasks;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.SoftwareAccessHelper; using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.CommonCore.Configuration; using Xylem.Common.CommonCore.Configuration;
using Newtonsoft.Json; using Newtonsoft.Json;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
namespace CordonelPreadjustmentUi.Processes.Actions namespace CordonelPreadjustmentUi.Processes.Actions
{ {
Common/Service/MeterProcessState/Controllers/LUControler.cs
-1
View File
@@ -14,7 +14,6 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web.Helpers; using System.Web.Helpers;
using System.Web.Http; using System.Web.Http;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers.Json;
using Xylem.Common.Logic.ServiceCore; using Xylem.Common.Logic.ServiceCore;
Common/Service/MeterProcessState/MeterProcessState.csproj
-4
View File
@@ -453,10 +453,6 @@
<Project>{0f646872-d8dc-4ee5-989f-d4c73f0ace3f}</Project> <Project>{0f646872-d8dc-4ee5-989f-d4c73f0ace3f}</Project>
<Name>GenesisStatus</Name> <Name>GenesisStatus</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj"> <ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">
<Project>{8203ABB8-38E5-472E-A742-33F38B7A74A6}</Project> <Project>{8203ABB8-38E5-472E-A742-33F38B7A74A6}</Project>
<Name>WaterMeterCore</Name> <Name>WaterMeterCore</Name>
Common/Ui/GenesisToolBox/FrmLowLevelTools.cs
+39 -39
View File
@@ -352,46 +352,46 @@ namespace Xylem.Common.Ui.GenesisToolBox
} }
else if (_currentGenesis.Region.Equals("NA")) else if (_currentGenesis.Region.Equals("NA"))
{ {
// var url = ServiceUrls.GetExportDataServiceUrl(); var url = ServiceUrls.GetExportDataServiceUrl();
// var retStr = LocalWebRequest.GetRequestWithError(url + _currentGenesis.PcbId, out var errorCode, 30000); var retStr = LocalWebRequest.GetRequestWithError(url + _currentGenesis.PcbId, out var errorCode, 30000);
// if (errorCode == HttpStatusCode.OK.GetHashCode()) if (errorCode == HttpStatusCode.OK.GetHashCode())
// { {
// var retExport = JsonConvert.DeserializeObject<List<PwdExport>>(retStr); var retExport = JsonConvert.DeserializeObject<List<PwdExport>>(retStr);
// if (retExport.Count == 0) if (retExport.Count == 0)
// { {
// sb.AppendLine(@"Export entry hasn't been found [E1]"); sb.AppendLine(@"Export entry hasn't been found [E1]");
// //request //request
// sb.AppendLine(@"Export returns no password [E2]"); sb.AppendLine(@"Export returns no password [E2]");
// } }
// else else
// { {
// if (retExport.Count == 1) if (retExport.Count == 1)
// { {
// sb.AppendLine(@"Found export entry"); sb.AppendLine(@"Found export entry");
// } }
// else else
// { {
// sb.AppendLine(@"More than one export entry was found [E4]"); sb.AppendLine(@"More than one export entry was found [E4]");
// } }
// foreach (var item in retExport) foreach (var item in retExport)
// { {
// if (item.PWD == pwdContainer.Password) if (item.PWD == pwdContainer.Password)
// { {
// sb.AppendLine($"{item.ID} is Password LVL 8"); sb.AppendLine($"{item.ID} is Password LVL 8");
// } }
// else if (item.PWD == pwdContainer.Skeleton) else if (item.PWD == pwdContainer.Skeleton)
// { {
// sb.AppendLine($"{item.ID} is Skeleton [E3]"); sb.AppendLine($"{item.ID} is Skeleton [E3]");
// } }
// else else
// { {
// sb.AppendLine($"{item.ID} is not LVL 8 or Skeleton [E3]"); sb.AppendLine($"{item.ID} is not LVL 8 or Skeleton [E3]");
// } }
// } }
// } }
// } }
//} }
MessageBox.Show(sb.ToString()); MessageBox.Show(sb.ToString());
}// use skeletonKey }// use skeletonKey
Common/Ui/GenesisToolBox/GenesisToolBox.csproj
+1 -1
View File
@@ -748,7 +748,7 @@
<Name>StreamingProtocol</Name> <Name>StreamingProtocol</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj"> <ProjectReference Include="..\..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{f4aaf7e6-7333-4284-b735-e32deb076c64}</Project> <Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name> <Name>Registers</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj"> <ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">
Common/Ui/IrdaDemo/IrdaDemo.csproj
-4
View File
@@ -138,10 +138,6 @@
<Project>{04201E95-90A0-4B73-A72F-379739B2A3AE}</Project> <Project>{04201E95-90A0-4B73-A72F-379739B2A3AE}</Project>
<Name>GenesisCore</Name> <Name>GenesisCore</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj"> <ProjectReference Include="..\..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">
<Project>{8203ABB8-38E5-472E-A742-33F38B7A74A6}</Project> <Project>{8203ABB8-38E5-472E-A742-33F38B7A74A6}</Project>
<Name>WaterMeterCore</Name> <Name>WaterMeterCore</Name>
ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj
-4
View File
@@ -140,10 +140,6 @@
<Project>{AC434B18-4D7B-49BA-9AD5-0527C79E8297}</Project> <Project>{AC434B18-4D7B-49BA-9AD5-0527C79E8297}</Project>
<Name>GenesisPwd</Name> <Name>GenesisPwd</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Common\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Logic.PrdoctionToProductMapper\Logic.ProductionToProductMapper.csproj"> <ProjectReference Include="..\..\..\Common\Logic.PrdoctionToProductMapper\Logic.ProductionToProductMapper.csproj">
<Project>{d0c859d9-d55e-4e85-ac50-0ff31b1ce50d}</Project> <Project>{d0c859d9-d55e-4e85-ac50-0ff31b1ce50d}</Project>
<Name>Logic.ProductionToProductMapper</Name> <Name>Logic.ProductionToProductMapper</Name>
ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj
-4
View File
@@ -128,10 +128,6 @@
<Project>{2C6378C6-6BA1-4CEE-8992-8404D8369A90}</Project> <Project>{2C6378C6-6BA1-4CEE-8992-8404D8369A90}</Project>
<Name>GenesisFile</Name> <Name>GenesisFile</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Common\Hardware\WaterMeter\Genesis\Registers\Registers.csproj">
<Project>{F4AAF7E6-7333-4284-B735-E32DEB076C64}</Project>
<Name>Registers</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Logic.PrdoctionToProductMapper\Logic.ProductionToProductMapper.csproj"> <ProjectReference Include="..\..\..\Common\Logic.PrdoctionToProductMapper\Logic.ProductionToProductMapper.csproj">
<Project>{d0c859d9-d55e-4e85-ac50-0ff31b1ce50d}</Project> <Project>{d0c859d9-d55e-4e85-ac50-0ff31b1ce50d}</Project>
<Name>Logic.ProductionToProductMapper</Name> <Name>Logic.ProductionToProductMapper</Name>