fix length 15 bug

fix wifi check logic

ApiTest/Properties/AssemblyInfo.cs

@@ -53,4 +53,4 @@ using System.Windows;
 // [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]

AwInitilizer/Initializer.csproj

@@ -68,8 +68,8 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="PhihongEv.Lib, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PhihongEv.Lib.1.5.0\lib\net40\PhihongEv.Lib.dll</HintPath>
+    <Reference Include="PhihongEv.Lib, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PhihongEv.Lib.1.5.1\lib\net40\PhihongEv.Lib.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>

AwInitilizer/MainWindow.xaml.cs

@@ -1,6 +1,7 @@
 using AwInitilizer.Assist;
 using AwInitilizer.Model;
 using AwInitilizer.Procedure;
+using AwInitilizer.ProcedureLog;
 using CsuWebApiLib;
 using InitializerModel;
 using MesAdaptor;
@@ -279,7 +280,8 @@ namespace AwInitilizer
                 alertMsg += Resx.AppResources.ModelNameEmptyAlert + "\n";
                 isAvaliable = false;
             }
-            else if (ViewModel.SettingModelName != updateData.ModelName)
+            //else if (ViewModel.SettingModelName != updateData.ModelName)
+            else if (ViewModel.SettingModelName != updateData.SystemID.GetMesModelName())
             {
                 //alertMsg += "Model Name setting is Mismathed\n";
                 alertMsg += Resx.AppResources.ModelNameMismatchAlert + "\n";
@@ -623,7 +625,9 @@ namespace AwInitilizer
 
         private bool LoadConfigBySystemID(SystemID systemID)
         {
-            var result = EvseSettingConfig.TryLoad(systemID.ModelName.ToString());
+            //var result = EvseSettingConfig.TryLoad(systemID.ModelName.ToString());
+            var systemIdString = systemID.ToString();
+            var result = EvseSettingConfig.TryLoad(systemID.GetMesModelName());
             EvseSettingConfigLoadError error = result.Error;
 
             if (error == EvseSettingConfigLoadError.LoadConfigRootFolderNotfound)
@@ -732,12 +736,14 @@ namespace AwInitilizer
             ViewModel.IpAddress = setting.IpAddress;
             ViewModel.IsDisableAuthRequired = setting.IsDisableAuthRequired;
             ViewModel.IsIdleCheckPass = setting.IsIdleCheckPass;
-            ViewModel.FirmwareUpdateModels = setting.FirmwareUpdateList
-                .Where(x => !string.IsNullOrEmpty(x.Module) && !string.IsNullOrEmpty(x.FirmwareFileName)
+            ViewModel.FirmwareUpdateModels = setting.FirmwareUpdateList is null ?
+                new List<FirmwareUpdateModel>() :
+                setting.FirmwareUpdateList.Where(x => !string.IsNullOrEmpty(x.Module) && !string.IsNullOrEmpty(x.FirmwareFileName)
                 ).ToList();
 
             UpdateProcedure();
             ViewModel.IsInputCheckpassed = CheckInputData();
+
             return true;
         }
 

AwInitilizer/Procedure/WifRssiCheckProcedure.cs

@@ -59,7 +59,7 @@ namespace AwInitilizer.Procedure.WifRssiCheck
         internal override async Task<bool> Run()
         {
             //if (!UpdateData.SystemID.ModelName.Network.Description.Contains("WiFi"))
-            if (UpdateData.SystemID.ModelName.GetWiFiCnt() > 0)
+            if (UpdateData.SystemID.ModelName.GetWiFiCnt() == 0)
             {
                 LogWriter.Log("Wifi not supported, skip procedure");
 

AwInitilizer/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]

AwInitilizer/packages.config

@@ -4,7 +4,7 @@
   <package id="FluentModbus" version="5.2.0" targetFramework="net48" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
-  <package id="PhihongEv.Lib" version="1.5.0" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.5.1" targetFramework="net48" />
   <package id="RestSharp" version="106.15.0" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.IO.Ports" version="5.0.0" targetFramework="net48" />

ConfigEditor/ConfigEditor.csproj

@@ -56,8 +56,8 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="PhihongEv.Lib, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PhihongEv.Lib.1.5.0\lib\net40\PhihongEv.Lib.dll</HintPath>
+    <Reference Include="PhihongEv.Lib, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PhihongEv.Lib.1.5.1\lib\net40\PhihongEv.Lib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

ConfigEditor/Properties/AssemblyInfo.cs

@@ -53,4 +53,4 @@ using System.Windows;
 // [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]

ConfigEditor/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.NETCore.Platforms" version="7.0.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
-  <package id="PhihongEv.Lib" version="1.5.0" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.5.1" targetFramework="net48" />
   <package id="System.IO" version="4.3.0" targetFramework="net48" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
   <package id="System.Runtime" version="4.3.0" targetFramework="net48" />

CsuWebApiLib/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]

Editor/Properties/AssemblyInfo.cs

@@ -53,4 +53,4 @@ using System.Windows;
 // [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]

GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.13.2
+next-version: 1.13.3
 branches: {}
 ignore:
   sha: []

InitializerModel/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]

Initilizer/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]
 

MesAdaptor/MesAdaptor.csproj

@@ -31,8 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PhihongEv.Lib, Version=1.0.12.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PhihongEv.Lib.1.0.12\lib\net40\PhihongEv.Lib.dll</HintPath>
+    <Reference Include="PhihongEv.Lib, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PhihongEv.Lib.1.5.1\lib\net40\PhihongEv.Lib.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

MesAdaptor/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyFileVersion("1.13.2.0")]
-[assembly: AssemblyInformationalVersion("d874701")]
+[assembly: AssemblyInformationalVersion("5a0f6b1")]

MesAdaptor/SajectConnectSajet.cs

@@ -165,9 +165,10 @@ namespace MesAdaptor
             var codePair = new Dictionary<string, string>();
 
             string model = "";
-            if (SystemID.TryParse(SN,out var systemID))
+            if (SystemID.TryLooseParse(SN,out var systemID))
             {
-                model = systemID.ModelName.ToString();
+                //model = systemID.ModelName.ToString();
+                model = systemID.GetMesModelName();
             }
 
             foreach (var key in valuePairs.Keys)

MesAdaptor/SajectConnectSajet2.cs

@@ -67,7 +67,7 @@ namespace MesAdaptor
                 return false;
             }
 
-            var msg = string.Format("{0};{1};;", id.ModelName.ToString(), id.ToString());
+            var msg = string.Format("{0};{1};;", id.GetMesModelName(), id.ToString());
 
             if (SajetTransData(CMD.SnCheck, ref msg))
             {
@@ -105,7 +105,7 @@ namespace MesAdaptor
             if (systemID == null)
                 return false;
             //string msg = userId + ";" + systemID.ToString() + ";";
-            string msg = string.Format("{0};{1};{2};{3}:0;", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString());
+            string msg = string.Format("{0};{1};{2};{3}:0;", userId, _MechineCode, systemID.GetMesModelName(), systemID.ToString());
 
             if (string.IsNullOrEmpty(msg))
                 return false;
@@ -133,7 +133,7 @@ namespace MesAdaptor
             if (systemID == null)
                 return false;
             //string msg = userId + ";" + systemID.ToString() + ";";
-            string msg = string.Format("{0};{1};{2};{3}:1:", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString());
+            string msg = string.Format("{0};{1};{2};{3}:1:", userId, _MechineCode, systemID.GetMesModelName(), systemID.ToString());
 
             if (string.IsNullOrEmpty(msg))
                 return false;
@@ -195,7 +195,7 @@ namespace MesAdaptor
                     value = "1";
                 }
 
-                var msg = string.Format("{0};{1};{2};{3};{4}:{5}:{6};", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString(), key, value, det);
+                var msg = string.Format("{0};{1};{2};{3};{4}:{5}:{6};", userId, _MechineCode, systemID.GetMesModelName(), systemID.ToString(), key, value, det);
                 var result = SajetTransData(CMD.ValueReport, ref msg);
                 totalResult &= result;
             }

MesAdaptor/SajetConnect.cs

@@ -24,6 +24,7 @@ namespace MesAdaptor
             "php",
             "shinewave",
             "phv",
+            "ztmn",
             "sajet",
             "sajet2"
         };
@@ -58,6 +59,7 @@ namespace MesAdaptor
                     SajetConnect.Instance = new SajectConnectSajet();
                     break;
                 //case "phv":
+                case "ztmn":
                 case "phv":
                 case "sajet2":
                     SajetConnect.Instance = new SajectConnectSajet2(mechineCode);

MesAdaptor/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PhihongEv.Lib" version="1.0.12" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.5.1" targetFramework="net48" />
 </packages>