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

switsch urls

Browse Source
This commit is contained in:
Roland Drabesch 2025-10-14 16:06:40 +02:00
parent e025470341
commit ec42f6f640
10 changed files with 23740 additions and 23407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Common/CommonCore.Configuration/ServiceUrls.cs
View File

@ -7,7 +7,7 @@ namespace Xylem.Common.CommonCore.Configuration
/// <summary>
/// Urls for data base accesses
/// </summary>
public static class ServiceUrls_old
public static class ServiceUrls
{
@ -832,6 +832,21 @@ namespace Xylem.Common.CommonCore.Configuration
{
throw new NotImplementedException();
}
public static String GetOrderOverviewServiceUrl()
{
throw new NotImplementedException();
}
public static String GetCordonelMappingServiceUrl()
{
throw new NotImplementedException();
}
public static String GenesisSetPickingStateServiceUrl()
{
throw new NotImplementedException();
}
}

2
Common/CommonCore.Configuration/ServiceUrlsBackUp_New.cs
View File

@ -7,7 +7,7 @@ namespace Xylem.Common.CommonCore.Configuration
/// <summary>
/// Urls for data base accesses
/// </summary>
public static class ServiceUrls
public static class ServiceUrls_NewBack
{
#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";

1
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisConfigReader.cs
View File

@ -211,6 +211,7 @@
case "uint72_t": return typeof(UInt72);
case "uint48_t": return typeof(UInt48);
case "uint88_t": return typeof(UInt88);
case "uint672_t": return typeof(UInt672);
default: throw new Exception($"Type {value} not recognized!");
}
}

47018
Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json
View File

File diff suppressed because it is too large Load Diff

8
Common/Hardware/WaterMeter/Genesis/Registers/DataTypes/UInt672.cs Normal file
View File

@ -0,0 +1,8 @@
using System;
namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers.DataTypes
{
public struct UInt672
{
}
}

18
Common/Hardware/WaterMeter/Genesis/Registers/RegisterConverter.cs
View File

@ -104,7 +104,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers
registerDefinition.DataType != typeof(UInt72) &&
registerDefinition.DataType != typeof(UInt88) &&
registerDefinition.DataType != typeof(UInt96) &&
registerDefinition.DataType != typeof(UInt128))
registerDefinition.DataType != typeof(UInt128) &&
registerDefinition.DataType != typeof(UInt672))
{
tmpList.Reverse();
}
@ -321,6 +322,12 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers
size = 4 * 4;
}
else if (registerDefinition.DataType == typeof(UInt672))
{
// 672 Bits / 8 Bits/Byte
size = 56;
}
else if (registerDefinition.DataType == typeof(String))
{
// just some value
@ -397,6 +404,10 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers
{
return "";
}
if (type == typeof(UInt672))
{
return "";
}
if (type == typeof(UInt96))
{
return "";
@ -471,6 +482,11 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers
{
return default(T);
}
if (type == typeof(UInt672))
{
return default(T);
}
if (type == typeof(Byte) || type == typeof(Enum8))
{

1
Common/Hardware/WaterMeter/Genesis/Registers/Registers.csproj
View File

@ -134,6 +134,7 @@
<Compile Include="DataTypes\st_radio_dewa.cs" />
<Compile Include="DataTypes\st_radio_tfx.cs" />
<Compile Include="DataTypes\TimeT.cs" />
<Compile Include="DataTypes\UInt672.cs" />
<Compile Include="DataTypes\UInt48.cs" />
<Compile Include="DataTypes\UInt72.cs" />
<Compile Include="DataTypes\UInt128.cs" />

2
Common/LaaPackages

@ -1 +1 @@
Subproject commit ffa0abaa0448ba22350982cd3d3560ce1eaab42a
Subproject commit 41c1163d102dbb63572e60c6ffd501e1765d848c

2
Common/Production/ProductionUiCordonel/App.config
View File

@ -34,7 +34,7 @@
<appSettings>
<add key="Mode" value="2" /> <!--1 = EOL ; 2 = Picking-->
<add key="Mode" value="1" /> <!--1 = EOL ; 2 = Picking-->
<!--add key="SirtComport433" value="14" /--> <!--Thomas 14; Roland ; Stoyan ; VFM1 9; VFM4 7-->
<!--add key="SirtComport868" value="15" /--> <!--Thomas 15; Roland ; Stoyan ; VFM1 10; VFM4 8-->
<!--add key="SirtBoxNr" value="2" /--> <!--Thomas 2; Roland 2; Stoyan 2; VFM1 1; VFM4 3-->

78
Common/Ui/GenesisToolBox/FrmLowLevelTools.cs
View File

@ -348,46 +348,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<List<PwdExport>>(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<List<PwdExport>>(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