add SkipEmergencyButton

AwInitilizer/MainWindow.xaml.cs

@@ -636,6 +636,7 @@ namespace AwInitilizer
                 ViewModel.IsSimInsert = setting.IsSimInsert;
                 ViewModel.ICCID = setting.ICCID;
                 ViewModel.IMSI = setting.IMSI;
+                ViewModel.SkipEmergencyButton = setting.SkipEmergencyButton;
                 ViewModel.FirmwareUpdateModels = setting.FirmwareUpdateList
                     .Where(x => !string.IsNullOrEmpty(x.Module) && !string.IsNullOrEmpty(x.FirmwareFileName)
                     ).ToList();

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 bool SkipEmergencyButton { get; set; }
         public List<FirmwareUpdateModel> FirmwareUpdateList { get; set; }
     }
 }

AwInitilizer/Model/UpdateData.cs

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

AwInitilizer/Procedure/ButtonStatusCheckPorcedure.cs

@@ -80,6 +80,12 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
             //Button1,Button2,EmergencyButton in order 0,1,2
             for (int testType = 0; testType < 3; testType++)
             {
+                if (testType == 2 &&
+                    UpdateData.SkipEmergencyButton)
+                {
+                    continue;
+                }
+
                 var checkResult = await PressBtnCheck(testType);
                 if (!checkResult)
                 {

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.9.7.0")]
-[assembly: AssemblyVersion("1.9.7.0")]
-[assembly: AssemblyFileVersion("1.9.7.0")]
-[assembly: AssemblyInformationalVersion("d82c309")]
+// [assembly: AssemblyVersion("1.9.8.0")]
+[assembly: AssemblyVersion("1.9.8.0")]
+[assembly: AssemblyFileVersion("1.9.8.0")]
+[assembly: AssemblyInformationalVersion("525b4ef")]

GitVersion.yml

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

Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.9.7.0")]
-[assembly: AssemblyFileVersion("1.9.7.0")]
-[assembly: AssemblyInformationalVersion("d82c309")]
+[assembly: AssemblyVersion("1.9.8.0")]
+[assembly: AssemblyFileVersion("1.9.8.0")]
+[assembly: AssemblyInformationalVersion("525b4ef")]
 

InitlizerInstaller_Sajet/InitlizerInstaller_Sajet.vdproj

@@ -15,7 +15,19 @@
     {
         "Entry"
         {
-        "MsmKey" = "8:_422E223271EB4D2E954CFD252D2A2A91"
+        "MsmKey" = "8:_09A2EBA2D5D348A1A3B93ED531AA1A7E"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17AAB331385F5AB0DB85106CB8F5DC4B"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_1E4ACDF3DD404AFEA4115ED5ED16156F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -27,7 +39,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_60548ECB9CC249C89201513F61037FBA"
+        "MsmKey" = "8:_63B8A79799C442BA88F41055AEA749A1"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -39,20 +51,32 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_97F5B44C94194140955948B3F41A4366"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_8181ECA24C69B23059D78716A887B0FC"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B4C9D30E256F4ED3AFC0AAC1CC7D0DA8"
+        "MsmKey" = "8:_8F51CE1BAB3647E38A8DBA92EFEA196A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C5CE3A338EB743F58C8E39CAB18FA442"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_9AF74F3E4A7D86E15662EE6C95C63162"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BE34693DEF4C83181737B63FE253E02E"
+        "OwnerKey" = "8:_17AAB331385F5AB0DB85106CB8F5DC4B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BE34693DEF4C83181737B63FE253E02E"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -61,6 +85,66 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_CFC22B3C95EF485AE68C4221E89D2601"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_D08994C3B07279ED519ACC2855583EAD"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_8181ECA24C69B23059D78716A887B0FC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_C8A819E371294B95BA095055C4068761"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_D08994C3B07279ED519ACC2855583EAD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_9AF74F3E4A7D86E15662EE6C95C63162"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_CFC22B3C95EF485AE68C4221E89D2601"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_17AAB331385F5AB0DB85106CB8F5DC4B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_BE34693DEF4C83181737B63FE253E02E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -156,10 +240,61 @@
         }
         "File"
         {
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_422E223271EB4D2E954CFD252D2A2A91"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_09A2EBA2D5D348A1A3B93ED531AA1A7E"
             {
-            "SourcePath" = "8:..\\..\\..\\MES\\PHV\\SajetConnect.ini"
-            "TargetName" = "8:SajetConnect.ini"
+            "SourcePath" = "8:..\\..\\..\\MES\\Sajet_5.0.2.22\\SajetConnect.dll"
+            "TargetName" = "8:SajetConnect.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_17AAB331385F5AB0DB85106CB8F5DC4B"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:MesAdaptor, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_17AAB331385F5AB0DB85106CB8F5DC4B"
+                    {
+                    "Name" = "8:MesAdaptor.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:MesAdaptor.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E4ACDF3DD404AFEA4115ED5ED16156F"
+            {
+            "SourcePath" = "8:..\\..\\..\\MES\\Sajet_5.0.2.22\\SAJET.INI"
+            "TargetName" = "8:SAJET.INI"
             "Tag" = "8:"
             "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
             "Condition" = "8:"
@@ -196,10 +331,10 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_60548ECB9CC249C89201513F61037FBA"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_63B8A79799C442BA88F41055AEA749A1"
             {
-            "SourcePath" = "8:..\\..\\..\\MES\\PHV\\SajetConnect.dll"
-            "TargetName" = "8:SajetConnect.dll"
+            "SourcePath" = "8:..\\..\\..\\MES\\Sajet_5.0.2.22\\SajetConnect.ini"
+            "TargetName" = "8:SajetConnect.ini"
             "Tag" = "8:"
             "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
             "Condition" = "8:"
@@ -216,10 +351,21 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_97F5B44C94194140955948B3F41A4366"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8181ECA24C69B23059D78716A887B0FC"
             {
-            "SourcePath" = "8:..\\..\\..\\MES\\PHV\\SAJET.INI"
-            "TargetName" = "8:SAJET.INI"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                "ScatterAssemblies"
+                {
+                    "_8181ECA24C69B23059D78716A887B0FC"
+                    {
+                    "Name" = "8:System.Net.Http.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:System.Net.Http.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
             "Condition" = "8:"
@@ -233,12 +379,12 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4C9D30E256F4ED3AFC0AAC1CC7D0DA8"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8F51CE1BAB3647E38A8DBA92EFEA196A"
             {
-            "SourcePath" = "8:..\\..\\..\\MES\\PHV\\midas.dll"
+            "SourcePath" = "8:..\\..\\..\\MES\\Sajet_5.0.2.22\\midas.dll"
             "TargetName" = "8:midas.dll"
             "Tag" = "8:"
             "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
@@ -256,10 +402,21 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C5CE3A338EB743F58C8E39CAB18FA442"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9AF74F3E4A7D86E15662EE6C95C63162"
             {
-            "SourcePath" = "8:..\\..\\..\\MES\\PHV\\DLL.INI"
-            "TargetName" = "8:DLL.INI"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_9AF74F3E4A7D86E15662EE6C95C63162"
+                    {
+                    "Name" = "8:Newtonsoft.Json.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Newtonsoft.Json.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
             "Condition" = "8:"
@@ -273,14 +430,45 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BE34693DEF4C83181737B63FE253E02E"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:PhihongEv.Lib, Version=1.0.12.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_BE34693DEF4C83181737B63FE253E02E"
+                    {
+                    "Name" = "8:PhihongEv.Lib.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:PhihongEv.Lib.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C8A819E371294B95BA095055C4068761"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AwInitilizer.resources, Version=0.0.0.0, Culture=zh-CHS, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:AwInitilizer.resources, Version=1.9.8.0, Culture=zh-CHS, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_C8A819E371294B95BA095055C4068761"
@@ -307,6 +495,68 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CFC22B3C95EF485AE68C4221E89D2601"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:FluentFTP, Version=37.0.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_CFC22B3C95EF485AE68C4221E89D2601"
+                    {
+                    "Name" = "8:FluentFTP.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:FluentFTP.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D08994C3B07279ED519ACC2855583EAD"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_D08994C3B07279ED519ACC2855583EAD"
+                    {
+                    "Name" = "8:RestSharp.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:RestSharp.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {

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.9.7.0")]
-[assembly: AssemblyVersion("1.9.7.0")]
-[assembly: AssemblyFileVersion("1.9.7.0")]
-[assembly: AssemblyInformationalVersion("d82c309")]
+// [assembly: AssemblyVersion("1.9.8.0")]
+[assembly: AssemblyVersion("1.9.8.0")]
+[assembly: AssemblyFileVersion("1.9.8.0")]
+[assembly: AssemblyInformationalVersion("525b4ef")]