临时提交。准备合并

75f1e8f9 · leon.huang · 2546796a · 75f1e8f9 · 75f1e8f9 · 75f1e8f9
Commit 75f1e8f9 authored Oct 24, 2020 by leon.huang
16 changed files
--- a/GcDevicePc/MDIBase.en.resx
+++ b/GcDevicePc/MDIBase.en.resx
@@ -119,187 +119,187 @@
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="UserLoginMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>173, 26</value>
+    <value>171, 24</value>
  </data>
  <data name="UserLoginMenu.Text" xml:space="preserve">
    <value>User Login</value>
  </data>
  <data name="UserLogoutMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>173, 26</value>
+    <value>171, 24</value>
  </data>
  <data name="UserLogoutMenu.Text" xml:space="preserve">
    <value>User Logout</value>
  </data>
  <data name="UserMainMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>164, 25</value>
+    <value>163, 24</value>
  </data>
  <data name="UserMainMenu.Text" xml:space="preserve">
    <value>User Management</value>
  </data>
  <data name="SystemStartMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>255, 26</value>
+    <value>253, 24</value>
  </data>
  <data name="SystemStartMenu.Text" xml:space="preserve">
    <value>System On</value>
  </data>
  <data name="SystemStopMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>255, 26</value>
+    <value>253, 24</value>
  </data>
  <data name="SystemStopMenu.Text" xml:space="preserve">
    <value>System Off</value>
  </data>
  <data name="AuxToolMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>255, 26</value>
+    <value>253, 24</value>
  </data>
  <data name="AuxToolMenu.Text" xml:space="preserve">
    <value>Aux Tools</value>
  </data>
  <data name="ParameterSettingMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>255, 26</value>
+    <value>253, 24</value>
  </data>
  <data name="ParameterSettingMenu.Text" xml:space="preserve">
    <value>Instrument Parameters</value>
  </data>
  <data name="AutoAdjustMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>255, 26</value>
+    <value>253, 24</value>
  </data>
  <data name="AutoAdjustMenu.Text" xml:space="preserve">
    <value>System Calibration</value>
  </data>
  <data name="sysconfigp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>255, 26</value>
+    <value>253, 24</value>
  </data>
  <data name="sysconfigp.Text" xml:space="preserve">
    <value>Option</value>
  </data>
  <data name="SystemMainMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 25</value>
+    <value>75, 24</value>
  </data>
  <data name="SystemMainMenu.Text" xml:space="preserve">
    <value>System</value>
  </data>
  <data name="NetWorkMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 26</value>
+    <value>273, 24</value>
  </data>
  <data name="NetWorkMenu.Text" xml:space="preserve">
    <value>Communication</value>
  </data>
  <data name="MethodBatMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 26</value>
+    <value>273, 24</value>
  </data>
  <data name="MethodBatMenu.Text" xml:space="preserve">
    <value>Auto Run</value>
  </data>
  <data name="NewMethodMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 26</value>
+    <value>273, 24</value>
  </data>
  <data name="NewMethodMenu.Text" xml:space="preserve">
    <value>New Method</value>
  </data>
  <data name="OpenMethodMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 26</value>
+    <value>273, 24</value>
  </data>
  <data name="OpenMethodMenu.Text" xml:space="preserve">
    <value>Open Method</value>
  </data>
  <data name="MethodBrowseMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 26</value>
+    <value>273, 24</value>
  </data>
  <data name="MethodBrowseMenuItem.Text" xml:space="preserve">
    <value>Method Review</value>
  </data>
  <data name="SettingSeparator.Size" type="System.Drawing.Size, System.Drawing">
-    <value>272, 6</value>
+    <value>270, 6</value>
  </data>
  <data name="GCConfigMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 26</value>
+    <value>273, 24</value>
  </data>
  <data name="GCConfigMenuItem.Text" xml:space="preserve">
    <value>Instrument Configuration</value>
  </data>
  <data name="SettingMainMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 25</value>
+    <value>70, 24</value>
  </data>
  <data name="SettingMainMenu.Text" xml:space="preserve">
    <value>Set up</value>
  </data>
  <data name="HistoryDataMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>204, 26</value>
+    <value>202, 24</value>
  </data>
  <data name="HistoryDataMenu.Text" xml:space="preserve">
    <value>Data Review</value>
  </data>
  <data name="CalibrationMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>204, 26</value>
+    <value>202, 24</value>
  </data>
  <data name="CalibrationMenu.Text" xml:space="preserve">
    <value>Data Calibration</value>
  </data>
  <data name="HistoryPicMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>204, 26</value>
+    <value>202, 24</value>
  </data>
  <data name="HistoryPicMenu.Text" xml:space="preserve">
    <value>Data Analysis</value>
  </data>
  <data name="DataMainMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>58, 25</value>
+    <value>57, 24</value>
  </data>
  <data name="DataMainMenu.Text" xml:space="preserve">
    <value>Data</value>
  </data>
  <data name="testToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 26</value>
+    <value>129, 24</value>
  </data>
  <data name="开始ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 26</value>
+    <value>129, 24</value>
  </data>
  <data name="开始ToolStripMenuItem.Text" xml:space="preserve">
    <value>Start</value>
  </data>
  <data name="停止ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 26</value>
+    <value>129, 24</value>
  </data>
  <data name="停止ToolStripMenuItem.Text" xml:space="preserve">
    <value>Stop</value>
  </data>
  <data name="取消ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 26</value>
+    <value>129, 24</value>
  </data>
  <data name="取消ToolStripMenuItem.Text" xml:space="preserve">
    <value>Cancel</value>
  </data>
  <data name="DebugMainMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 25</value>
+    <value>72, 24</value>
  </data>
  <data name="DebugMainMenu.Text" xml:space="preserve">
    <value>Debug</value>
  </data>
  <data name="AboutMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 26</value>
+    <value>219, 24</value>
  </data>
  <data name="AboutMenu.Text" xml:space="preserve">
    <value>About</value>
  </data>
  <data name="changeVsi.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 26</value>
+    <value>219, 24</value>
  </data>
  <data name="changeVsi.Text" xml:space="preserve">
    <value>Switch Version</value>
  </data>
  <data name="化合物列表ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 26</value>
+    <value>219, 24</value>
  </data>
  <data name="化合物列表ToolStripMenuItem.Text" xml:space="preserve">
    <value>List of compounds</value>
  </data>
  <data name="版本日志ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 26</value>
+    <value>219, 24</value>
  </data>
  <data name="版本日志ToolStripMenuItem.Text" xml:space="preserve">
    <value>Ver</value>
  </data>
  <data name="说明ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 26</value>
+    <value>219, 24</value>
  </data>
  <data name="说明ToolStripMenuItem.Text" xml:space="preserve">
    <value>Remarks</value>
@@ -308,20 +308,17 @@
    <value>E-mail：tetvoc@126.com</value>
  </data>
  <data name="反馈ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 26</value>
+    <value>219, 24</value>
  </data>
  <data name="反馈ToolStripMenuItem.Text" xml:space="preserve">
    <value>Feedback</value>
  </data>
  <data name="HelpMainMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>57, 25</value>
+    <value>56, 24</value>
  </data>
  <data name="HelpMainMenu.Text" xml:space="preserve">
    <value>Help</value>
  </data>
-  <data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1083, 29</value>
-  </data>
  <data name="toolStripStatusLabelusertime.Size" type="System.Drawing.Size, System.Drawing">
    <value>400, 27</value>
  </data>

--- a/GcDevicePc/MDIBase.resx
+++ b/GcDevicePc/MDIBase.resx
--- a/GcDevicePc/Program.cs
+++ b/GcDevicePc/Program.cs
@@ -23,12 +23,12 @@ namespace GcDevicePc
                {
                    if (createNew)
                    {
-                        string Language = System.Threading.Thread.CurrentThread.CurrentCulture.Name;
+                        //string Language = System.Threading.Thread.CurrentThread.CurrentCulture.Name;
-                        if(Language.Contains("en"))
+                        //if(Language.Contains("en"))
-                        {
+                        //{
-                            Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en");
+                        //    Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en");
-                        }
+                        //}
-                        //Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en");
+                        Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en");
                        Application.Run(new StartForm());
                        mutex.ReleaseMutex();
                    }

--- a/VocsSetup/GC_Control/CKVocAlgorithm.dll
+++ b/VocsSetup/GC_Control/CKVocAlgorithm.dll
--- a/VocsSetup/GC_Control/LogOperate.dll
+++ b/VocsSetup/GC_Control/LogOperate.dll
--- a/VocsSetup/GC_Control/ModbusLib.dll
+++ b/VocsSetup/GC_Control/ModbusLib.dll
--- a/VocsSetup/GC_Control/SQLiteOperate.dll
+++ b/VocsSetup/GC_Control/SQLiteOperate.dll
--- a/VocsSetup/GC_Control/SharedSpace.dll
+++ b/VocsSetup/GC_Control/SharedSpace.dll
--- a/VocsSetup/GC_Control/en/GcDevicePc.resources.dll
+++ b/VocsSetup/GC_Control/en/GcDevicePc.resources.dll
--- a/VocsSetup/GC_User/Logs/HmiLog_20201024.txt
+++ b/VocsSetup/GC_User/Logs/HmiLog_20201024.txt
@@ -240,3 +240,7 @@ Record Time
 Record Time：2020-10-24 17:23:53,839 Info： HMI空闲 
 Record Time：2020-10-24 17:23:53,839 Info：点火状态:未点火 FID:-0.155
 Record Time：2020-10-24 17:23:53,839 Info：前进样口:24.23 / 30柱箱:24.05 / 30前检测:23.70 / 150中检测:24.47 / 0
+Record Time：2020-10-24 17:50:23,150 Info： HMI空闲 
+Record Time：2020-10-24 17:50:23,150 Info：点火状态:未点火 FID:0.000
+Record Time：2020-10-24 19:32:29,979 Info： HMI空闲 
+Record Time：2020-10-24 19:32:29,984 Info：点火状态:未点火 FID:0.000
--- a/VocsSetup/GC_User/Logs/InfoLog_20201024.txt
+++ b/VocsSetup/GC_User/Logs/InfoLog_20201024.txt
@@ -246,3 +246,35 @@ Record Time
 Record Time：2020-10-24 17:20:53,258 Thread ID:[7]- Info：Start Search HMI...
 Record Time：2020-10-24 17:20:53,798 Thread ID:[1]- Info：System Init Success
 Record Time：2020-10-24 17:21:03,835 Thread ID:[7]- Info：Start Search HMI...
+Record Time：2020-10-24 17:49:23,118 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 17:49:28,035 Thread ID:[9]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 17:49:38,756 Thread ID:[9]- Info：Start Search HMI...
+Record Time：2020-10-24 17:49:49,181 Thread ID:[9]- Info：Start Search HMI...
+Record Time：2020-10-24 17:51:04,371 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 17:51:09,205 Thread ID:[8]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 17:51:19,948 Thread ID:[8]- Info：Start Search HMI...
+Record Time：2020-10-24 17:52:13,421 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 17:52:18,360 Thread ID:[7]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 17:53:03,246 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 17:53:08,113 Thread ID:[6]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 17:53:18,827 Thread ID:[6]- Info：Start Search HMI...
+Record Time：2020-10-24 17:57:38,222 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 17:57:42,972 Thread ID:[6]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 19:19:27,789 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 19:19:32,879 Thread ID:[8]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 19:19:43,602 Thread ID:[8]- Info：Start Search HMI...
+Record Time：2020-10-24 19:20:42,295 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 19:20:51,095 Thread ID:[7]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 19:22:24,091 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 19:22:28,833 Thread ID:[9]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 19:22:39,753 Thread ID:[9]- Info：Start Search HMI...
+Record Time：2020-10-24 19:22:50,154 Thread ID:[9]- Info：Start Search HMI...
+Record Time：2020-10-24 19:24:40,890 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 19:24:46,050 Thread ID:[8]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 19:24:56,785 Thread ID:[8]- Info：Start Search HMI...
+Record Time：2020-10-24 19:25:27,724 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 19:25:32,437 Thread ID:[6]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 19:31:29,956 Thread ID:[1]- Info：System Init Success
+Record Time：2020-10-24 19:31:34,899 Thread ID:[7]- Info：Start Get PC Local IP...
+Record Time：2020-10-24 19:31:45,622 Thread ID:[7]- Info：Start Search HMI...
+Record Time：2020-10-24 19:31:56,027 Thread ID:[7]- Info：Start Search HMI...
--- a/VocsSetup/GC_User/Operation Log/ErrLog/ErrLog.txt
+++ b/VocsSetup/GC_User/Operation Log/ErrLog/ErrLog.txt
--- a/VocsSetup/GC_User/Operation Log/OperLog/OperLog.txt
+++ b/VocsSetup/GC_User/Operation Log/OperLog/OperLog.txt
@@ -211,3 +211,14 @@
 【2020-10-24 17:17:48.4081】,服务器重启：
 【2020-10-24 17:20:53.7860】,服务器开始启动：192.168.2.50:12345
 【2020-10-24 17:24:20.6522】,服务器重启：
+【2020-10-24 17:49:22.9952】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 17:51:04.2450】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 17:52:13.2939】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 17:53:03.1238】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 17:57:38.1015】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 19:19:27.6633】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 19:20:42.1776】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 19:22:23.9774】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 19:24:40.7712】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 19:25:27.6079】,服务器开始启动：172.16.0.102:12345
+【2020-10-24 19:31:29.8246】,服务器开始启动：172.16.0.102:12345
--- a/dll/CKVocAlgorithm.dll
+++ b/dll/CKVocAlgorithm.dll
--- a/dll/CKVocAnalyzer.dll
+++ b/dll/CKVocAnalyzer.dll
--- a/dll/CKVocAnalyzer.resources.dll
+++ b/dll/CKVocAnalyzer.resources.dll