Эх сурвалжийг харах

command test complete, wait online test
create sajest2 installer
update to version 1.5.1

Robert 3 жил өмнө
parent
commit
5ec02c31ec

+ 4 - 0
AwInitilizer.sln

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhihongSystemID", "PhihongS
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InitlizerInstaller_Sajet", "InitlizerInstaller_Sajet\InitlizerInstaller_Sajet.vdproj", "{B5C036AF-3A25-4892-A1EE-28DEF290A024}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InitlizerInstaller_Sajet2", "InitlizerInstaller_Sajet2\InitlizerInstaller_Sajet2.vdproj", "{92DFE875-0D71-4B79-81FD-F7BA9A2303FD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,6 +37,8 @@ Global
 		{82536D82-F84B-47A5-A7F3-C668124188C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5C036AF-3A25-4892-A1EE-28DEF290A024}.Debug|Any CPU.ActiveCfg = Debug
 		{B5C036AF-3A25-4892-A1EE-28DEF290A024}.Release|Any CPU.ActiveCfg = Release
+		{92DFE875-0D71-4B79-81FD-F7BA9A2303FD}.Debug|Any CPU.ActiveCfg = Debug
+		{92DFE875-0D71-4B79-81FD-F7BA9A2303FD}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 28 - 3
AwInitilizer/App.xaml.cs

@@ -16,16 +16,41 @@ namespace AwInitilizer
     /// </summary>
     public partial class App : Application
     {
-        public App():base()
+        public App() : base()
         {
             DispatcherUnhandledException += App_DispatcherUnhandledException;
         }
 
+        private bool onlyOnce = true;
+        private async void Test()
+        {
+            if (!onlyOnce)
+            {
+                return;
+            }
+            onlyOnce = false;
+
+            //var test = new SajectConnectSajet2("ATC_TEST01");
+            //bool result = false;
+            //result = test.SajetTransStart();
+            //await Task.Delay(5_000);
+            //string userId = "001";
+            //result = test.SajetTransSignIn(ref userId);
+            //await Task.Delay(5_000);
+            //result = test.SajetTransSnCheck("6300D000033-R00", "PL110001006");
+            //result = test.SajetTransReport("6300D000033-R00", "PL110001006" , new Dictionary<string, string>() { {"Header1","Value1"} });
+            //result = test.SajetTranFinishFail("6300D000033-R00", "PL110001006", MesErrorCode.BlueButtonTestFail);
+            //result = test.SajetTranFinishSuccess("6300D000033-R00", "PL110001006");
+            //result = test.SajetTransClose();
+        }
+
         protected override void OnActivated(EventArgs e)
         {
             base.OnActivated(e);
 
             SetUiLanguage();
+
+            Test();
         }
 
         private void SetUiLanguage()
@@ -45,8 +70,8 @@ namespace AwInitilizer
         private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             var fileName = DateTime.Now.ToString("yyyyMMddHHmmss") + ".txt";
-            var msg = e.Exception.Message + "\n"+ e.Exception.StackTrace;
-            File.WriteAllText(fileName,msg);
+            var msg = e.Exception.Message + "\n" + e.Exception.StackTrace;
+            File.WriteAllText(fileName, msg);
             MessageBox.Show($"App crashed,Please report error and send back {fileName}");
             Application.Current.Shutdown();
         }

+ 1 - 1
AwInitilizer/MainWindow.xaml.cs

@@ -115,7 +115,7 @@ namespace AwInitilizer
 
             }
 
-            Environment.Exit(0);
+            //Environment.Exit(0);
         }
 
         private void MainWindow_PreviewKeyDown(object sender, KeyEventArgs e)

+ 1 - 1
AwInitilizer/Properties/AssemblyInfo.cs

@@ -53,4 +53,4 @@ using System.Windows;
 // [assembly: AssemblyVersion("1.5.0.0")]
 [assembly: AssemblyVersion("1.5.0.0")]
 [assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("652a2f3")]
+[assembly: AssemblyInformationalVersion("c927cfd")]

+ 2 - 1
AwInitilizer/SettingConfig.cs

@@ -98,7 +98,8 @@ namespace AwInitilizer
         {
             _FirmwareRoot = "./Firmware";
             _Language = "zh-chs";
-            _MES = "shinewave";
+            _MES = "sajet2";
+            _MechineCode = "testMechineCode";
         }
     }
 }

+ 4 - 4
AwInitilizer/SigninDialog.xaml.cs

@@ -26,9 +26,11 @@ namespace AwInitilizer
         public SigninDialog()
         {
             InitializeComponent();
+            SetMes();
+            var startResult = SajetConnect.SajetTransStart();
         }
 
-        private void OK_Pressed(object sender, RoutedEventArgs e)
+        private async void OK_Pressed(object sender, RoutedEventArgs e)
         {
             if(string.IsNullOrEmpty(uxIdBox.Text))
             {
@@ -47,8 +49,6 @@ namespace AwInitilizer
                 this.Close();
                 return;
             }
-            SetMes();
-            var startResult = SajetConnect.SajetTransStart();
 
             if (SajetConnect.SajetTransSignIn(ref id))
             {
@@ -120,7 +120,7 @@ namespace AwInitilizer
             {
                 SajetConnect.Instance = new SajectConnectSajet();
             }
-            else if (mesSetting == "phv" || mesSetting == "sajet")
+            else if (mesSetting == "phv" || mesSetting == "sajet2")
             {
                 SajetConnect.Instance = new SajectConnectSajet2(AppSettingConfig.MechineCode);
             }

+ 1 - 1
Initilizer/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 
 [assembly: AssemblyVersion("1.5.0.0")]
 [assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("652a2f3")]
+[assembly: AssemblyInformationalVersion("c927cfd")]
 

+ 1148 - 0
InitlizerInstaller_Sajet2/InitlizerInstaller_Sajet2.vdproj

@@ -0,0 +1,1148 @@
+"DeployProject"
+{
+"VSVersion" = "3:800"
+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
+"IsWebType" = "8:FALSE"
+"ProjectName" = "8:InitlizerInstaller_Sajet2"
+"LanguageId" = "3:1033"
+"CodePage" = "3:1252"
+"UILanguageId" = "3:1033"
+"SccProjectName" = "8:"
+"SccLocalPath" = "8:"
+"SccAuxPath" = "8:"
+"SccProvider" = "8:"
+    "Hierarchy"
+    {
+        "Entry"
+        {
+        "MsmKey" = "8:_0A77CCECA67A4EE38BE158922D24F367"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_26DE58F16DE805EBB03819CFE8E5F976"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_330207E296364CE0BFA2933846203104"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_38236D30418E44BFB785F375FB6E695A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3EA005FD7871847C50921C4F6A784E3D"
+        "OwnerKey" = "8:_F7B4996F823BE05F60488C151398DC83"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3EA005FD7871847C50921C4F6A784E3D"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_89209DC6A8B3498099C558B366509478"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B88A49CE40C9CD286D9008072F1929EB"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C56F351EED0D473C8C91FFD4ACE607E0"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBAAAD8B413D43CEB3576E78C76BB64C"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CE59ED9B4E2D416895DC495AC1D0814C"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_DBCC43BD7338AA54B1F2BB1368D59976"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F5941CF2A2414414B709B2B9F4989BF4"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F7B4996F823BE05F60488C151398DC83"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_26DE58F16DE805EBB03819CFE8E5F976"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_F7B4996F823BE05F60488C151398DC83"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_3EA005FD7871847C50921C4F6A784E3D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_DBCC43BD7338AA54B1F2BB1368D59976"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_B88A49CE40C9CD286D9008072F1929EB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+    }
+    "Configurations"
+    {
+        "Debug"
+        {
+        "DisplayName" = "8:Debug"
+        "IsDebugOnly" = "11:TRUE"
+        "IsReleaseOnly" = "11:FALSE"
+        "OutputFilename" = "8:Debug\\InitlizerInstaller_Sajet2.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+        }
+        "Release"
+        {
+        "DisplayName" = "8:Release"
+        "IsDebugOnly" = "11:FALSE"
+        "IsReleaseOnly" = "11:TRUE"
+        "OutputFilename" = "8:Release\\InitlizerInstaller_Sajet2.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+        }
+    }
+    "Deployable"
+    {
+        "CustomAction"
+        {
+        }
+        "DefaultFeature"
+        {
+        "Name" = "8:DefaultFeature"
+        "Title" = "8:"
+        "Description" = "8:"
+        }
+        "ExternalPersistence"
+        {
+            "LaunchCondition"
+            {
+                "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_CAC67203BE5648138031DA51AF64F95C"
+                {
+                "Name" = "8:.NET Framework"
+                "Message" = "8:[VSDNETMSG]"
+                "FrameworkVersion" = "8:.NETFramework,Version=v4.7.2"
+                "AllowLaterVersions" = "11:FALSE"
+                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=863262"
+                }
+            }
+        }
+        "File"
+        {
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A77CCECA67A4EE38BE158922D24F367"
+            {
+            "SourcePath" = "8:..\\..\\..\\MES\\Sajet2\\Connect Driver\\driver\\SajetConnect.dll"
+            "TargetName" = "8:SajetConnect.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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}:_26DE58F16DE805EBB03819CFE8E5F976"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                "ScatterAssemblies"
+                {
+                    "_26DE58F16DE805EBB03819CFE8E5F976"
+                    {
+                    "Name" = "8:System.Net.Http.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:System.Net.Http.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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}:_330207E296364CE0BFA2933846203104"
+            {
+            "SourcePath" = "8:..\\AwInitilizer\\Cultures\\StringResource.zh-CHS.xaml"
+            "TargetName" = "8:StringResource.zh-CHS.xaml"
+            "Tag" = "8:"
+            "Folder" = "8:_69A6831DCF254CD38086AB8730604CE9"
+            "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:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_38236D30418E44BFB785F375FB6E695A"
+            {
+            "SourcePath" = "8:config.ini"
+            "TargetName" = "8:config.ini"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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}:_3EA005FD7871847C50921C4F6A784E3D"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:PhihongSystemID, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_3EA005FD7871847C50921C4F6A784E3D"
+                    {
+                    "Name" = "8:PhihongSystemID.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:PhihongSystemID.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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}:_89209DC6A8B3498099C558B366509478"
+            {
+            "SourcePath" = "8:..\\AwInitilizer\\Cultures\\StringResource.zh-TW.xaml"
+            "TargetName" = "8:StringResource.zh-TW.xaml"
+            "Tag" = "8:"
+            "Folder" = "8:_69A6831DCF254CD38086AB8730604CE9"
+            "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}:_B88A49CE40C9CD286D9008072F1929EB"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_B88A49CE40C9CD286D9008072F1929EB"
+                    {
+                    "Name" = "8:Newtonsoft.Json.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Newtonsoft.Json.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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}:_C56F351EED0D473C8C91FFD4ACE607E0"
+            {
+            "SourcePath" = "8:..\\..\\..\\MES\\Sajet2\\Connect Driver\\driver\\SajetConnect.ini"
+            "TargetName" = "8:SajetConnect.ini"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CBAAAD8B413D43CEB3576E78C76BB64C"
+            {
+            "SourcePath" = "8:..\\..\\..\\MES\\Sajet2\\Connect Driver\\driver\\SAJET.INI"
+            "TargetName" = "8:SAJET.INI"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CE59ED9B4E2D416895DC495AC1D0814C"
+            {
+            "SourcePath" = "8:..\\AwInitilizer\\Cultures\\StringResource.xaml"
+            "TargetName" = "8:StringResource.xaml"
+            "Tag" = "8:"
+            "Folder" = "8:_69A6831DCF254CD38086AB8730604CE9"
+            "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}:_DBCC43BD7338AA54B1F2BB1368D59976"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_DBCC43BD7338AA54B1F2BB1368D59976"
+                    {
+                    "Name" = "8:RestSharp.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:RestSharp.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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}:_F5941CF2A2414414B709B2B9F4989BF4"
+            {
+            "SourcePath" = "8:..\\AwInitilizer\\Cultures\\StringResource.en-US.xaml"
+            "TargetName" = "8:StringResource.en-US.xaml"
+            "Tag" = "8:"
+            "Folder" = "8:_69A6831DCF254CD38086AB8730604CE9"
+            "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}:_F7B4996F823BE05F60488C151398DC83"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:MesAdaptor, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_F7B4996F823BE05F60488C151398DC83"
+                    {
+                    "Name" = "8:MesAdaptor.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:MesAdaptor.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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"
+        {
+        }
+        "Folder"
+        {
+            "{1525181F-901A-416C-8A58-119130FE478E}:_68E976BCF18C43E4A2242EAE6E6A20BA"
+            {
+            "Name" = "8:#1916"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:DesktopFolder"
+                "Folders"
+                {
+                }
+            }
+            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_E5F879CDCC274890A7E702C0B4B6B46A"
+            {
+            "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+            "Name" = "8:#1925"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:TARGETDIR"
+                "Folders"
+                {
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_0B2E5AD437DD43CD9B4F4EEF5BAA1AE9"
+                    {
+                    "Name" = "8:Firmware"
+                    "AlwaysCreate" = "11:TRUE"
+                    "Condition" = "8:"
+                    "Transitive" = "11:FALSE"
+                    "Property" = "8:_6FB7FDA128A74C0AAC80B95343AB03A7"
+                        "Folders"
+                        {
+                        }
+                    }
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_69A6831DCF254CD38086AB8730604CE9"
+                    {
+                    "Name" = "8:Cultures"
+                    "AlwaysCreate" = "11:FALSE"
+                    "Condition" = "8:"
+                    "Transitive" = "11:FALSE"
+                    "Property" = "8:_CF07B64679EE41E1B37A23770BC3ABD3"
+                        "Folders"
+                        {
+                        }
+                    }
+                }
+            }
+            "{1525181F-901A-416C-8A58-119130FE478E}:_EBB0C232A96140F694290CE37EBF1214"
+            {
+            "Name" = "8:#1919"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:ProgramMenuFolder"
+                "Folders"
+                {
+                }
+            }
+        }
+        "LaunchCondition"
+        {
+        }
+        "Locator"
+        {
+        }
+        "MsiBootstrapper"
+        {
+        "LangId" = "3:1033"
+        "RequiresElevation" = "11:FALSE"
+        }
+        "Product"
+        {
+        "Name" = "8:Microsoft Visual Studio"
+        "ProductName" = "8:DCInitializerr_Sajet2"
+        "ProductCode" = "8:{BE2192DC-2141-409D-88DA-26F700144208}"
+        "PackageCode" = "8:{A0437D30-FE98-40E1-A1D5-E10A37AF8EA4}"
+        "UpgradeCode" = "8:{DD5CD169-3383-4E4A-B378-60D5B97A3657}"
+        "AspNetVersion" = "8:4.0.30319.0"
+        "RestartWWWService" = "11:FALSE"
+        "RemovePreviousVersions" = "11:FALSE"
+        "DetectNewerInstalledVersion" = "11:TRUE"
+        "InstallAllUsers" = "11:FALSE"
+        "ProductVersion" = "8:1.5.1"
+        "Manufacturer" = "8:8019"
+        "ARPHELPTELEPHONE" = "8:"
+        "ARPHELPLINK" = "8:"
+        "Title" = "8:InitlizerInstaller_Sajet2"
+        "Subject" = "8:"
+        "ARPCONTACT" = "8:8019"
+        "Keywords" = "8:"
+        "ARPCOMMENTS" = "8:"
+        "ARPURLINFOABOUT" = "8:"
+        "ARPPRODUCTICON" = "8:"
+        "ARPIconIndex" = "3:0"
+        "SearchPath" = "8:"
+        "UseSystemSearchPath" = "11:TRUE"
+        "TargetPlatform" = "3:0"
+        "PreBuildEvent" = "8:"
+        "PostBuildEvent" = "8:"
+        "RunPostBuildEvent" = "3:0"
+        }
+        "Registry"
+        {
+            "HKLM"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_C232531752AF459EBCE61548427FEBE0"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_85D11183BF654169A8BAD2F611B64BB2"
+                            {
+                            "Name" = "8:[Manufacturer]"
+                            "Condition" = "8:"
+                            "AlwaysCreate" = "11:FALSE"
+                            "DeleteAtUninstall" = "11:FALSE"
+                            "Transitive" = "11:FALSE"
+                                "Keys"
+                                {
+                                }
+                                "Values"
+                                {
+                                }
+                            }
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCU"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_71C38F7CFF8344548CD115159D1D7612"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_5328A1C3D3E4462AA5ACC7904D8E837D"
+                            {
+                            "Name" = "8:[Manufacturer]"
+                            "Condition" = "8:"
+                            "AlwaysCreate" = "11:FALSE"
+                            "DeleteAtUninstall" = "11:FALSE"
+                            "Transitive" = "11:FALSE"
+                                "Keys"
+                                {
+                                }
+                                "Values"
+                                {
+                                }
+                            }
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCR"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKU"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKPU"
+            {
+                "Keys"
+                {
+                }
+            }
+        }
+        "Sequences"
+        {
+        }
+        "Shortcut"
+        {
+        }
+        "UserInterface"
+        {
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_3C90F3817BC5482DA633A05A00CAEF24"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_49D5FE6103A1476DBD7A880256D0EFFB"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:1"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_597035BE5F3F425489DB676B472652CF"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8FC317B5FB364E8183F86C3CB813C2B6"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D6FFE6BB4DFA4167B355BB395E5B7A2A"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "InstallAllUsersVisible"
+                            {
+                            "Name" = "8:InstallAllUsersVisible"
+                            "DisplayName" = "8:#1059"
+                            "Description" = "8:#1159"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_4C839FAA510F4DADA15DA3A04B82C476"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:2"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_89F74B0A3F544286BA7DCFA727A0BE25"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_CA8F2970ADB8426B9F612F2455437FEA"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F83A6FD02137423E8F72AD8E69C79CA2"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_69205A380B4347E294426A72890B2FE1"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:1"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8CDBF56ADFB646BE823FBB835509EA93"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "UpdateText"
+                            {
+                            "Name" = "8:UpdateText"
+                            "DisplayName" = "8:#1058"
+                            "Description" = "8:#1158"
+                            "Type" = "3:15"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1258"
+                            "DefaultValue" = "8:#1258"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_7FEDD3D6501A4B4A97393F585E9A7C9B"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:2"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D0E8E014486C4D4F94813BF4544BAB4A"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B095079A59A5498DBEF5A6FFC3512592"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:1"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F59E6CDE9CC44EDB8DC2E805179383CA"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_CD19DF9CEE99498793D84286119B0443"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:2"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_146ADBE68F524D16ADDA7BA3CFC58925"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_FEF8B8CB2D994BD0A297BD2031B523AD"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"
+            }
+        }
+        "MergeModule"
+        {
+        }
+        "ProjectOutput"
+        {
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1E2630DF7F31454B836B15CC7791A115"
+            {
+            "SourcePath" = "8:..\\AwInitilizer\\obj\\Release\\AwInitilizer.exe"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"
+            "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:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{7A23D514-38E1-423E-9238-464B0E2AFCC0}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
+        }
+    }
+}

+ 6 - 0
InitlizerInstaller_Sajet2/config.ini

@@ -0,0 +1,6 @@
+{
+"FirmwareRoot":"./Firmware",
+"Language":"en-US",
+"MES":"sajet2",
+"MechineCode":"ATC_TEST01"
+}

+ 0 - 5
MesAdaptor/MesAdaptor.csproj

@@ -51,11 +51,6 @@
     <Compile Include="SajetConnectAdapter.cs" />
     <Compile Include="SajetConnectShinewave.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="SajetConnect.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PhihongSystemID\PhihongSystemID.csproj">
       <Project>{82536d82-f84b-47a5-a7f3-c668124188c5}</Project>

+ 1 - 1
MesAdaptor/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.5.0.0")]
 [assembly: AssemblyVersion("1.5.0.0")]
 [assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("652a2f3")]
+[assembly: AssemblyInformationalVersion("c927cfd")]

+ 69 - 6
MesAdaptor/SajectConnectSajet2.cs

@@ -19,7 +19,7 @@ namespace MesAdaptor
         private readonly string _MechineCode;
         public SajectConnectSajet2(string MechineCode)
         {
-            if (string.IsNullOrEmpty(_MechineCode))
+            if (string.IsNullOrEmpty(MechineCode))
             {
                 throw new Exception("MechineCode cannot not be empty");
             }
@@ -82,6 +82,21 @@ namespace MesAdaptor
             return false;
         }
 
+        //public bool SajetTransSnCheck(string partNO,string sn)
+        //{
+        //    var msg = string.Format("{0};{1};;", partNO, sn);
+
+        //    if (SajetTransData(CMD.SnCheck, ref msg))
+        //    {
+        //        if (string.IsNullOrEmpty(msg) || msg.StartsWith("NG"))
+        //        {
+        //            return false;
+        //        }
+        //        return true;
+        //    }
+        //    return false;
+        //}
+
         public bool SajetTranFinishSuccess()
         {
             if (string.IsNullOrEmpty(userId))
@@ -89,7 +104,7 @@ namespace MesAdaptor
             if (systemID == null)
                 return false;
             //string msg = userId + ";" + systemID.ToString() + ";";
-            string msg = string.Format("{0};{1};{2}:0;", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString());
+            string msg = string.Format("{0};{1};{2};{3}:0;", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString());
 
             if (string.IsNullOrEmpty(msg))
                 return false;
@@ -101,6 +116,19 @@ namespace MesAdaptor
             return SajetTransData(CMD.Report, ref msg);
         }
 
+        //public bool SajetTranFinishSuccess(string partNO, string sn)
+        //{
+        //    if (string.IsNullOrEmpty(userId))
+        //        return false;
+        //    //string msg = userId + ";" + systemID.ToString() + ";";
+        //    string msg = string.Format("{0};{1};{2};{3}:0;", userId, _MechineCode, partNO, sn);
+
+        //    if (string.IsNullOrEmpty(msg))
+        //        return false;
+
+        //    return SajetTransData(CMD.Report, ref msg);
+        //}
+
         public bool SajetTranFinishFail(MesErrorCode errorCode)
         {
             if (string.IsNullOrEmpty(userId))
@@ -108,12 +136,12 @@ namespace MesAdaptor
             if (systemID == null)
                 return false;
             //string msg = userId + ";" + systemID.ToString() + ";";
-            string msg = string.Format("{0};{1};{2}:{3};", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString(), errorCode);
+            string msg = string.Format("{0};{1};{2};{3}:1:", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString());
 
             if (string.IsNullOrEmpty(msg))
                 return false;
 
-            msg += $"NG;{errorCode};";  //E114
+            msg += $"{errorCode};";  //E114
 
 #if DEBUG
             return true;
@@ -122,6 +150,21 @@ namespace MesAdaptor
             return SajetTransData(CMD.Report, ref msg);
         }
 
+        //public bool SajetTranFinishFail(string partNO, string sn, MesErrorCode errorCode)
+        //{
+        //    if (string.IsNullOrEmpty(userId))
+        //        return false;
+        //    //string msg = userId + ";" + systemID.ToString() + ";";
+        //    string msg = string.Format("{0};{1};{2};{3}:1:", userId, _MechineCode, partNO, sn);
+
+        //    if (string.IsNullOrEmpty(msg))
+        //        return false;
+
+        //    msg += $"{errorCode};";  //E114
+
+        //    return SajetTransData(CMD.Report, ref msg);
+        //}
+
         [Obsolete]
         public string SajetTransRegisterHeader(string model, string header)
         {
@@ -130,16 +173,36 @@ namespace MesAdaptor
 
         public bool SajetTransReport(Dictionary<string, string> reportPair)
         {
+            if (string.IsNullOrEmpty(userId))
+                return false;
+            if (systemID == null)
+                return false;
+
             var totalResult = true;
-            foreach(var pair in reportPair)
+            foreach (var pair in reportPair)
             {
-                var msg = string.Format("{0};{1};{2};{3};{4}:{5};", userId,_MechineCode,systemID.ModelName.ToString(),systemID.ToString(),pair.Key,pair.Value);
+                var msg = string.Format("{0};{1};{2};{3};{4}:{5};", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString(), pair.Key, pair.Value);
                 var result = SajetTransData(CMD.ValueReport, ref msg);
                 totalResult &= result;
             }
             return totalResult;
         }
 
+        //public bool SajetTransReport(string partNO, string no, Dictionary<string, string> reportPair)
+        //{
+        //    if (string.IsNullOrEmpty(userId))
+        //        return false;
+
+        //    var totalResult = true;
+        //    foreach (var pair in reportPair)
+        //    {
+        //        var msg = string.Format("{0};{1};{2};{3};{4}:{5};", userId, _MechineCode, partNO, no, pair.Key, pair.Value);
+        //        var result = SajetTransData(CMD.ValueReport, ref msg);
+        //        totalResult &= result;
+        //    }
+        //    return totalResult;
+        //}
+
         [Obsolete]
         public bool SajetTransReport(Dictionary<string, int> resultPair, Dictionary<string, string> codePair)
         {

+ 1 - 1
MesAdaptor/SajetConnect.cs

@@ -21,7 +21,7 @@ namespace MesAdaptor
         public static ISajetConnect Instance { get; set; }
 
         public static bool SajetTransStart() => Instance.SajetTransStart();
-        public static bool SajetTransClose() => Instance.SajetTransClose();
+        public static bool SajetTransClose() => Instance == null ? false : Instance.SajetTransClose();
         public static bool SajetTransSignIn(ref string data) => Instance.SajetTransSignIn(ref data);
         public static bool SajetTransWoCheck(ref string workOrder) => Instance.SajetTransWoCheck(ref workOrder);
         public static bool SajetTransSnCheck(ref string serialNumber) => Instance.SajetTransWoCheck(ref serialNumber);

BIN
MesAdaptor/SajetConnect.dll


+ 1 - 1
PhihongSystemID/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.5.0.0")]
 [assembly: AssemblyVersion("1.5.0.0")]
 [assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("652a2f3")]
+[assembly: AssemblyInformationalVersion("c927cfd")]

+ 10 - 1
PhihongSystemID/SystemID.cs

@@ -133,7 +133,8 @@ namespace PhihongSystemID
             DC_OutputpowerCabinet,
             DC_Infy_30KW_GB,
             DC_PowerRack,
-            DC_OutputCommunicationBox
+            DC_OutputCommunicationBox,
+            DC_to_DC_EVSE_Outout_Power_Cabinet
         }
 
         public enum EVSE_InputConfig
@@ -243,6 +244,9 @@ namespace PhihongSystemID
                 case "AP":
                     model.Type = EVSE_TYPE.AC_Pedestal;
                     break;
+                case "AX":
+                    model.Type = EVSE_TYPE.AC_Wallmount_Excellent;
+                    break;
                 case "DW":
                     model.Type = EVSE_TYPE.DC_Wallmount;
                     break;
@@ -270,6 +274,9 @@ namespace PhihongSystemID
                 case "DX":
                     model.Type = EVSE_TYPE.DC_OutputCommunicationBox;
                     break;
+                case "DB":
+                    model.Type = EVSE_TYPE.DC_to_DC_EVSE_Outout_Power_Cabinet;
+                    break;
                 default:
                     return false;
             }
@@ -439,6 +446,8 @@ namespace PhihongSystemID
                         break;
                     case "G":
                     case "B":
+                    case "H":
+                    case "A":
                         model.ConnectorTypes[index] = ConnectorType.GBT;
                         break;
                     case "C":