Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/DataState.cs

@@ -110,7 +110,7 @@ namespace GcDevicePc
                 tempshow.Text = "运行时间/总时间";
                 if (globaldata.MethodRun_Statue == 4 || globaldata.MethodRun_Statue == 5)
                     //  tempshow.SubItems.Add((globaldata.RunTime_Now/60.0f).ToString("0.0") + "/" + (globaldata.RunTotal_Now/60.0f).ToString("0.0"));
-                    tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.runtimenow / 60.0f).ToString("0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0"));
+                    tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.runtimenow / 60.0f).ToString("0.00") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.00"));
                 else
                     tempshow.SubItems.Add("未运行");
 

GcDevicePc/ProThread/GcDataTh.cs

@@ -849,6 +849,5 @@ namespace GcDevicePc.ProThread
             }
         }
 
-
     }
 }

GcDevicePc/ProThread/HMISearch.cs

@@ -106,8 +106,8 @@ namespace GcDevicePc.ProThread
 
             try
             {
-                client = new UdpClient(new IPEndPoint(IPAddress.Any, 0));
-              //  client = new UdpClient(new IPEndPoint(IPAddress.Parse(this._localip), 0));
+               // client = new UdpClient(new IPEndPoint(IPAddress.Any, 0));
+               client = new UdpClient(new IPEndPoint(IPAddress.Parse(this._localip), 0));
                 endpoint = new IPEndPoint(IPAddress.Parse("255.255.255.255"), 233);
              //   endpoint = new IPEndPoint(IPAddress.Parse("192.168.10.230"), 233);
                 client.Send(sendBytes, sendBytes.Length, endpoint);

GcDevicePc/Program.cs

@@ -13,7 +13,7 @@ namespace GcDevicePc
             Application.SetCompatibleTextRenderingDefault(false);
 
             bool createNew;
-
+            // Application.Run(new DebugForm());
             {
                 using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
                 {

GcDevicePc/RestartHmi.cs

@@ -21,9 +21,9 @@ namespace GcDevicePc
         {
             int ret = 1;
             FileServerClient singlesend = new FileServerClient();
-            singlesend.WtClientInit("192.168.10.230", 911);
+            singlesend.WtClientInit("192.168.1.88", 911);
             ret = singlesend.WtHMICloseRro("WtMainProc");
-            if (ret == 1)
+     //       if (ret == 1)
             {
                 MessageBox.Show("停止HMI成功！");
                 ret = singlesend.WtHMIRunPro("GcDevice.exe", globaldata.exeremoteFolder);