1. update support model name

2. delay 5sec before getting veriosn
3. factory reset add retey

AwInitilizer/Initializer.csproj

@@ -62,8 +62,8 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <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.0.14.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PhihongEv.Lib.1.0.14\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

@@ -646,6 +646,7 @@ namespace AwInitilizer
                 ViewModel.IsSimInsert = setting.IsSimInsert;
                 ViewModel.ICCID = setting.ICCID;
                 ViewModel.IMSI = setting.IMSI;
+                ViewModel.ButtonTestMode = setting.ButtonTestMode;
                 ViewModel.SkipEmergencyButton = setting.SkipEmergencyButton;
                 ViewModel.SkipButtonTest = setting.SkipButtonTest;
                 ViewModel.IpAddress = setting.IpAddress;

AwInitilizer/Model/SettingConfig.cs

@@ -14,6 +14,7 @@ namespace AwInitilizer.Model
         public bool IsSimInsert { get; set; }
         public string ICCID { get; set; }
         public string IMSI { get; set; }
+        public string ButtonTestMode { get; set; }
         public bool SkipEmergencyButton { get; set; }
         public bool SkipButtonTest { get; set; }
         public string IpAddress { get; set; }

AwInitilizer/Model/UpdateData.cs

@@ -105,6 +105,20 @@ namespace AwInitilizer.Model
             }
         }
 
+        private string _ButtonTestMode;
+        public string ButtonTestMode
+        {
+            get => _ButtonTestMode;
+            set
+            {
+                if (_ButtonTestMode != value)
+                {
+                    _ButtonTestMode = value;
+                    RaisePropertyChanged("ButtonTestMode");
+                }
+            }
+        }
+
         private bool _SkipEmergencyButton;
         public bool SkipEmergencyButton
         {

AwInitilizer/Procedure/BasicInfoUpdateProcedure.cs

@@ -230,6 +230,14 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
                 LogWriter.Log("UTC Time update Success");
             }
 
+            for (var pollingCnt = 0; pollingCnt < 56; pollingCnt++)
+            {
+                await Task.Delay(TimeSpan.FromSeconds(15));
+                var response = await ChekCsuBootCompelete();
+                if (response)
+                    break;
+            }
+
             return true;
         }
     }

AwInitilizer/Procedure/ButtonStatusCheckPorcedure.cs

@@ -61,7 +61,8 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
 
         internal override async Task<bool> Run()
         {
-            if (UpdateData.SkipButtonTest)
+            if (UpdateData.ButtonTestMode == "SkipButtonTest" ||
+                UpdateData.SkipButtonTest)
             {
                 return true;
             }
@@ -92,8 +93,15 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
             //Button1,Button2,EmergencyButton in order 0,1,2
             for (int testType = 0; testType < 3; testType++)
             {
+                if ((testType == 1 || testType == 0) &&
+                    UpdateData.ButtonTestMode == "SkipNormalButton")
+                {
+                    continue;
+                }
+
                 if (testType == 2 &&
-                    UpdateData.SkipEmergencyButton)
+                    (UpdateData.ButtonTestMode == "SkipEmergencyButton" ||
+                    UpdateData.SkipEmergencyButton))
                 {
                     continue;
                 }
@@ -142,26 +150,34 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
             bool isAllMatched = true;
             if (status != null)
             {
-                if (status.Button1 != 0)
-                {
-                    Error = ErrorType.FirstButtonCheckFail;
-                    LogWriter.Log("Button1 status ERROR, unpress is expected", isError: true);
-                    //Logger.Print("Button1 status ERROR, unpress is expected", isError: true);
-                    isAllMatched = false;
+                if (UpdateData.ButtonTestMode != "SkipNormalButton")
+                {
+                    if (status.Button1 != 0)
+                    {
+                        Error = ErrorType.FirstButtonCheckFail;
+                        LogWriter.Log("Button1 status ERROR, unpress is expected", isError: true);
+                        //Logger.Print("Button1 status ERROR, unpress is expected", isError: true);
+                        isAllMatched = false;
+                    }
+                    if (status.Button2 != 0)
+                    {
+                        Error = ErrorType.SecondButtonCheckFail;
+                        LogWriter.Log("Button2 status ERROR, unpress is expected", isError: true);
+                        //Logger.Print("Button2 status ERROR, unpress is expected", isError: true);
+                        isAllMatched = false;
+                    }
                 }
-                if (status.Button2 != 0)
-                {
-                    Error = ErrorType.SecondButtonCheckFail;
-                    LogWriter.Log("Button2 status ERROR, unpress is expected", isError: true);
-                    //Logger.Print("Button2 status ERROR, unpress is expected", isError: true);
-                    isAllMatched = false;
-                }
-                if (status.EmergencyButton != 0)
-                {
-                    Error = ErrorType.EmergencyButtonCheckFail;
-                    LogWriter.Log("EmergencyButton status ERROR, unpress is expected", isError: true);
-                    //Logger.Print("EmergencyButton status ERROR, unpress is expected", isError: true);
-                    isAllMatched = false;
+
+                if (UpdateData.ButtonTestMode != "SkipEmergencyButton" &&
+                    !UpdateData.SkipEmergencyButton)
+                {
+                    if (status.EmergencyButton != 0)
+                    {
+                        Error = ErrorType.EmergencyButtonCheckFail;
+                        LogWriter.Log("EmergencyButton status ERROR, unpress is expected", isError: true);
+                        //Logger.Print("EmergencyButton status ERROR, unpress is expected", isError: true);
+                        isAllMatched = false;
+                    }
                 }
 
                 if (isAllMatched)

AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs

@@ -73,6 +73,8 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
                 return false;
             }
 
+            await Task.Delay(5_000);
+
             //get version 
             var versionPair = await GetVersion();
             var updatedList = UpdateData.FirmwareUpdateModels;

AwInitilizer/Procedure/RestarttoIdelProcedure.cs

@@ -63,10 +63,18 @@ namespace AwInitilizer.Procedure.RestarttoIdle
             }
             else
             {
-                LogWriter.Log("Waiting Factory reset complete...");
+                //LogWriter.Log("Waiting Factory reset complete...");
                 //Logger.Print("Waiting Factory reset complete...");
-                await Task.Delay(TimeSpan.FromMinutes(2));
-                if (await CheckAllIdle())
+                int retryCnt = 0;
+                do
+                {
+                    LogWriter.Log("Waiting Factory reset complete...");
+                    await Task.Delay(TimeSpan.FromMinutes(2));
+                    retryCnt++;
+                }
+                while (!await CheckAllIdle() && retryCnt < 4);
+                
+                if (retryCnt < 4)
                 {
                     LogWriter.Report(LogEvent.IdleCheck,"success");
                     //Logger.Print("All Connetor is Idel");

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.11.2.0")]
-[assembly: AssemblyVersion("1.11.2.0")]
-[assembly: AssemblyFileVersion("1.11.2.0")]
-[assembly: AssemblyInformationalVersion("befd52e")]
+// [assembly: AssemblyVersion("1.11.4.0")]
+[assembly: AssemblyVersion("1.11.4.0")]
+[assembly: AssemblyFileVersion("1.11.4.0")]
+[assembly: AssemblyInformationalVersion("e705d3b")]

AwInitilizer/Resx/AppResources.Designer.cs

@@ -268,7 +268,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   查詢類似 {0} Firemware header ERROR 的當地語系化字串。
+        ///   查詢類似 {0} Firmwareheader ERROR 的當地語系化字串。
         /// </summary>
         public static string InitFirmwareFileHeaderFormatAlert {
             get {
@@ -277,7 +277,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   查詢類似 {0} Firemware and ModelName is Mismatched 的當地語系化字串。
+        ///   查詢類似 {0} Firmware and ModelName is Mismatched 的當地語系化字串。
         /// </summary>
         public static string InitFirmwareFileHeaderMismatchAlert {
             get {

AwInitilizer/Resx/AppResources.resx

@@ -274,10 +274,10 @@
     <value>{0} Firemware file is missing</value>
   </data>
   <data name="InitFirmwareFileHeaderMismatchAlert" xml:space="preserve">
-    <value>{0} Firemware and ModelName is Mismatched</value>
+    <value>{0} Firmware and ModelName is Mismatched</value>
   </data>
   <data name="InitFirmwareFileHeaderFormatAlert" xml:space="preserve">
-    <value>{0} Firemware header ERROR</value>
+    <value>{0} Firmwareheader ERROR</value>
   </data>
   <data name="BtnPressHintTitle" xml:space="preserve">
     <value>Starting Button test</value>

AwInitilizer/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentFTP" version="37.0.2" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
-  <package id="PhihongEv.Lib" version="1.0.12" targetFramework="net48" />
+  <package id="PhihongEv.Lib" version="1.0.14" targetFramework="net48" />
   <package id="RestSharp" version="106.15.0" targetFramework="net48" />
 </packages>

GitVersion.yml

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

Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.11.2.0")]
-[assembly: AssemblyFileVersion("1.11.2.0")]
-[assembly: AssemblyInformationalVersion("befd52e")]
+[assembly: AssemblyVersion("1.11.4.0")]
+[assembly: AssemblyFileVersion("1.11.4.0")]
+[assembly: AssemblyInformationalVersion("e705d3b")]
 

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.11.2.0")]
-[assembly: AssemblyVersion("1.11.2.0")]
-[assembly: AssemblyFileVersion("1.11.2.0")]
-[assembly: AssemblyInformationalVersion("befd52e")]
+// [assembly: AssemblyVersion("1.11.4.0")]
+[assembly: AssemblyVersion("1.11.4.0")]
+[assembly: AssemblyFileVersion("1.11.4.0")]
+[assembly: AssemblyInformationalVersion("e705d3b")]