move disable auth to evse config

ApiTest/MainWindow.xaml.cs

@@ -29,7 +29,7 @@ namespace ApiTest
             //uxIp.Text = "192.168.80.129";
             //uxAccount.Text = "zerova";
             //uxPass.Text = "t6sji4j83";
-            uxIp.Text = "192.168.1.100";
+            uxIp.Text = "192.168.100.1";
             uxAccount.Text = "zerova";
             uxPass.Text = "t6sji4j83";
         }

ApiTest/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
-[assembly: AssemblyInformationalVersion("0942119")]
+// [assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyFileVersion("1.13.1.0")]
+[assembly: AssemblyInformationalVersion("3a0b9b9")]

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.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PhihongEv.Lib.1.4.0\lib\net40\PhihongEv.Lib.dll</HintPath>
+    <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>
     <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

@@ -210,6 +210,23 @@
                                     </TextBox.IsEnabled>
                                 </TextBox>
                             </StackPanel>
+                            <StackPanel
+                                Height="30"
+                                Margin="0,0,0,10"
+                                Orientation="Horizontal">
+                                <Grid Width="178">
+                                    <Label
+                                        HorizontalAlignment="Center"
+                                        FontSize="16"
+                                        Content="{x:Static resx:AppResources.DisableAuth}"
+                                        Foreground="White" />
+                                </Grid>
+                                <CheckBox
+                                    VerticalAlignment="Center"
+                                    IsChecked="{Binding IsDisableAuthRequired}"
+                                    IsEnabled="{Binding IsInputLock}"
+                                    IsHitTestVisible="False" />
+                            </StackPanel>
                         </StackPanel>
                     </GroupBox>
                 </StackPanel>

AwInitilizer/MainWindow.xaml.cs

@@ -305,10 +305,12 @@ namespace AwInitilizer
                     alertMsg += Resx.AppResources.ModelNameErrorAlert + "\n";
                     isAvaliable = false;
                 }
-            }
-
-            if (updateData.SystemID != null &&
-                updateData.SystemID.ModelName.Network.Description.Contains("4G"))
+            }
+
+            //if (updateData.SystemID != null &&
+            //    updateData.SystemID.ModelName.Network.Description.Contains("4G"))
+            if (updateData.SystemID != null &&
+                updateData.SystemID.ModelName.GetTelecomCnt() > 0)
             {
                 if (string.IsNullOrEmpty(updateData.FourGenModuleVersion))
                 {
@@ -727,6 +729,7 @@ namespace AwInitilizer
             //ViewModel.SkipEmergencyButton = setting.SkipEmergencyButton;
             //ViewModel.SkipButtonTest = setting.SkipButtonTest;
             ViewModel.IpAddress = setting.IpAddress;
+            ViewModel.IsDisableAuthRequired = setting.IsDisableAuthRequired;
             ViewModel.FirmwareUpdateModels = setting.FirmwareUpdateList
                 .Where(x => !string.IsNullOrEmpty(x.Module) && !string.IsNullOrEmpty(x.FirmwareFileName)
                 ).ToList();
@@ -752,7 +755,7 @@ namespace AwInitilizer
             procedures.Add(new Procedure.ButtonStatusCheck.ButtonStatusCheckPorcedure());
             procedures.Add(new Procedure.RestarttoIdle.RestarttoIdleProcedure());
             procedures.Add(new Procedure.VersionLog.VersionLogProcedure());
-            if (AppSettingConfig.Instance.IsDisableAuthRequired)
+            if (ViewModel.IsDisableAuthRequired)
             {
                 procedures.Add(new Procedure.FactoryAssist.DsiableChargeAuthProcedure());
             }

AwInitilizer/Model/UpdateData.cs

@@ -225,6 +225,20 @@ namespace AwInitilizer.Model
             }
         }
 
+        private bool _IsDisableAuthRequired;
+        public bool IsDisableAuthRequired
+        {
+            get => _IsDisableAuthRequired;
+            set
+            {
+                if (_IsDisableAuthRequired != value)
+                {
+                    _IsDisableAuthRequired = value;
+                    RaisePropertyChanged("IsDisableAuthRequired");
+                }
+            }
+        }
+
         private List<FirmwareUpdateModel> _FirmwareUpdateModels;
         public List<FirmwareUpdateModel> FirmwareUpdateModels
         {

AwInitilizer/Procedure/DsiableChargeAuthProcedure.cs

@@ -37,7 +37,8 @@ namespace AwInitilizer.Procedure.FactoryAssist
 
         internal override async Task<bool> Run()
         {
-            if (!AppSettingConfig.Instance.IsDisableAuthRequired)
+            //if (!AppSettingConfig.Instance.IsDisableAuthRequired)
+            if (!UpdateData.IsDisableAuthRequired)
             {
                 return false;
             }

AwInitilizer/Procedure/FourGenModuleCheckProcedure.cs

@@ -79,7 +79,8 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
         internal override async Task<bool> Run()
         {
             //if (!UpdateData.SystemID.ModelName.Network.Description.Contains("4G"))
-            if (!UpdateData.SystemID.ModelName.Network.SupportTelecom)
+            //if (!UpdateData.SystemID.ModelName.Network.SupportTelecom)
+            if (UpdateData.SystemID.ModelName.GetTelecomCnt() == 0)
             {
                 //if does not support 4G then end init
                 LogWriter.Log("4G not supported, skip procedure");
@@ -142,7 +143,8 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
 
             LogWriter.Report(LogEvent.FourgenModuleVersion, fourthGenModuleVersion);
 
-            if (UpdateData.SystemID.ModelName.Network.SupportSubTelecom)
+            //if (UpdateData.SystemID.ModelName.Network.SupportSubTelecom)
+            if (UpdateData.SystemID.ModelName.GetTelecomCnt() > 1)
             {
                 //var fourthGenModuleVersion = await serialPortocol.GetFourGenModuleVersion();
                 getfourthGenModuleVersion = await EvApi.GetTelcomSubModemFwRev();
@@ -269,7 +271,8 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
 
 
 
-            if (!UpdateData.SystemID.ModelName.Network.SupportSubTelecom)
+            //if (!UpdateData.SystemID.ModelName.Network.SupportSubTelecom)
+            if (UpdateData.SystemID.ModelName.GetTelecomCnt() > 1)
             {
                 return true;
             }

AwInitilizer/Procedure/TelcomModemImeiRecordProcedure.cs

@@ -50,7 +50,8 @@ namespace AwInitilizer.Procedure.TelcomModemImeiRecord
 
         internal override async Task<bool> Run()
         {
-            if (!UpdateData.SystemID.ModelName.Network.Description.Contains("4G"))
+            //if (!UpdateData.SystemID.ModelName.Network.Description.Contains("4G"))
+            if (UpdateData.SystemID.ModelName.GetTelecomCnt() == 0)
             {
                 LogWriter.Log("TelcomModem not supported, skip procedure");
 

AwInitilizer/Procedure/WifRssiCheckProcedure.cs

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

AwInitilizer/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
-[assembly: AssemblyInformationalVersion("0942119")]
+// [assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyFileVersion("1.13.1.0")]
+[assembly: AssemblyInformationalVersion("3a0b9b9")]

AwInitilizer/Resx/AppResources.Designer.cs

@@ -141,6 +141,15 @@ namespace AwInitilizer.Resx {
             }
         }
         
+        /// <summary>
+        ///   查詢類似 Disable Authentication 的當地語系化字串。
+        /// </summary>
+        public static string DisableAuth {
+            get {
+                return ResourceManager.GetString("DisableAuth", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查詢類似 Press the emergency button for 2 seconds, then twist release it. 的當地語系化字串。
         /// </summary>

AwInitilizer/Resx/AppResources.resx

@@ -300,4 +300,7 @@
   <data name="EmergencyBtnPressPressHint" xml:space="preserve">
     <value>Press the emergency button for 2 seconds, then twist release it.</value>
   </data>
+  <data name="DisableAuth" xml:space="preserve">
+    <value>Disable Authentication</value>
+  </data>
 </root>

AwInitilizer/Resx/AppResources.zh-CHS.resx

@@ -300,4 +300,7 @@
   <data name="EmergencyBtnPressPressHint" xml:space="preserve">
     <value>请按下紧急按钮2秒后放开</value>
   </data>
+  <data name="DisableAuth" xml:space="preserve">
+    <value>启用随插即充</value>
+  </data>
 </root>

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.4.0" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.5.0" 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.0.16.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PhihongEv.Lib.1.0.16\lib\net40\PhihongEv.Lib.dll</HintPath>
+    <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>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

ConfigEditor/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
-[assembly: AssemblyInformationalVersion("0942119")]
+// [assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyFileVersion("1.13.1.0")]
+[assembly: AssemblyInformationalVersion("3a0b9b9")]

ConfigEditor/SubPage/AppConfig/AppConfigPanel.xaml

@@ -50,14 +50,6 @@
             <TextBox Width="150" Text="{Binding MechineCode}" />
         </StackPanel>
         <Rectangle Height="10" />
-        <StackPanel Orientation="Horizontal">
-            <Label Width="185">IsDisableAuthRequired</Label>
-            <CheckBox
-                Width="150"
-                VerticalAlignment="Center"
-                IsChecked="{Binding IsDisableAuthRequired}" />
-        </StackPanel>
-        <Rectangle Height="10" />
         <StackPanel Orientation="Horizontal">
             <Label Width="185">JohnSenLedComPort</Label>
             <TextBox Width="150" Text="{Binding JohnSenLedComPort}" />

ConfigEditor/SubPage/EvseConfig/EvseConfigPanel.xaml

@@ -50,6 +50,14 @@
                     SelectedItem="{Binding ButtonTestMode}" />
             </StackPanel>
             <Rectangle Height="10" />
+            <StackPanel Orientation="Horizontal">
+                <Label Width="185">IsDisableAuthRequired</Label>
+                <CheckBox
+                    Width="150"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding IsDisableAuthRequired}" />
+            </StackPanel>
+            <Rectangle Height="10" />
             <GroupBox
                 x:Name="uxFirstTelcom"
                 Header="1st 3G/4G"

ConfigEditor/SubPage/EvseConfig/EvseConfigPanel.xaml.cs

@@ -104,8 +104,8 @@ namespace ConfigEditor.SubPage.EvseConfig
 
             this.DataContext = config;
 
-            uxFirstTelcom.Visibility = systemID.ModelName.Network.SupportTelecom ? Visibility.Visible : Visibility.Collapsed;
-            uxSecondTelcom.Visibility = systemID.ModelName.Network.SupportSubTelecom ? Visibility.Visible : Visibility.Collapsed;
+            uxFirstTelcom.Visibility = systemID.ModelName.GetTelecomCnt() > 0 ? Visibility.Visible : Visibility.Collapsed;
+            uxSecondTelcom.Visibility = systemID.ModelName.GetTelecomCnt() > 1 ? Visibility.Visible : Visibility.Collapsed;
 
             var groupedFrimware = config.FirmwareUpdateList is null ? new List<IGrouping<int, FirmwareUpdateModel>>() : config.FirmwareUpdateList.GroupBy(x => EvseVersion.GetVersionIndex(x.Module));
             groupedFrimware = groupedFrimware.OrderBy(x => x.Key);
@@ -146,16 +146,36 @@ namespace ConfigEditor.SubPage.EvseConfig
 
         private bool CheckSetting()
         {
-            var modelName = uxEvseModelNameList.SelectedItem as string;
+            var modelNameString = uxEvseModelNameList.SelectedItem as string;
             EvseSettingConfigModel config = this.DataContext as EvseSettingConfigModel;
 
-            if (string.IsNullOrEmpty(modelName) ||
+            if (string.IsNullOrEmpty(modelNameString) ||
                 config == null)
             {
                 MessageBox.Show("load model failed");
                 return false;
             }
 
+            var systemidParse = SystemID.TryLooseParse(modelNameString, out var systemID);
+            if (!systemidParse)
+            {
+                MessageBox.Show("model name error");
+                return false;
+            }
+            var modelName = systemID.ModelName;
+
+            if (modelName.GetTelecomCnt() > 0 && string.IsNullOrEmpty(config.FourGenModuleVersion))
+            {
+                MessageBox.Show("ModuleVersion should not be empty");
+                return false;
+            }
+
+            if (modelName.GetTelecomCnt() > 1 && string.IsNullOrEmpty(config.SubFourGenModuleVersion))
+            {
+                MessageBox.Show("ModuleVersion should not be empty");
+                return false;
+            }
+
             if (config.IsSimInsert)
             {
                 if (string.IsNullOrEmpty(config.SimICCID) ||

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.0.16" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.5.0" 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" />

Editor/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
-[assembly: AssemblyInformationalVersion("0942119")]
+// [assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyFileVersion("1.13.1.0")]
+[assembly: AssemblyInformationalVersion("3a0b9b9")]

GitVersion.yml

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

InitializerModel/AppSettingConfigModel.cs

@@ -18,7 +18,7 @@ namespace InitializerModel
         public string Language { get; set; }
         public string MES { get; set; }
         public string MechineCode { get; set; }
-        public bool IsDisableAuthRequired { get; set; }
+        //public bool IsDisableAuthRequired { get; set; }
         public string JohnSenLedComPort { get; set; }
     }
 }

InitializerModel/EvseSettingConfigModel.cs

@@ -27,6 +27,7 @@ namespace InitializerModel
         [Obsolete]
         public bool SkipButtonTest { get; set; }
         public string IpAddress { get; set; }
+        public bool IsDisableAuthRequired { get; set; }
         public List<FirmwareUpdateModel> FirmwareUpdateList { get; set; }
     }
 

InitializerModel/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
-// [assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
-[assembly: AssemblyInformationalVersion("0942119")]
+// [assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyFileVersion("1.13.1.0")]
+[assembly: AssemblyInformationalVersion("3a0b9b9")]

Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
-[assembly: AssemblyInformationalVersion("0942119")]
+[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyFileVersion("1.13.1.0")]
+[assembly: AssemblyInformationalVersion("3a0b9b9")]
 

MesAdaptor/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
-[assembly: AssemblyInformationalVersion("0942119")]
+// [assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyFileVersion("1.13.1.0")]
+[assembly: AssemblyInformationalVersion("3a0b9b9")]