update en UI

add trim to mes report value

AwInitilizer.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Initilizer", "AwInitilizer\Initilizer.csproj", "{7A23D514-38E1-423E-9238-464B0E2AFCC0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Initializer", "AwInitilizer\Initializer.csproj", "{7A23D514-38E1-423E-9238-464B0E2AFCC0}"
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "InitlizerInstaller_Shinewave", "AwInitlizerInstaller__Shinewave\AwInitlizerInstaller.vdproj", "{9A5A71D0-545F-43BB-9411-467C30365306}"
 EndProject

AwInitilizer/MainWindow.xaml

@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:AwInitilizer.Resx"
     x:Name="uxManinWindow"
-    Title="Initlizer"
+    Title="Initializer"
     Width="1920"
     Height="1080"
     input:InputMethod.IsInputMethodEnabled="False"

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.10.0.0")]
-[assembly: AssemblyVersion("1.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
-[assembly: AssemblyInformationalVersion("edae30f")]
+// [assembly: AssemblyVersion("1.10.1.0")]
+[assembly: AssemblyVersion("1.10.1.0")]
+[assembly: AssemblyFileVersion("1.10.1.0")]
+[assembly: AssemblyInformationalVersion("b0b84bb")]

AwInitilizer/Resx/AppResources.Designer.cs

@@ -214,7 +214,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sim ICCID.
+        ///   Looks up a localized string similar to SIM ICCID.
         /// </summary>
         public static string ICCID {
             get {
@@ -232,7 +232,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sim IMSI.
+        ///   Looks up a localized string similar to SIM IMSI.
         /// </summary>
         public static string IMSI {
             get {
@@ -385,7 +385,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to logout.
+        ///   Looks up a localized string similar to Sign out.
         /// </summary>
         public static string Logout {
             get {
@@ -457,7 +457,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enter ID.
+        ///   Looks up a localized string similar to Enter User ID.
         /// </summary>
         public static string SigninDialogEnterIDHint {
             get {
@@ -466,7 +466,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to WorkOrder Error.
+        ///   Looks up a localized string similar to Work Order Number Error.
         /// </summary>
         public static string SigninDialogEnterWOError {
             get {
@@ -475,7 +475,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enter WorkOrder.
+        ///   Looks up a localized string similar to Enter Work Order Number.
         /// </summary>
         public static string SigninDialogEnterWOHint {
             get {
@@ -493,7 +493,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sigin in.
+        ///   Looks up a localized string similar to Sign in.
         /// </summary>
         public static string SigninDialogTitle {
             get {
@@ -502,7 +502,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 4G Sim Card Inserted.
+        ///   Looks up a localized string similar to 4G SIM Card Inserted.
         /// </summary>
         public static string SimStatus {
             get {
@@ -592,7 +592,7 @@ namespace AwInitilizer.Resx {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Work Order.
+        ///   Looks up a localized string similar to Work Order Number.
         /// </summary>
         public static string WorkOrder {
             get {

AwInitilizer/Resx/AppResources.resx

@@ -121,16 +121,16 @@
     <value>OK</value>
   </data>
   <data name="SigninDialogTitle" xml:space="preserve">
-    <value>Sigin in</value>
+    <value>Sign in</value>
   </data>
   <data name="SigninDialogEnterIDHint" xml:space="preserve">
-    <value>Enter ID</value>
+    <value>Enter User ID</value>
   </data>
   <data name="SigninDialogEnterWOHint" xml:space="preserve">
-    <value>Enter WorkOrder</value>
+    <value>Enter Work Order Number</value>
   </data>
   <data name="SigninDialogEnterWOError" xml:space="preserve">
-    <value>WorkOrder Error</value>
+    <value>Work Order Number Error</value>
   </data>
   <data name="SigninDialogEnterIDError" xml:space="preserve">
     <value>ID Error</value>
@@ -142,13 +142,13 @@
     <value>Account</value>
   </data>
   <data name="Logout" xml:space="preserve">
-    <value>logout</value>
+    <value>Sign out</value>
   </data>
   <data name="UserID" xml:space="preserve">
     <value>User ID</value>
   </data>
   <data name="WorkOrder" xml:space="preserve">
-    <value>Work Order</value>
+    <value>Work Order Number</value>
   </data>
   <data name="BarcodeSetting" xml:space="preserve">
     <value>Barcode Setting</value>
@@ -160,13 +160,13 @@
     <value>Serial Number</value>
   </data>
   <data name="SimStatus" xml:space="preserve">
-    <value>4G Sim Card Inserted</value>
+    <value>4G SIM Card Inserted</value>
   </data>
   <data name="ICCID" xml:space="preserve">
-    <value>Sim ICCID</value>
+    <value>SIM ICCID</value>
   </data>
   <data name="IMSI" xml:space="preserve">
-    <value>Sim IMSI</value>
+    <value>SIM IMSI</value>
   </data>
   <data name="FirmwareVersion" xml:space="preserve">
     <value>Firmware version</value>

AwInitilizer/SigninDialog.xaml

@@ -5,7 +5,7 @@
     xmlns:local="clr-namespace:AwInitilizer"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:AwInitilizer.Resx"
-    Title="Signin"
+    Title="Sign in"
     Width="800"
     Height="600"
     FontSize="36"

AwInitilizer/SigninDialog.xaml.cs

@@ -44,7 +44,8 @@ namespace AwInitilizer
             if (CheckIsMesDisableAccount())
             {
                 //SajetConnect.IsEmsEnabled = false;
-                SajetConnect.Instance = new SajectConnectTest();
+                //SajetConnect.Instance = new SajectConnectTest();
+                SajetConnect.SetMes("test");
                 DialogResult = true;
                 this.Close();
                 return;
@@ -111,19 +112,20 @@ namespace AwInitilizer
         private void SetMes()
         {
             var mesSetting = AppSettingConfig.MES.ToLower();
+            SajetConnect.SetMes(mesSetting, AppSettingConfig.MechineCode);
 
-            if (mesSetting == "php" || mesSetting == "shinewave")
-            {
-                SajetConnect.Instance = new SajetConnectShinewave();
-            }
-            else if (mesSetting == "phv" || mesSetting == "sajet")
-            {
-                SajetConnect.Instance = new SajectConnectSajet();
-            }
-            else if (mesSetting == "phv" || mesSetting == "sajet2")
-            {
-                SajetConnect.Instance = new SajectConnectSajet2(AppSettingConfig.MechineCode);
-            }
+            //if (mesSetting == "php" || mesSetting == "shinewave")
+            //{
+            //    SajetConnect.Instance = new SajetConnectShinewave();
+            //}
+            //else if (mesSetting == "phv" || mesSetting == "sajet")
+            //{
+            //    SajetConnect.Instance = new SajectConnectSajet();
+            //}
+            //else if (mesSetting == "phv" || mesSetting == "sajet2")
+            //{
+            //    SajetConnect.Instance = new SajectConnectSajet2(AppSettingConfig.MechineCode);
+            //}
         }
     }
 }

AwInitlizerInstaller__Shinewave/AwInitlizerInstaller.vdproj

@@ -64,7 +64,7 @@
         "Entry"
         {
         "MsmKey" = "8:_B1FBDC82E7E41681C1E9AFA9010D95E6"
-        "OwnerKey" = "8:_CBCE9B8169E45416F5538B74ECB61EE3"
+        "OwnerKey" = "8:_F08EBB091DD37320D1C2E50E8832071F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -75,7 +75,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_CBCE9B8169E45416F5538B74ECB61EE3"
+        "MsmKey" = "8:_F08EBB091DD37320D1C2E50E8832071F"
         "OwnerKey" = "8:_75A660E899044A1CAA106DA8B79AB179"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -100,25 +100,25 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CBCE9B8169E45416F5538B74ECB61EE3"
+        "OwnerKey" = "8:_76EFA1FBF8D720C3406B63D63277EE1E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_76EFA1FBF8D720C3406B63D63277EE1E"
+        "OwnerKey" = "8:_4AEE97E130964665E33D636753B2D15C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_4AEE97E130964665E33D636753B2D15C"
+        "OwnerKey" = "8:_345BC9EA136298FFA558E53796E8ACAC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_345BC9EA136298FFA558E53796E8ACAC"
+        "OwnerKey" = "8:_F08EBB091DD37320D1C2E50E8832071F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -319,7 +319,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AwInitilizer.resources, Version=1.9.5.0, Culture=zh-CHS, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:AwInitilizer.resources, Version=1.10.1.0, Culture=zh-CHS, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_5953AA619F714E40AA045177A7CEBEB0"
@@ -459,14 +459,14 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CBCE9B8169E45416F5538B74ECB61EE3"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F08EBB091DD37320D1C2E50E8832071F"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MesAdaptor, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MesAdaptor, Version=1.10.1.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_CBCE9B8169E45416F5538B74ECB61EE3"
+                    "_F08EBB091DD37320D1C2E50E8832071F"
                     {
                     "Name" = "8:MesAdaptor.dll"
                     "Attributes" = "3:512"
@@ -587,7 +587,7 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:DCInitializerr"
+        "ProductName" = "8:DCInitializer"
         "ProductCode" = "8:{57BF893C-BD30-40C3-8C04-55FFFC6E3FFE}"
         "PackageCode" = "8:{78DF6F27-8A0C-4ACF-B67B-5FBAC01AF6A6}"
         "UpgradeCode" = "8:{926B8A82-19A1-436D-A0E4-216EF638690B}"
@@ -602,7 +602,7 @@
         "ARPHELPLINK" = "8:"
         "Title" = "8:DCInitializer"
         "Subject" = "8:"
-        "ARPCONTACT" = "8:8019"
+        "ARPCONTACT" = "8:Zerova"
         "Keywords" = "8:"
         "ARPCOMMENTS" = "8:"
         "ARPURLINFOABOUT" = "8:"
@@ -1124,7 +1124,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_75A660E899044A1CAA106DA8B79AB179"
             {
-            "SourcePath" = "8:..\\AwInitilizer\\obj\\Release\\AwInitilizer.exe"
+            "SourcePath" = "8:..\\AwInitilizer\\obj\\Debug\\AwInitilizer.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_DE11C1EA8CD74CA9820344EFA2A02676"

GitVersion.yml

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

Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
-[assembly: AssemblyInformationalVersion("edae30f")]
+[assembly: AssemblyVersion("1.10.1.0")]
+[assembly: AssemblyFileVersion("1.10.1.0")]
+[assembly: AssemblyInformationalVersion("b0b84bb")]
 

InitlizerInstaller_Sajet/InitlizerInstaller_Sajet.vdproj

@@ -100,7 +100,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_8181ECA24C69B23059D78716A887B0FC"
+        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -112,12 +112,6 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6C60B6A7249E43C696C8CA1698A96A54"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_D08994C3B07279ED519ACC2855583EAD"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -145,6 +139,12 @@
         "OwnerKey" = "8:_BE34693DEF4C83181737B63FE253E02E"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_8181ECA24C69B23059D78716A887B0FC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -264,7 +264,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MesAdaptor, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MesAdaptor, Version=1.10.1.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_17AAB331385F5AB0DB85106CB8F5DC4B"
@@ -468,7 +468,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AwInitilizer.resources, Version=1.9.8.0, Culture=zh-CHS, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:AwInitilizer.resources, Version=1.10.1.0, Culture=zh-CHS, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_C8A819E371294B95BA095055C4068761"
@@ -634,7 +634,7 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:InitlizerInstaller"
+        "ProductName" = "8:InitializerInstaller"
         "ProductCode" = "8:{0D5B75BB-9F05-464B-8837-4DD57CF7E644}"
         "PackageCode" = "8:{CF96C172-42E9-4E54-A492-157D550272E5}"
         "UpgradeCode" = "8:{F98D6C97-F89C-4CD6-A555-BF91183DC0E4}"
@@ -1171,7 +1171,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6C60B6A7249E43C696C8CA1698A96A54"
             {
-            "SourcePath" = "8:..\\AwInitilizer\\obj\\Release\\AwInitilizer.exe"
+            "SourcePath" = "8:..\\AwInitilizer\\obj\\Debug\\AwInitilizer.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_9946D16074B94DA1BC2DCFCB430E5F1D"

InitlizerInstaller_Sajet2/InitlizerInstaller_Sajet2.vdproj

@@ -21,6 +21,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_26DE58F16DE805EBB03819CFE8E5F976"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_38236D30418E44BFB785F375FB6E695A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -33,12 +39,36 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_45B8D0E9115946089A706CE98A3E7E15"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_5D061D39FE6C13C5C2D2B044163101C7"
+        "OwnerKey" = "8:_65F7C4019319D9E0283F48281516EF3F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_5D061D39FE6C13C5C2D2B044163101C7"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_627A5419B0044ABE888EC6EE24695C20"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_65F7C4019319D9E0283F48281516EF3F"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_79FACFFC00A74A7B81FA908023358D4E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -49,6 +79,66 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_DF66168649F83E84DB7A8817AA992279"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_E446A0778646389BDC6FD450C0C4A9E6"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_26DE58F16DE805EBB03819CFE8E5F976"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_627A5419B0044ABE888EC6EE24695C20"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_1E2630DF7F31454B836B15CC7791A115"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_E446A0778646389BDC6FD450C0C4A9E6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_DF66168649F83E84DB7A8817AA992279"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_45B8D0E9115946089A706CE98A3E7E15"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_65F7C4019319D9E0283F48281516EF3F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_5D061D39FE6C13C5C2D2B044163101C7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -144,6 +234,37 @@
         }
         "File"
         {
+            "{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}:_38236D30418E44BFB785F375FB6E695A"
             {
             "SourcePath" = "8:config.ini"
@@ -184,11 +305,73 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_45B8D0E9115946089A706CE98A3E7E15"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:FluentFTP, Version=37.0.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_45B8D0E9115946089A706CE98A3E7E15"
+                    {
+                    "Name" = "8:FluentFTP.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:FluentFTP.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:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5D061D39FE6C13C5C2D2B044163101C7"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:PhihongEv.Lib, Version=1.0.12.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_5D061D39FE6C13C5C2D2B044163101C7"
+                    {
+                    "Name" = "8:PhihongEv.Lib.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:PhihongEv.Lib.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:"
+            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_627A5419B0044ABE888EC6EE24695C20"
             {
             "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.10.1.0, Culture=zh-CHS, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_627A5419B0044ABE888EC6EE24695C20"
@@ -215,6 +398,37 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_65F7C4019319D9E0283F48281516EF3F"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:MesAdaptor, Version=1.10.1.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_65F7C4019319D9E0283F48281516EF3F"
+                    {
+                    "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:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_79FACFFC00A74A7B81FA908023358D4E"
             {
             "SourcePath" = "8:..\\..\\..\\MES\\Sajet2\\Connect Driver_5.0.2.39\\driver\\SajetConnect.ini"
@@ -255,6 +469,68 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF66168649F83E84DB7A8817AA992279"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_DF66168649F83E84DB7A8817AA992279"
+                    {
+                    "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:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E446A0778646389BDC6FD450C0C4A9E6"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_E446A0778646389BDC6FD450C0C4A9E6"
+                    {
+                    "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:"
+            }
         }
         "FileType"
         {
@@ -332,7 +608,7 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:DCInitializerr_Sajet2"
+        "ProductName" = "8:DCInitializer_Sajet2"
         "ProductCode" = "8:{BE2192DC-2141-409D-88DA-26F700144208}"
         "PackageCode" = "8:{A0437D30-FE98-40E1-A1D5-E10A37AF8EA4}"
         "UpgradeCode" = "8:{DD5CD169-3383-4E4A-B378-60D5B97A3657}"
@@ -855,7 +1131,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1E2630DF7F31454B836B15CC7791A115"
             {
-            "SourcePath" = "8:..\\AwInitilizer\\obj\\Release\\AwInitilizer.exe"
+            "SourcePath" = "8:..\\AwInitilizer\\obj\\Debug\\AwInitilizer.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E5F879CDCC274890A7E702C0B4B6B46A"

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.10.0.0")]
-[assembly: AssemblyVersion("1.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
-[assembly: AssemblyInformationalVersion("edae30f")]
+// [assembly: AssemblyVersion("1.10.1.0")]
+[assembly: AssemblyVersion("1.10.1.0")]
+[assembly: AssemblyFileVersion("1.10.1.0")]
+[assembly: AssemblyInformationalVersion("b0b84bb")]

MesAdaptor/SajetConnect.cs

@@ -18,7 +18,7 @@ namespace MesAdaptor
 
     public static class SajetConnect
     {
-        public static ISajetConnect Instance { get; set; }
+        public static ISajetConnect Instance { get; internal set; }
 
         public static bool SajetTransStart() => Instance.SajetTransStart();
         public static bool SajetTransClose() => Instance == null ? false : Instance.SajetTransClose();
@@ -30,5 +30,34 @@ namespace MesAdaptor
         public static string SajetTransRegisterHeader(string model, string header) => Instance.SajetTransRegisterHeader(model, header);
         public static bool SajetTransReport(ValueReportDatas reportPair) => Instance.SajetTransReport(reportPair);
         public static bool SajetTransLog(string data) => Instance.SajetTransLog(data);
+
+        public static void SetMes(string mesSetting = "",string mechineCode = "")
+        {
+            if (mesSetting is null)
+            {
+                SajetConnect.Instance = new SajectConnectTest();
+                return;
+            }
+            
+            mesSetting = mesSetting.ToLower();
+            switch (mesSetting)
+            {
+                case "php":
+                case "shinewave":
+                    SajetConnect.Instance = new SajetConnectShinewave();
+                    break;
+                case "phv":
+                case "sajet":
+                    SajetConnect.Instance = new SajectConnectSajet();
+                    break;
+                //case "phv":
+                case "sajet2":
+                    SajetConnect.Instance = new SajectConnectSajet2(mechineCode);
+                    break;
+                default:
+                    SajetConnect.Instance = new SajectConnectTest();
+                    break;
+            }
+        }
     }
 }

MesAdaptor/SajetConnectShinewave.cs

@@ -177,7 +177,7 @@ namespace MesAdaptor
 
             foreach (var report in reportPairs)
             {
-                msg = string.Format("{0},{1}:{2},", msgHeader, report.Key, report.Val);
+                msg = string.Format("{0},{1}:{2},", msgHeader, report.Key, report.Val.Trim());
                 var cmdResult = SajetTransData(CMD.StringValueReport, ref msg);
                 if (!cmdResult)
                     result = false;