This commit is contained in:
2021-06-10 16:56:05 +05:00
parent e433588449
commit b5a51ad633
55 changed files with 99 additions and 68 deletions

View File

@@ -11,7 +11,7 @@ namespace DataClient
public static class ByteConverter
{
public static TechCycle[] BytesToTechcycles(byte[] arr)
{
{
var res = new List<TechCycle>();
try
{
@@ -26,7 +26,7 @@ namespace DataClient
str.Add(arr[i]);
} catch { throw; }
return res.ToArray();
}
}
public static TechCycle BytesToTechcycle(byte[] arr)
{
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@@ -66,5 +66,13 @@ namespace DataClient
}
catch { throw; }
}
public static (DateTime date, byte[] bytes)[] BytesToTimeLine(byte[] arr, DateTime date)
{
var res = new List<(DateTime date, byte[] bytes)>();
return res.ToArray();
}
}
}

View File

@@ -587,5 +587,6 @@ namespace DataClient
finally { My_Close(needCloseConeection); }
return pasp;
}
}
}

View File

@@ -228,6 +228,12 @@ namespace DataClient
Config();
}
public TechCycle[] GetTechCycle(int vdp, DateTime tS, DateTime tE)
{
//Use File with ID = 3
var res = new List<TechCycle>();
return res.ToArray();
}

View File

@@ -6,7 +6,23 @@ using System.Threading.Tasks;
namespace DataClient.Struct
{
class Analog
public class ConfAnalog
{
public int id = 0;
public string name = null;
public string sname = null;
public string measure = null;
public double min = double.MinValue;
public double max = double.MaxValue;
public double norm = 0;
public int precision = 0;
public double mul = 1;
public bool log = false;
public int[] byteId = Array.Empty<int>();
}
public class Analog
{
public double? value = null;
public DateTime date = DateTime.Now;
}
}

View File

@@ -75,7 +75,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
}
}
}

View File

@@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.9.0</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\google\.nuget\packages\" />

View File

@@ -437,7 +437,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
}
}
}

View File

@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "fLzCMyL0TTYR6ScHYw8lseE4tuHRjlfRhsrbzgdqw/qeVRrQYigyT797G0cUiPOmrt1GVD0KWz3n3AZIE22bzQ==",
"dgSpecHash": "Mbw4RYYlxmi+1Fh8rOiFVGe3aL09yjgvcEKpwC6SozQbKvlr1nwGK/Xx++SUKdbH/3Ze+xbOpcEh4lNVnAV66Q==",
"success": true,
"projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj",
"expectedPackageFiles": [