change setting to file setting

seperate setup project with setting file
update to version v1.3.2

AwInitilizer/App.config

@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="AwInitilizer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
     </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-    <userSettings>
-        <AwInitilizer.Properties.Settings>
-            <setting name="FirmwareRoot" serializeAs="String">
-                <value>./Firmware</value>
-            </setting>
-            <setting name="Language" serializeAs="String">
-                <value>zh-chs</value>
-            </setting>
-            <setting name="MES" serializeAs="String">
-                <value>shinewave</value>
-            </setting>
-        </AwInitilizer.Properties.Settings>
-    </userSettings>
   <runtime>
     <gcConcurrent enabled="false"/>
   </runtime>

AwInitilizer/App.xaml.cs

@@ -33,7 +33,7 @@ namespace AwInitilizer
 
         private void SetUiLanguage()
         {
-            var langSetting = AwInitilizer.Properties.Settings.Default.Language;
+            var langSetting = AppSettingConfig.Language;
 
             if (langSetting.ToLower() == "zh-chs")
             {
@@ -47,7 +47,7 @@ namespace AwInitilizer
 
         private void SetMes()
         {
-            var mesSetting = AwInitilizer.Properties.Settings.Default.MES.ToLower();
+            var mesSetting = AppSettingConfig.MES.ToLower();
 
             if (mesSetting == "php" || mesSetting == "shinewave")
             {

AwInitilizer/Initilizer.csproj

@@ -72,12 +72,14 @@
     <Compile Include="Converter\PressStatusConverter.cs" />
     <Compile Include="Cultures\CulturesHelper.cs" />
     <Compile Include="KeyinListener.cs" />
+    <Compile Include="Model\AppSettingConfig.cs" />
     <Compile Include="ProcedureLog\LogWriter.cs" />
     <Compile Include="Procedure\FirmwareBundleUploadProcedure.cs" />
     <Compile Include="Procedure\FirmwareCheckVersionProcedure.cs" />
     <Compile Include="Procedure\FirmwareUploadProcedure.cs" />
     <Compile Include="Procedure\VersionLogProcedure.cs" />
     <Compile Include="Procedure\WifRssiCheckProcedure.cs" />
+    <Compile Include="SettingConfig.cs" />
     <Compile Include="SigninDialog.xaml.cs">
       <DependentUpon>SigninDialog.xaml</DependentUpon>
     </Compile>

AwInitilizer/MainWindow.xaml.cs

@@ -539,7 +539,7 @@ namespace AwInitilizer
             string settingRootFolder;
             try
             {
-                var defaultPath = Properties.Settings.Default.FirmwareRoot;
+                var defaultPath = AppSettingConfig.FirmwareRoot;
                 if (string.IsNullOrEmpty(defaultPath))
                 {
                     defaultPath = ".\\";
@@ -826,6 +826,7 @@ namespace AwInitilizer
 
             if (signinDialog.DialogResult != true)
             {
+                SajetConnect.SajetTransClose();
                 App.Current.Shutdown();
             }
             else

AwInitilizer/Model/AppSettingConfig.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AwInitilizer.Model
+{
+    class AppSettingConfig
+    {
+        public string FirmwareRoot { get; set; }
+        public string Language { get; set; }
+        public string MES { get; set; }
+    }
+}

AwInitilizer/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("11c7a60")]
+// [assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyInformationalVersion("38b3e6e")]

AwInitilizer/Properties/Settings.Designer.cs

@@ -22,41 +22,5 @@ namespace AwInitilizer.Properties {
                 return defaultInstance;
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("./Firmware")]
-        public string FirmwareRoot {
-            get {
-                return ((string)(this["FirmwareRoot"]));
-            }
-            set {
-                this["FirmwareRoot"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("zh-chs")]
-        public string Language {
-            get {
-                return ((string)(this["Language"]));
-            }
-            set {
-                this["Language"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("shinewave")]
-        public string MES {
-            get {
-                return ((string)(this["MES"]));
-            }
-            set {
-                this["MES"] = value;
-            }
-        }
     }
 }

AwInitilizer/Properties/Settings.settings

@@ -1,15 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="AwInitilizer.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
   <Profiles />
-  <Settings>
-    <Setting Name="FirmwareRoot" Type="System.String" Scope="User">
-      <Value Profile="(Default)">./Firmware</Value>
-    </Setting>
-    <Setting Name="Language" Type="System.String" Scope="User">
-      <Value Profile="(Default)">zh-chs</Value>
-    </Setting>
-    <Setting Name="MES" Type="System.String" Scope="User">
-      <Value Profile="(Default)">shinewave</Value>
-    </Setting>
-  </Settings>
+  <Settings />
 </SettingsFile>

AwInitilizer/SettingConfig.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AwInitilizer
+{
+    public class AppSettingConfig
+    {
+        public static string FirmwareRoot
+        { 
+            get
+            {
+                if(Instance == null)
+                {
+                    Instance = new AppSettingConfig();
+                }
+                return Instance._FirmwareRoot;
+            }
+        }
+
+        public static string Language
+        {
+            get
+            {
+                if (Instance == null)
+                {
+                    Instance = new AppSettingConfig();
+                }
+                return Instance._Language;
+            }
+        }
+
+        public static string MES
+        {
+            get
+            {
+                if (Instance == null)
+                {
+                    Instance = new AppSettingConfig();
+                }
+                return Instance._MES;
+            }
+        }
+
+        private static AppSettingConfig Instance;
+
+        private string _FirmwareRoot, _Language, _MES;
+
+        private static string settingFileName = "config.ini";
+
+        public AppSettingConfig()
+        {
+            if(!File.Exists(settingFileName))
+            {
+                LoadDefaultSetting();
+            }
+            else
+            {
+                LoadSettingFromDefaultFile();
+            }
+        }
+
+        private void LoadSettingFromDefaultFile()
+        {
+            try
+            {
+                LoadDefaultSetting();
+
+                var configStr = File.ReadAllText(settingFileName);
+                var config = Newtonsoft.Json.JsonConvert.DeserializeObject<Model.AppSettingConfig>(configStr);
+                _FirmwareRoot = config.FirmwareRoot;
+                _Language = config.Language;
+                _MES = config.MES;
+            }
+            catch
+            {
+                
+            }
+        }
+
+        private void LoadDefaultSetting()
+        {
+            _FirmwareRoot = "./Firmware";
+            _Language = "zh-chs";
+            _MES = "shinewave";
+        }
+    }
+}

AwInitlizerInstaller__Shinewave/config.ini

@@ -0,0 +1,5 @@
+{
+"FirmwareRoot":"./Firmware",
+"Language":"zh-chs",
+"MES":"shinewave",
+}

GitVersion.yml

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

Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("11c7a60")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyInformationalVersion("38b3e6e")]
 

InitlizerInstaller_Sajet/config.ini

@@ -0,0 +1,5 @@
+{
+"FirmwareRoot":"./Firmware",
+"Language":"en-US",
+"MES":"sajet",
+}

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.3.0.0")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("11c7a60")]
+// [assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyInformationalVersion("38b3e6e")]

MesAdaptor/SajectConnectSajet.cs

@@ -12,7 +12,7 @@ namespace MesAdaptor
         {
             Signin = 1,
             SnCheck = 2,
-            WoCheck = 14,
+            WoCheck = -1,
             Report = 3,
             Log = 4,
             HeaderRegister = 8,
@@ -47,27 +47,7 @@ namespace MesAdaptor
         private static string WorkOrder = "";
         public static bool SajetTransWoCheck(ref string workOrder)
         {
-            if (string.IsNullOrEmpty(userId))
-                return false;
-            if (workOrder == null)
-                workOrder = "";
-            var msg = userId + ";" + workOrder;
-
-            if (SajetTransData(CMD.WoCheck, ref msg))
-            {
-                if (string.IsNullOrEmpty(msg) || msg.StartsWith("NG"))
-                {
-                    WorkOrder = "";
-                    return false;
-                }
-                else
-                {
-                    WorkOrder = workOrder;
-                    return true;
-                }
-            }
-            WorkOrder = "";
-            return false;
+            return true;
         }
 
         private static string SN;

PhihongSystemID/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.3.0.0")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyInformationalVersion("11c7a60")]
+// [assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyInformationalVersion("38b3e6e")]