Skip to content

G
GC_Branch
Commit 05093bee authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

删除一些冗余文件，优化了启动界面

parent 5e1bfd33
Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 1732 deletions
GcDevicePc/AppInit.cs
View file @ 05093bee
...@@ -2,17 +2,21 @@ ...@@ -2,17 +2,21 @@
using System.IO; using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GcDevicePc.Common; using GcDevicePc.Common;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
using GcDevicePc.ProThread;
using Ini.Net; using Ini.Net;
namespace GcDevicePc namespace GcDevicePc
{ {
class AppInit class AppInit
{ {
private IniFile IniParser;
/// <summary> /// <summary>
/// 检测文件和目录是否存在 /// 检测文件和目录是否存在
...@@ -39,91 +43,7 @@ namespace GcDevicePc ...@@ -39,91 +43,7 @@ namespace GcDevicePc
return true; return true;
} }
private IniFile IniParser;
//private void GetGCCode()
//{
// int devicecount = 0;
// devicecount = globaldata.DeviceList.Count;
// int i = 0;
// int count = 0;
// string tmpfile = "";
// string tmpip = "";
// string tmpname = "";
// int ret = 0;
// if (devicecount > 0)
// {
// globaldata.DeviceName.Clear();
// FileServerClient mainclient = new FileServerClient();
// for (i = 0; i < devicecount; i++)
// {
// tmpip = (((globaldata.DeviceInfo)(globaldata.DeviceList[i])).IpAddr);
// mainclient.WtClientInit(tmpip, globaldata.fileserverport);
// //获取设备配置
// tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.tmpFolder + "\\" + i.ToString() + "\\DevStatus.ini";
// if (System.IO.File.Exists(tmpfile))
// {
// Thread.Sleep(100);
// System.IO.File.Delete(tmpfile);
// }
// ret = mainclient.WtClientCopyfromServer("DevStatus.ini", tmpfile, globaldata.remoteFolder + "仪器状态\\");
// Thread.Sleep(400);
// {
// FileHelper tmpfh = new FileHelper(tmpfile);
// tmpname = tmpfh.GetProfileString("仪器编号", "仪器编码", "无编码设备");
// if (tmpname == "无编码设备")
// {
// tmpname = tmpname + count.ToString();
// count++;
// }
// globaldata.DeviceName.Add(tmpname);
// }
// }
// }
//}
//private void MoveDevFile()
//{
// int devicecount = 0;
// devicecount = globaldata.DeviceList.Count;
// int i = 0;
// string tmpfile = "";
// string tmpfile2 = "";
// string folderToBeDeleted = "";
// if (devicecount > 0)
// {
// for (i = 0; i < devicecount; i++)
// {
// tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.tmpFolder + "\\" + i.ToString() + "\\DevStatus.ini";
// tmpfile2 = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder + "\\" + globaldata.DeviceName[i].ToString() + "\\DevStatus.ini";
// if (System.IO.File.Exists(tmpfile2))
// {
// System.IO.File.Delete(tmpfile2);
// }
// if (System.IO.File.Exists(tmpfile))
// {
// System.IO.File.Move(tmpfile, tmpfile2);
// Thread.Sleep(100);
// }
// {
// folderToBeDeleted = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.tmpFolder + "\\" + i.ToString();
// DirectoryInfo folder = new DirectoryInfo(folderToBeDeleted);
// if (folder.Exists)
// {
// folder.Delete(true);
// }
// }
// }
// }
//}
public void InitAppFolder() public void InitAppFolder()
{ {
...@@ -131,32 +51,31 @@ namespace GcDevicePc ...@@ -131,32 +51,31 @@ namespace GcDevicePc
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunFolder = System.Windows.Forms.Application.StartupPath; globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunFolder = System.Windows.Forms.Application.StartupPath;
tmpFolder = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunFolder; tmpFolder = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunFolder;
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder = System.IO.Path.Combine(tmpFolder, "仪器方法"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder = Path.Combine(tmpFolder, "仪器方法");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder = System.IO.Path.Combine(tmpFolder, "仪器状态"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder = Path.Combine(tmpFolder, "仪器状态");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunTabFolder = System.IO.Path.Combine(tmpFolder, "运行表"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunTabFolder = Path.Combine(tmpFolder, "运行表");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunTabFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunTabFolder);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder = System.IO.Path.Combine(tmpFolder, "历史数据"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder = Path.Combine(tmpFolder, "历史数据");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FwFolder = System.IO.Path.Combine(tmpFolder, "固件更新"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FwFolder = Path.Combine(tmpFolder, "固件更新");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FwFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FwFolder);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.TmpFolder = System.IO.Path.Combine(tmpFolder, "tmpfile"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.TmpFolder = Path.Combine(tmpFolder, "tmpfile");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.TmpFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.TmpFolder);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.LogFolder = System.IO.Path.Combine(tmpFolder, "Logs"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.LogFolder = Path.Combine(tmpFolder, "Logs");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.LogFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.LogFolder);
tmpFolder = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder; tmpFolder = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder;
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder = System.IO.Path.Combine(tmpFolder, "子状态"); globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder = Path.Combine(tmpFolder, "子状态");
CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder); CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder);
tmpFolder = null;
} }
public void InitAppDefaultConfig() public void InitAppDefaultConfig()
...@@ -182,8 +101,6 @@ namespace GcDevicePc ...@@ -182,8 +101,6 @@ namespace GcDevicePc
"RunMethod.ini" "RunMethod.ini"
}; };
int checkflag = 0; int checkflag = 0;
int ret = 0; int ret = 0;
...@@ -246,7 +163,7 @@ namespace GcDevicePc ...@@ -246,7 +163,7 @@ namespace GcDevicePc
globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName = null; globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName = null;
tmpfile = System.IO.Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder, "DevStatus.ini"); tmpfile = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder, "DevStatus.ini");
if (File.Exists(tmpfile) == false) if (File.Exists(tmpfile) == false)
{ {
HWConfig default_devstatus = new HWConfig(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder, "DevStatus.ini"); HWConfig default_devstatus = new HWConfig(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder, "DevStatus.ini");
...@@ -255,7 +172,6 @@ namespace GcDevicePc ...@@ -255,7 +172,6 @@ namespace GcDevicePc
else else
{ {
globaldata.m_hwconfig.setFileName(tmpfile); globaldata.m_hwconfig.setFileName(tmpfile);
Console.WriteLine(globaldata.m_hwconfig.hwconfiginfo.GCNum); Console.WriteLine(globaldata.m_hwconfig.hwconfiginfo.GCNum);
} }
...@@ -264,219 +180,96 @@ namespace GcDevicePc ...@@ -264,219 +180,96 @@ namespace GcDevicePc
tmpfile = null; tmpfile = null;
} }
public void InitDB() public void LocalNetworkCheck()
{
String localip = "";
while (true)
{ {
//SQLiteHelper mydb = new SQLiteHelper(); try
//mydb.fillmachineinfo("GC1001", "a.ini", "DevStatus.ini", "192.168.1.87", 1, 2); {
NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
foreach (NetworkInterface adapter in nics)
{
// if (adapter.Name == "本地连接")
{
bool pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet ||
adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211);
if (pd1)
{
IPInterfaceProperties ip = adapter.GetIPProperties();
UnicastIPAddressInformationCollection ipCollection = ip.UnicastAddresses;
foreach (UnicastIPAddressInformation ipadd in ipCollection)
{
if (ipadd.Address.AddressFamily == AddressFamily.InterNetwork)
localip = ipadd.Address.ToString();
} }
/// <summary> if (!String.IsNullOrEmpty(localip))
/// 获取所有GC的配置和方法 {
/// </summary> globaldata.StartNetwork = true;
//public void InitAllGC() }
//{ }
// int devicecount = 0; }
// devicecount = globaldata.DeviceList.Count; }
// int i = 0; }
// int j = 0; catch (Exception e)
// string tmpfile = ""; {
// string tmpip = ""; Log.Error(e.Message);
// string tmpname = ""; globaldata.StartNetwork = false;
// int ret = 0; }
// if (devicecount > 0) if (globaldata.OffLinkMode || globaldata.StartNetwork)
// { {
// //globaldata.DeviceName.Clear(); break;
// globaldata.GCMethodName.Clear(); }
// globaldata.GCBatMethodName.Clear();
Thread.Sleep(1000);
// FileServerClient mainclient = new FileServerClient(); }
// try }
// {
// for (i = 0; i < devicecount; i++) public void ConnectionIPInit()
// { {
// tmpip = (((globaldata.DeviceInfo)(globaldata.DeviceList[i])).IpAddr); HMISearch mysearch = new HMISearch(null);
// mainclient.WtClientInit(tmpip, globaldata.fileserverport); int hmicount = 0;
bool ret = false;
// ////获取设备配置 string ip;
// //tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder + "\\" + globaldata.DeviceName[i].ToString() + "\\DevStatus.ini";
// //if (System.IO.File.Exists(tmpfile)) while (true)
// //{ {
// // Thread.Sleep(100); ret = mysearch.ThStart();
// // System.IO.File.Delete(tmpfile);
// //} if (ret)
// //ret = mainclient.WtClientCopyfromServer("DevStatus.ini", tmpfile, globaldata.remoteFolder + "仪器状态\\"); {
// //Thread.Sleep(400); Thread.Sleep(3000);
hmicount = mysearch.HMICount();
// //{ if (hmicount >= 1)
// // FileHelper tmpfh = new FileHelper(tmpfile); {
// // tmpname = tmpfh.GetProfileString("仪器编号", "仪器编码", "无编码设备"); ip = (((globaldata.DeviceInfo) (mysearch.myHMIList[0])).IpAddr);
// // globaldata.DeviceName.Add(tmpname); globaldata.connection_ip = ip;
// //} mysearch.ThStop();
break;
// //获取单次运行方法 }
// tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder + "\\" + globaldata.DeviceName[i].ToString() + "\\SingleAnal.ini";
// if (System.IO.File.Exists(tmpfile)) mysearch.ThStop();
// { }
// Thread.Sleep(100); else
// System.IO.File.Delete(tmpfile); {
// } mysearch.ReGetHmiIp();
Thread.Sleep(2000);
// ret = mainclient.WtClientCopyfromServer("SingleAnal.ini", tmpfile, globaldata.remoteFolder + "仪器方法\\"); }
// Thread.Sleep(500);
if (globaldata.OffLinkMode)
// if (System.IO.File.Exists(tmpfile)) {
// { globaldata.connection_ip = "";
// FileHelper tmpfh = new FileHelper(tmpfile); break;
// tmpname = tmpfh.GetProfileString("方法名称", "名称", "SingleAnal.ini"); }
// if (tmpname != "SingleAnal.ini") }
// { }
// tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder + "\\" + globaldata.DeviceName[i].ToString() + "\\" + tmpname;
// ret = mainclient.WtClientCopyfromServer(tmpname, tmpfile, globaldata.remoteFolder + "仪器方法\\"); public void InitDB()
// Thread.Sleep(500); {
// }
// globaldata.GCMethodName.Add(tmpname); }
// }
// //获取批处理及其方法
// tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.RunTabFolder + "\\" + globaldata.DeviceName[i].ToString() + "\\RunMethod.ini";
// if (System.IO.File.Exists(tmpfile))
// {
// Thread.Sleep(100);
// System.IO.File.Delete(tmpfile);
// }
// ret = mainclient.WtClientCopyfromServer("RunMethod.ini", tmpfile, globaldata.remoteFolder + "运行表\\");
// Thread.Sleep(500);
// if (System.IO.File.Exists(tmpfile))
// {
// string[] runtabnames = new string[256];
// FileHelper tmpfh = new FileHelper(tmpfile);
// runtabnames = tmpfh.GetAllItemKeys("运行表");
// Console.WriteLine("IP:" + tmpip);
// for (j = 0; j < runtabnames.Length; j++)
// {
// if (j != 0)
// {
// tmpname = tmpfh.GetProfileString("运行表", runtabnames[j], "SingleAnal.ini");
// tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder + "\\" + globaldata.DeviceName[i].ToString() + "\\" + tmpname;
// if (System.IO.File.Exists(tmpfile))
// {
// Console.WriteLine(tmpfile.ToString() + " 方法已经存在！");
// }
// else
// {
// mainclient.WtClientCopyfromServer(tmpname, tmpfile, globaldata.remoteFolder + "仪器方法\\");
// Thread.Sleep(500);
// }
// if (j == 0)
// {
// globaldata.GCBatMethodName.Add(tmpname);
// }
// }
// }
// }
// }
// }
// catch
// {
// Console.WriteLine(tmpip + " is error!");
// }
// mainclient.WtClientClose();
// Console.WriteLine("InitAllGC is OK!");
// }
//}
//public void InitGCHWConfig()
//{
// int devicecount = 0;
// devicecount = globaldata.DeviceList.Count;
// int i = 0;
// string tmpfile = "";
// if (devicecount > 0)
// {
// for (i = 0; i < devicecount; i++)
// {
// tmpfile = globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder + "\\DevStatus.ini";
// HWConfig m_hwconfig = new HWConfig(tmpfile);
// m_hwconfig.GetHWConfig();
// }
// }
//}
/// <summary>
/// 初始化基础线程
/// </summary>
//public void InitGCThread()
//{
// int devicecount = 0;
// devicecount = globaldata.DeviceList.Count;
// int i = 0;
// string tmpip = "";
// HWConfig m_hwconfig;
// HMIState mystate;
// ChannelData mychanneldata;
// GCDisplay mydisplay;
// Console.WriteLine("开始启动线程！");
// if (devicecount > 0)
// {
// globaldata.t_hmistate.Clear(); //清理状态采集线程
// globaldata.t_channeldata.Clear(); //清理通道采集线程
// globaldata.t_displaydata.Clear();
// for (i = 0; i < devicecount; i++)
// {
// tmpip = (((globaldata.DeviceInfo)(globaldata.DeviceList[i])).IpAddr);
// m_hwconfig = (HWConfig)globaldata.GCHWConfigs[i];
// mystate = new HMIState(tmpip, 502);
// mystate.SetHMIMAcState((((globaldata.DeviceInfo)(globaldata.DeviceList[i])).MacAddr));
// mystate.HmiStatueStart();
// mystate.SetHWConfig(m_hwconfig);
// globaldata.t_hmistate.Add(mystate);
// mychanneldata = new ChannelData(tmpip, 502);
// mychanneldata.ChannelDataStart();
// mychanneldata.SetHWConfig(m_hwconfig);
// globaldata.t_channeldata.Add(mychanneldata);
// mydisplay = new GCDisplay(tmpip, 502);
// mydisplay.DisplayDataStart();
// globaldata.t_displaydata.Add(mydisplay);
// }
// }
// Console.WriteLine("线程均启动！");
//}
//public void InitGCControl()
//{
// int devicecount = 0;
// devicecount = globaldata.DeviceList.Count;
// int i = 0;
// string tmpip = "";
// HMIControl mycontrol;
// if (devicecount > 0)
// {
// globaldata.t_hmicontrol.Clear();
// for (i = 0; i < devicecount; i++)
// {
// tmpip = (((globaldata.DeviceInfo)(globaldata.DeviceList[i])).IpAddr);
// mycontrol = new HMIControl(tmpip, globaldata.datamodbusport);
// globaldata.t_hmicontrol.Add(mycontrol);
// }
// }
//}
} }
} }
GcDevicePc/ConfigInfo.Designer.cs
View file @ 05093bee
...@@ -485,8 +485,11 @@ ...@@ -485,8 +485,11 @@
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "ConfigInfo"; this.Name = "ConfigInfo";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "设备配置"; this.Text = "设备配置";
this.TopMost = true; this.TopMost = true;
this.Load += new System.EventHandler(this.ConfigInfo_Load); this.Load += new System.EventHandler(this.ConfigInfo_Load);
......
GcDevicePc/CreateConfig.Designer.cs
View file @ 05093bee
...@@ -1177,7 +1177,9 @@ ...@@ -1177,7 +1177,9 @@
this.Controls.Add(this.detectgroup); this.Controls.Add(this.detectgroup);
this.Controls.Add(this.Ovengroup); this.Controls.Add(this.Ovengroup);
this.Controls.Add(this.samplegroup); this.Controls.Add(this.samplegroup);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "CreateConfig"; this.Name = "CreateConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "配置创建"; this.Text = "配置创建";
......
GcDevicePc/GcDevicePc.csproj
View file @ 05093bee
...@@ -481,24 +481,12 @@ ...@@ -481,24 +481,12 @@
<Compile Include="StartForm.Designer.cs"> <Compile Include="StartForm.Designer.cs">
<DependentUpon>StartForm.cs</DependentUpon> <DependentUpon>StartForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="StartWin.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StartWin.Designer.cs">
<DependentUpon>StartWin.cs</DependentUpon>
</Compile>
<Compile Include="Test.cs"> <Compile Include="Test.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Test.Designer.cs"> <Compile Include="Test.Designer.cs">
<DependentUpon>Test.cs</DependentUpon> <DependentUpon>Test.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UpdateTest.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UpdateTest.Designer.cs">
<DependentUpon>UpdateTest.cs</DependentUpon>
</Compile>
<Compile Include="UserConfig.cs"> <Compile Include="UserConfig.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -672,15 +660,9 @@ ...@@ -672,15 +660,9 @@
<EmbeddedResource Include="StartForm.resx"> <EmbeddedResource Include="StartForm.resx">
<DependentUpon>StartForm.cs</DependentUpon> <DependentUpon>StartForm.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="StartWin.resx">
<DependentUpon>StartWin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Test.resx"> <EmbeddedResource Include="Test.resx">
<DependentUpon>Test.cs</DependentUpon> <DependentUpon>Test.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UpdateTest.resx">
<DependentUpon>UpdateTest.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserConfig.resx"> <EmbeddedResource Include="UserConfig.resx">
<DependentUpon>UserConfig.cs</DependentUpon> <DependentUpon>UserConfig.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
GcDevicePc/MDIBase.Designer.cs
View file @ 05093bee
...@@ -31,26 +31,26 @@ ...@@ -31,26 +31,26 @@
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDIBase)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDIBase));
this.menuStrip = new System.Windows.Forms.MenuStrip(); this.menuStrip = new System.Windows.Forms.MenuStrip();
this.用户管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UserMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.UserLoginMenu = new System.Windows.Forms.ToolStripMenuItem(); this.UserLoginMenu = new System.Windows.Forms.ToolStripMenuItem();
this.UserLogoutMenu = new System.Windows.Forms.ToolStripMenuItem(); this.UserLogoutMenu = new System.Windows.Forms.ToolStripMenuItem();
this.系统ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SystemMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SystemStartMenu = new System.Windows.Forms.ToolStripMenuItem(); this.SystemStartMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SystemStopMenu = new System.Windows.Forms.ToolStripMenuItem(); this.SystemStopMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AuxToolMenu = new System.Windows.Forms.ToolStripMenuItem(); this.AuxToolMenu = new System.Windows.Forms.ToolStripMenuItem();
this.ParameterSettingMenu = new System.Windows.Forms.ToolStripMenuItem(); this.ParameterSettingMenu = new System.Windows.Forms.ToolStripMenuItem();
this.运行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SettingMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.NetWorkMenu = new System.Windows.Forms.ToolStripMenuItem(); this.NetWorkMenu = new System.Windows.Forms.ToolStripMenuItem();
this.MethodBatMenu = new System.Windows.Forms.ToolStripMenuItem(); this.MethodBatMenu = new System.Windows.Forms.ToolStripMenuItem();
this.NewMethodMenu = new System.Windows.Forms.ToolStripMenuItem(); this.NewMethodMenu = new System.Windows.Forms.ToolStripMenuItem();
this.OpenMethodMenu = new System.Windows.Forms.ToolStripMenuItem(); this.OpenMethodMenu = new System.Windows.Forms.ToolStripMenuItem();
this.MethodBrowseMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MethodBrowseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.SettingSeparator = new System.Windows.Forms.ToolStripSeparator();
this.GCConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.GCConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigCreateSubMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ConfigCreateSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigShowSubMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ConfigShowSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigSendSubMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ConfigSendSubMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.窗口ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DataMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.HistoryDataMenu = new System.Windows.Forms.ToolStripMenuItem(); this.HistoryDataMenu = new System.Windows.Forms.ToolStripMenuItem();
this.CalibrationMenu = new System.Windows.Forms.ToolStripMenuItem(); this.CalibrationMenu = new System.Windows.Forms.ToolStripMenuItem();
this.HistoryPicMenu = new System.Windows.Forms.ToolStripMenuItem(); this.HistoryPicMenu = new System.Windows.Forms.ToolStripMenuItem();
...@@ -59,16 +59,16 @@ ...@@ -59,16 +59,16 @@
this.SingleStart = new System.Windows.Forms.ToolStripMenuItem(); this.SingleStart = new System.Windows.Forms.ToolStripMenuItem();
this.SingleStop = new System.Windows.Forms.ToolStripMenuItem(); this.SingleStop = new System.Windows.Forms.ToolStripMenuItem();
this.SingleCancel = new System.Windows.Forms.ToolStripMenuItem(); this.SingleCancel = new System.Windows.Forms.ToolStripMenuItem();
this.HelpMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AboutMenu = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip = new System.Windows.Forms.StatusStrip(); this.statusStrip = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabelusertime = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelusertime = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabelText = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelText = new System.Windows.Forms.ToolStripStatusLabel();
this.HmiStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker();
this.HmiStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.HelpMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AboutMenu = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip.SuspendLayout(); this.menuStrip.SuspendLayout();
this.statusStrip.SuspendLayout(); this.statusStrip.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -77,10 +77,10 @@ ...@@ -77,10 +77,10 @@
// //
this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.用户管理ToolStripMenuItem, this.UserMainMenu,
this.系统ToolStripMenuItem, this.SystemMainMenu,
this.运行ToolStripMenuItem, this.SettingMainMenu,
this.窗口ToolStripMenuItem, this.DataMainMenu,
this.DebugMainMenu, this.DebugMainMenu,
this.HelpMainMenu}); this.HelpMainMenu});
this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Location = new System.Drawing.Point(0, 0);
...@@ -89,121 +89,121 @@ ...@@ -89,121 +89,121 @@
this.menuStrip.TabIndex = 0; this.menuStrip.TabIndex = 0;
this.menuStrip.Text = "MenuStrip"; this.menuStrip.Text = "MenuStrip";
// //
// 用户管理ToolStripMenuItem // UserMainMenu
// //
this.用户管理ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.UserMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.UserLoginMenu, this.UserLoginMenu,
this.UserLogoutMenu}); this.UserLogoutMenu});
this.用户管理ToolStripMenuItem.Name = "用户管理ToolStripMenuItem"; this.UserMainMenu.Name = "UserMainMenu";
this.用户管理ToolStripMenuItem.Size = new System.Drawing.Size(68, 21); this.UserMainMenu.Size = new System.Drawing.Size(68, 21);
this.用户管理ToolStripMenuItem.Text = "用户管理"; this.UserMainMenu.Text = "用户管理";
// //
// UserLoginMenu // UserLoginMenu
// //
this.UserLoginMenu.Name = "UserLoginMenu"; this.UserLoginMenu.Name = "UserLoginMenu";
this.UserLoginMenu.Size = new System.Drawing.Size(124, 22); this.UserLoginMenu.Size = new System.Drawing.Size(180, 22);
this.UserLoginMenu.Text = "用户登录"; this.UserLoginMenu.Text = "用户登录";
this.UserLoginMenu.Click += new System.EventHandler(this.UserLoginMenu_Click); this.UserLoginMenu.Click += new System.EventHandler(this.UserLoginMenu_Click);
// //
// UserLogoutMenu // UserLogoutMenu
// //
this.UserLogoutMenu.Name = "UserLogoutMenu"; this.UserLogoutMenu.Name = "UserLogoutMenu";
this.UserLogoutMenu.Size = new System.Drawing.Size(124, 22); this.UserLogoutMenu.Size = new System.Drawing.Size(180, 22);
this.UserLogoutMenu.Text = "用户注销"; this.UserLogoutMenu.Text = "用户注销";
this.UserLogoutMenu.Click += new System.EventHandler(this.UserLogoutMenu_Click); this.UserLogoutMenu.Click += new System.EventHandler(this.UserLogoutMenu_Click);
// //
// 系统ToolStripMenuItem // SystemMainMenu
// //
this.系统ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SystemMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SystemStartMenu, this.SystemStartMenu,
this.SystemStopMenu, this.SystemStopMenu,
this.AuxToolMenu, this.AuxToolMenu,
this.ParameterSettingMenu}); this.ParameterSettingMenu});
this.系统ToolStripMenuItem.Name = "系统ToolStripMenuItem"; this.SystemMainMenu.Name = "SystemMainMenu";
this.系统ToolStripMenuItem.Size = new System.Drawing.Size(44, 21); this.SystemMainMenu.Size = new System.Drawing.Size(44, 21);
this.系统ToolStripMenuItem.Text = "系统"; this.SystemMainMenu.Text = "系统";
// //
// SystemStartMenu // SystemStartMenu
// //
this.SystemStartMenu.Name = "SystemStartMenu"; this.SystemStartMenu.Name = "SystemStartMenu";
this.SystemStartMenu.Size = new System.Drawing.Size(124, 22); this.SystemStartMenu.Size = new System.Drawing.Size(180, 22);
this.SystemStartMenu.Text = "系统开启"; this.SystemStartMenu.Text = "系统开启";
this.SystemStartMenu.Click += new System.EventHandler(this.SystemStartMenu_Click); this.SystemStartMenu.Click += new System.EventHandler(this.SystemStartMenu_Click);
// //
// SystemStopMenu // SystemStopMenu
// //
this.SystemStopMenu.Name = "SystemStopMenu"; this.SystemStopMenu.Name = "SystemStopMenu";
this.SystemStopMenu.Size = new System.Drawing.Size(124, 22); this.SystemStopMenu.Size = new System.Drawing.Size(180, 22);
this.SystemStopMenu.Text = "系统关闭"; this.SystemStopMenu.Text = "系统关闭";
this.SystemStopMenu.Click += new System.EventHandler(this.SystemStopMenu_Click); this.SystemStopMenu.Click += new System.EventHandler(this.SystemStopMenu_Click);
// //
// AuxToolMenu // AuxToolMenu
// //
this.AuxToolMenu.Name = "AuxToolMenu"; this.AuxToolMenu.Name = "AuxToolMenu";
this.AuxToolMenu.Size = new System.Drawing.Size(124, 22); this.AuxToolMenu.Size = new System.Drawing.Size(180, 22);
this.AuxToolMenu.Text = "辅助工具"; this.AuxToolMenu.Text = "辅助工具";
this.AuxToolMenu.Click += new System.EventHandler(this.AuxToolMenu_Click); this.AuxToolMenu.Click += new System.EventHandler(this.AuxToolMenu_Click);
// //
// ParameterSettingMenu // ParameterSettingMenu
// //
this.ParameterSettingMenu.Name = "ParameterSettingMenu"; this.ParameterSettingMenu.Name = "ParameterSettingMenu";
this.ParameterSettingMenu.Size = new System.Drawing.Size(124, 22); this.ParameterSettingMenu.Size = new System.Drawing.Size(180, 22);
this.ParameterSettingMenu.Text = "参数设置"; this.ParameterSettingMenu.Text = "参数设置";
this.ParameterSettingMenu.Click += new System.EventHandler(this.ParameterSettingMenu_Click); this.ParameterSettingMenu.Click += new System.EventHandler(this.ParameterSettingMenu_Click);
// //
// 运行ToolStripMenuItem // SettingMainMenu
// //
this.运行ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SettingMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NetWorkMenu, this.NetWorkMenu,
this.MethodBatMenu, this.MethodBatMenu,
this.NewMethodMenu, this.NewMethodMenu,
this.OpenMethodMenu, this.OpenMethodMenu,
this.MethodBrowseMenuItem, this.MethodBrowseMenuItem,
this.toolStripSeparator1, this.SettingSeparator,
this.GCConfigMenuItem}); this.GCConfigMenuItem});
this.运行ToolStripMenuItem.Name = "运行ToolStripMenuItem"; this.SettingMainMenu.Name = "SettingMainMenu";
this.运行ToolStripMenuItem.Size = new System.Drawing.Size(44, 21); this.SettingMainMenu.Size = new System.Drawing.Size(44, 21);
this.运行ToolStripMenuItem.Text = "设置"; this.SettingMainMenu.Text = "设置";
// //
// NetWorkMenu // NetWorkMenu
// //
this.NetWorkMenu.Name = "NetWorkMenu"; this.NetWorkMenu.Name = "NetWorkMenu";
this.NetWorkMenu.Size = new System.Drawing.Size(148, 22); this.NetWorkMenu.Size = new System.Drawing.Size(180, 22);
this.NetWorkMenu.Text = "网络配置"; this.NetWorkMenu.Text = "网络配置";
this.NetWorkMenu.Click += new System.EventHandler(this.NetWorkMenu_Click); this.NetWorkMenu.Click += new System.EventHandler(this.NetWorkMenu_Click);
// //
// MethodBatMenu // MethodBatMenu
// //
this.MethodBatMenu.Name = "MethodBatMenu"; this.MethodBatMenu.Name = "MethodBatMenu";
this.MethodBatMenu.Size = new System.Drawing.Size(148, 22); this.MethodBatMenu.Size = new System.Drawing.Size(180, 22);
this.MethodBatMenu.Text = "方法批处理"; this.MethodBatMenu.Text = "方法批处理";
this.MethodBatMenu.Click += new System.EventHandler(this.MethodBatMenu_Click); this.MethodBatMenu.Click += new System.EventHandler(this.MethodBatMenu_Click);
// //
// NewMethodMenu // NewMethodMenu
// //
this.NewMethodMenu.Name = "NewMethodMenu"; this.NewMethodMenu.Name = "NewMethodMenu";
this.NewMethodMenu.Size = new System.Drawing.Size(148, 22); this.NewMethodMenu.Size = new System.Drawing.Size(180, 22);
this.NewMethodMenu.Text = "新建方法"; this.NewMethodMenu.Text = "新建方法";
this.NewMethodMenu.Click += new System.EventHandler(this.NewMethodMenu_Click); this.NewMethodMenu.Click += new System.EventHandler(this.NewMethodMenu_Click);
// //
// OpenMethodMenu // OpenMethodMenu
// //
this.OpenMethodMenu.Name = "OpenMethodMenu"; this.OpenMethodMenu.Name = "OpenMethodMenu";
this.OpenMethodMenu.Size = new System.Drawing.Size(148, 22); this.OpenMethodMenu.Size = new System.Drawing.Size(180, 22);
this.OpenMethodMenu.Text = "打开方法文件"; this.OpenMethodMenu.Text = "打开方法文件";
this.OpenMethodMenu.Click += new System.EventHandler(this.OpenMethodMenu_Click); this.OpenMethodMenu.Click += new System.EventHandler(this.OpenMethodMenu_Click);
// //
// MethodBrowseMenuItem // MethodBrowseMenuItem
// //
this.MethodBrowseMenuItem.Name = "MethodBrowseMenuItem"; this.MethodBrowseMenuItem.Name = "MethodBrowseMenuItem";
this.MethodBrowseMenuItem.Size = new System.Drawing.Size(148, 22); this.MethodBrowseMenuItem.Size = new System.Drawing.Size(180, 22);
this.MethodBrowseMenuItem.Text = "方法查阅"; this.MethodBrowseMenuItem.Text = "方法查阅";
this.MethodBrowseMenuItem.Click += new System.EventHandler(this.MethodBrowseMenuItem_Click); this.MethodBrowseMenuItem.Click += new System.EventHandler(this.MethodBrowseMenuItem_Click);
// //
// toolStripSeparator1 // SettingSeparator
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.SettingSeparator.Name = "SettingSeparator";
this.toolStripSeparator1.Size = new System.Drawing.Size(145, 6); this.SettingSeparator.Size = new System.Drawing.Size(177, 6);
// //
// GCConfigMenuItem // GCConfigMenuItem
// //
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
this.ConfigShowSubMenuItem, this.ConfigShowSubMenuItem,
this.ConfigSendSubMenuItem}); this.ConfigSendSubMenuItem});
this.GCConfigMenuItem.Name = "GCConfigMenuItem"; this.GCConfigMenuItem.Name = "GCConfigMenuItem";
this.GCConfigMenuItem.Size = new System.Drawing.Size(148, 22); this.GCConfigMenuItem.Size = new System.Drawing.Size(180, 22);
this.GCConfigMenuItem.Text = "仪器配置"; this.GCConfigMenuItem.Text = "仪器配置";
// //
// ConfigCreateSubMenuItem // ConfigCreateSubMenuItem
...@@ -236,34 +236,34 @@ ...@@ -236,34 +236,34 @@
this.ConfigSendSubMenuItem.Text = "配置发送"; this.ConfigSendSubMenuItem.Text = "配置发送";
this.ConfigSendSubMenuItem.Click += new System.EventHandler(this.ConfigSendSubMenuItem_Click); this.ConfigSendSubMenuItem.Click += new System.EventHandler(this.ConfigSendSubMenuItem_Click);
// //
// 窗口ToolStripMenuItem // DataMainMenu
// //
this.窗口ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DataMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.HistoryDataMenu, this.HistoryDataMenu,
this.CalibrationMenu, this.CalibrationMenu,
this.HistoryPicMenu}); this.HistoryPicMenu});
this.窗口ToolStripMenuItem.Name = "窗口ToolStripMenuItem"; this.DataMainMenu.Name = "DataMainMenu";
this.窗口ToolStripMenuItem.Size = new System.Drawing.Size(68, 21); this.DataMainMenu.Size = new System.Drawing.Size(68, 21);
this.窗口ToolStripMenuItem.Text = "数据查看"; this.DataMainMenu.Text = "数据查看";
// //
// HistoryDataMenu // HistoryDataMenu
// //
this.HistoryDataMenu.Name = "HistoryDataMenu"; this.HistoryDataMenu.Name = "HistoryDataMenu";
this.HistoryDataMenu.Size = new System.Drawing.Size(148, 22); this.HistoryDataMenu.Size = new System.Drawing.Size(180, 22);
this.HistoryDataMenu.Text = "历史数据查询"; this.HistoryDataMenu.Text = "历史数据查询";
this.HistoryDataMenu.Click += new System.EventHandler(this.HistoryDataMenu_Click); this.HistoryDataMenu.Click += new System.EventHandler(this.HistoryDataMenu_Click);
// //
// CalibrationMenu // CalibrationMenu
// //
this.CalibrationMenu.Name = "CalibrationMenu"; this.CalibrationMenu.Name = "CalibrationMenu";
this.CalibrationMenu.Size = new System.Drawing.Size(148, 22); this.CalibrationMenu.Size = new System.Drawing.Size(180, 22);
this.CalibrationMenu.Text = "校准查看"; this.CalibrationMenu.Text = "校准查看";
this.CalibrationMenu.Click += new System.EventHandler(this.CalibrationMenu_Click); this.CalibrationMenu.Click += new System.EventHandler(this.CalibrationMenu_Click);
// //
// HistoryPicMenu // HistoryPicMenu
// //
this.HistoryPicMenu.Name = "HistoryPicMenu"; this.HistoryPicMenu.Name = "HistoryPicMenu";
this.HistoryPicMenu.Size = new System.Drawing.Size(148, 22); this.HistoryPicMenu.Size = new System.Drawing.Size(180, 22);
this.HistoryPicMenu.Text = "历史谱图"; this.HistoryPicMenu.Text = "历史谱图";
this.HistoryPicMenu.Click += new System.EventHandler(this.HistoryPicMenu_Click); this.HistoryPicMenu.Click += new System.EventHandler(this.HistoryPicMenu_Click);
// //
...@@ -306,6 +306,21 @@ ...@@ -306,6 +306,21 @@
this.SingleCancel.Text = "取消"; this.SingleCancel.Text = "取消";
this.SingleCancel.Click += new System.EventHandler(this.SingleCancel_Click); this.SingleCancel.Click += new System.EventHandler(this.SingleCancel_Click);
// //
// HelpMainMenu
//
this.HelpMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AboutMenu});
this.HelpMainMenu.Name = "HelpMainMenu";
this.HelpMainMenu.Size = new System.Drawing.Size(44, 21);
this.HelpMainMenu.Text = "帮助";
//
// AboutMenu
//
this.AboutMenu.Name = "AboutMenu";
this.AboutMenu.Size = new System.Drawing.Size(100, 22);
this.AboutMenu.Text = "关于";
this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click);
//
// statusStrip // statusStrip
// //
this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
...@@ -334,6 +349,12 @@ ...@@ -334,6 +349,12 @@
this.toolStripStatusLabelText.Size = new System.Drawing.Size(135, 21); this.toolStripStatusLabelText.Size = new System.Drawing.Size(135, 21);
this.toolStripStatusLabelText.Text = "toolStripStatusLabel1"; this.toolStripStatusLabelText.Text = "toolStripStatusLabel1";
// //
// HmiStatus
//
this.HmiStatus.Name = "HmiStatus";
this.HmiStatus.Size = new System.Drawing.Size(66, 21);
this.HmiStatus.Text = "HmiStatus";
//
// timer1 // timer1
// //
this.timer1.Enabled = true; this.timer1.Enabled = true;
...@@ -354,27 +375,6 @@ ...@@ -354,27 +375,6 @@
this.backgroundWorker2.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker2_DoWork); this.backgroundWorker2.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker2_DoWork);
this.backgroundWorker2.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker2_RunWorkerCompleted); this.backgroundWorker2.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker2_RunWorkerCompleted);
// //
// HmiStatus
//
this.HmiStatus.Name = "HmiStatus";
this.HmiStatus.Size = new System.Drawing.Size(66, 21);
this.HmiStatus.Text = "HmiStatus";
//
// HelpMainMenu
//
this.HelpMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AboutMenu});
this.HelpMainMenu.Name = "HelpMainMenu";
this.HelpMainMenu.Size = new System.Drawing.Size(44, 21);
this.HelpMainMenu.Text = "帮助";
//
// AboutMenu
//
this.AboutMenu.Name = "AboutMenu";
this.AboutMenu.Size = new System.Drawing.Size(180, 22);
this.AboutMenu.Text = "关于";
this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click);
//
// MDIBase // MDIBase
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -404,11 +404,11 @@ ...@@ -404,11 +404,11 @@
private System.Windows.Forms.MenuStrip menuStrip; private System.Windows.Forms.MenuStrip menuStrip;
private System.Windows.Forms.StatusStrip statusStrip; private System.Windows.Forms.StatusStrip statusStrip;
private System.Windows.Forms.ToolTip toolTip; private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.ToolStripMenuItem 用户管理ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem UserMainMenu;
private System.Windows.Forms.ToolStripMenuItem UserLoginMenu; private System.Windows.Forms.ToolStripMenuItem UserLoginMenu;
private System.Windows.Forms.ToolStripMenuItem UserLogoutMenu; private System.Windows.Forms.ToolStripMenuItem UserLogoutMenu;
private System.Windows.Forms.ToolStripMenuItem 运行ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SettingMainMenu;
private System.Windows.Forms.ToolStripMenuItem 窗口ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem DataMainMenu;
private System.Windows.Forms.ToolStripMenuItem HistoryDataMenu; private System.Windows.Forms.ToolStripMenuItem HistoryDataMenu;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelusertime; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelusertime;
...@@ -422,11 +422,11 @@ ...@@ -422,11 +422,11 @@
private System.Windows.Forms.ToolStripMenuItem CalibrationMenu; private System.Windows.Forms.ToolStripMenuItem CalibrationMenu;
private System.Windows.Forms.ToolStripMenuItem HistoryPicMenu; private System.Windows.Forms.ToolStripMenuItem HistoryPicMenu;
private System.Windows.Forms.ToolStripMenuItem NewMethodMenu; private System.Windows.Forms.ToolStripMenuItem NewMethodMenu;
private System.Windows.Forms.ToolStripMenuItem 系统ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SystemMainMenu;
private System.Windows.Forms.ToolStripMenuItem SystemStartMenu; private System.Windows.Forms.ToolStripMenuItem SystemStartMenu;
private System.Windows.Forms.ToolStripMenuItem SystemStopMenu; private System.Windows.Forms.ToolStripMenuItem SystemStopMenu;
private System.Windows.Forms.ToolStripMenuItem AuxToolMenu; private System.Windows.Forms.ToolStripMenuItem AuxToolMenu;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator SettingSeparator;
private System.Windows.Forms.ToolStripMenuItem GCConfigMenuItem; private System.Windows.Forms.ToolStripMenuItem GCConfigMenuItem;
private System.Windows.Forms.ToolStripMenuItem ConfigCreateSubMenuItem; private System.Windows.Forms.ToolStripMenuItem ConfigCreateSubMenuItem;
private System.Windows.Forms.ToolStripMenuItem ConfigShowSubMenuItem; private System.Windows.Forms.ToolStripMenuItem ConfigShowSubMenuItem;
......
GcDevicePc/MDIBase.cs
View file @ 05093bee
...@@ -149,94 +149,8 @@ namespace GcDevicePc ...@@ -149,94 +149,8 @@ namespace GcDevicePc
//点火接口 //点火接口
_userForm.autofire += new Fireport(fireupopt); _userForm.autofire += new Fireport(fireupopt);
}
/*private void ShowNewForm(object sender, EventArgs e)
{
Form childForm = new Form();
childForm.MdiParent = this;
childForm.Text = "窗口 " + childFormNumber++;
childForm.Show();
}
private void OpenFile(object sender, EventArgs e)
{
OpenFileDialog openFileDialog = new OpenFileDialog();
openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
openFileDialog.Filter = "文本文件(*.txt)|*.txt|所有文件(*.*)|*.*";
if (openFileDialog.ShowDialog(this) == DialogResult.OK)
{
string FileName = openFileDialog.FileName;
}
}
private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e)
{
SaveFileDialog saveFileDialog = new SaveFileDialog();
saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
saveFileDialog.Filter = "文本文件(*.txt)|*.txt|所有文件(*.*)|*.*";
if (saveFileDialog.ShowDialog(this) == DialogResult.OK)
{
string FileName = saveFileDialog.FileName;
}
}
private void ExitToolsStripMenuItem_Click(object sender, EventArgs e)
{
this.Close();
}
private void CutToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void CopyToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void PasteToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void ToolBarToolStripMenuItem_Click(object sender, EventArgs e)
{
// toolStrip.Visible = toolBarToolStripMenuItem.Checked;
}
private void StatusBarToolStripMenuItem_Click(object sender, EventArgs e)
{
// statusStrip.Visible = statusBarToolStripMenuItem.Checked;
}
private void CascadeToolStripMenuItem_Click(object sender, EventArgs e)
{
LayoutMdi(MdiLayout.Cascade);
} }
private void TileVerticalToolStripMenuItem_Click(object sender, EventArgs e)
{
LayoutMdi(MdiLayout.TileVertical);
}
private void TileHorizontalToolStripMenuItem_Click(object sender, EventArgs e)
{
LayoutMdi(MdiLayout.TileHorizontal);
}
private void ArrangeIconsToolStripMenuItem_Click(object sender, EventArgs e)
{
LayoutMdi(MdiLayout.ArrangeIcons);
}
private void CloseAllToolStripMenuItem_Click(object sender, EventArgs e)
{
foreach (Form childForm in MdiChildren)
{
childForm.Close();
}
}*/
/// <summary> /// <summary>
/// 判断是否要开启系统 /// 判断是否要开启系统
...@@ -287,7 +201,7 @@ namespace GcDevicePc ...@@ -287,7 +201,7 @@ namespace GcDevicePc
ParameterSettingMenu.Visible = true; ParameterSettingMenu.Visible = true;
DebugMainMenu.Visible = true; DebugMainMenu.Visible = true;
HmiStatus.Visible = true; HmiStatus.Visible = true;
SettingSeparator.Visible = true;
}else }else
{ {
...@@ -302,6 +216,7 @@ namespace GcDevicePc ...@@ -302,6 +216,7 @@ namespace GcDevicePc
ParameterSettingMenu.Visible = false; ParameterSettingMenu.Visible = false;
DebugMainMenu.Visible = false; DebugMainMenu.Visible = false;
HmiStatus.Visible = false; HmiStatus.Visible = false;
SettingSeparator.Visible = false;
} }
} }
...@@ -822,7 +737,7 @@ namespace GcDevicePc ...@@ -822,7 +737,7 @@ namespace GcDevicePc
try try
{ {
mainclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport); mainclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
if (!System.IO.File.Exists(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName)) if (!File.Exists(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName))
{ {
getFileName = tmpFileName.Substring(tmpFileName.LastIndexOf("\\") + 1); getFileName = tmpFileName.Substring(tmpFileName.LastIndexOf("\\") + 1);
ret = mainclient.WtClientCopyfromServer(getFileName, globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName, globaldata.remoteFolder + "仪器方法\\"); ret = mainclient.WtClientCopyfromServer(getFileName, globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_BATMethodName, globaldata.remoteFolder + "仪器方法\\");
...@@ -1299,13 +1214,6 @@ namespace GcDevicePc ...@@ -1299,13 +1214,6 @@ namespace GcDevicePc
FileServerClient rtclient = new FileServerClient(); FileServerClient rtclient = new FileServerClient();
rtclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport); rtclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
//for (int i = 1; i < runtable._methodname.Count; i++)
//{
// rfilename = runtable._methodname[i];
// lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
// rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
// Thread.Sleep(200);
//}
rtclient.WtClientCopytoServer("RunMethod.ini", Path.Combine(folder, runtablename), globaldata.remoteFolder + "运行表\\"); rtclient.WtClientCopytoServer("RunMethod.ini", Path.Combine(folder, runtablename), globaldata.remoteFolder + "运行表\\");
SendPCCMD(false); SendPCCMD(false);
globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_RunTab = Path.Combine(folder, runtablename); globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_RunTab = Path.Combine(folder, runtablename);
...@@ -1331,14 +1239,6 @@ namespace GcDevicePc ...@@ -1331,14 +1239,6 @@ namespace GcDevicePc
FileServerClient rtclient = new FileServerClient(); FileServerClient rtclient = new FileServerClient();
rtclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport); rtclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
//for (int i = 1; i < runtable._methodname.Count; i++)
//{
// rfilename = runtable._methodname[i];
// lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
// rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
// Thread.Sleep(200);
//}
rtclient.WtClientCopytoServer("RunMethodStd.ini", Path.Combine(folder, runtablename), globaldata.remoteFolder + "运行表\\"); rtclient.WtClientCopytoServer("RunMethodStd.ini", Path.Combine(folder, runtablename), globaldata.remoteFolder + "运行表\\");
hmiopt.SetBatCount(count); hmiopt.SetBatCount(count);
SendSTDCMD(); SendSTDCMD();
......
GcDevicePc/MainBase.cs
View file @ 05093bee
...@@ -971,8 +971,8 @@ namespace GcDevicePc ...@@ -971,8 +971,8 @@ namespace GcDevicePc
/// <param name="e"></param> /// <param name="e"></param>
private void filetest_test(object sender, EventArgs e) private void filetest_test(object sender, EventArgs e)
{ {
UpdateTest filetest = new UpdateTest(); //UpdateTest filetest = new UpdateTest();
filetest.Show(); //filetest.Show();
} }
private void Load_Win() private void Load_Win()
......
GcDevicePc/Program.cs
View file @ 05093bee
...@@ -11,128 +11,6 @@ namespace GcDevicePc ...@@ -11,128 +11,6 @@ namespace GcDevicePc
{ {
static class Program static class Program
{ {
private static void Isnetworkok()
{
String localip = "";
while(true)
{
try
{
NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
foreach (NetworkInterface adapter in nics)
{
// if (adapter.Name == "本地连接")
{
bool pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet || adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211);
if (pd1)
{
IPInterfaceProperties ip = adapter.GetIPProperties();
UnicastIPAddressInformationCollection ipCollection = ip.UnicastAddresses;
foreach (UnicastIPAddressInformation ipadd in ipCollection)
{
if (ipadd.Address.AddressFamily == AddressFamily.InterNetwork)
localip = ipadd.Address.ToString();
}
if (localip != "")
{
globaldata.StartNetwork = true;
}
}
}
}
}
catch (Exception e)
{
Log.Error(e.Message);
}
if (globaldata.OffLinkMode || globaldata.StartNetwork)
{
break;
}
Thread.Sleep(1000);
}
}
static public bool Ping(string ip)
{
Ping p;
PingOptions options;
PingReply reply;
string data;
int timeout;
try
{
p = new Ping();
options = new PingOptions();
options.DontFragment = true;
data = "Test Data!";
byte[] buffer = System.Text.Encoding.ASCII.GetBytes(data);
timeout = 1000;
reply = p.Send(ip, timeout, buffer, options);
if (reply.Status == IPStatus.Success)
{
globaldata.StartNetwork = true;
return true;
}
else
return false;
}
catch
{
}
return false;
}
static string ip;
private static void CheckHmi()
{
HMISearch mysearch = new HMISearch(null);
int hmicount = 0;
bool ret = false;
while (true)
{
ret = mysearch.ThStart();
if (ret)
{
Thread.Sleep(3000);
hmicount = mysearch.HMICount();
if (hmicount >= 1)
{
ip = (((globaldata.DeviceInfo)(mysearch.myHMIList[0])).IpAddr);
globaldata.connection_ip = ip;
mysearch.ThStop();
break;
}
mysearch.ThStop();
ret = false;
}
else
{
mysearch.ReGetHmiIp();
Thread.Sleep(2000);
}
if (globaldata.OffLinkMode)
{
globaldata.connection_ip = "";
break;
}
}
}
private static void RunStartWin()
{
DialogResult dr = new StartWin().ShowDialog();
}
[STAThread] [STAThread]
static void Main() static void Main()
...@@ -142,21 +20,12 @@ namespace GcDevicePc ...@@ -142,21 +20,12 @@ namespace GcDevicePc
bool createNew; bool createNew;
Thread tStartWin = new Thread(RunStartWin)
{
IsBackground = true
};
tStartWin.Start();
Isnetworkok();
CheckHmi();
{ {
using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew)) using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
{ {
if (createNew) if (createNew)
{ {
Application.Run(new StartForm()); Application.Run(new StartForm());
// Application.Run(new Test());
} }
else else
{ {
...@@ -166,9 +35,6 @@ namespace GcDevicePc ...@@ -166,9 +35,6 @@ namespace GcDevicePc
} }
} }
} }
} }
} }
} }
GcDevicePc/RunTables.Designer.cs
View file @ 05093bee
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
this.LocalRunTableView = new System.Windows.Forms.DataGridView(); this.LocalRunTableView = new System.Windows.Forms.DataGridView();
this.delRunTable = new System.Windows.Forms.Button(); this.delRunTable = new System.Windows.Forms.Button();
this.addRunTable = new System.Windows.Forms.Button(); this.addRunTable = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.LocalMethodView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.LocalMethodView)).BeginInit();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -66,7 +67,7 @@ ...@@ -66,7 +67,7 @@
// //
// rtsave // rtsave
// //
this.rtsave.Location = new System.Drawing.Point(459, 316); this.rtsave.Location = new System.Drawing.Point(448, 316);
this.rtsave.Name = "rtsave"; this.rtsave.Name = "rtsave";
this.rtsave.Size = new System.Drawing.Size(75, 23); this.rtsave.Size = new System.Drawing.Size(75, 23);
this.rtsave.TabIndex = 0; this.rtsave.TabIndex = 0;
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
// //
// tabrun // tabrun
// //
this.tabrun.Location = new System.Drawing.Point(540, 316); this.tabrun.Location = new System.Drawing.Point(539, 316);
this.tabrun.Name = "tabrun"; this.tabrun.Name = "tabrun";
this.tabrun.Size = new System.Drawing.Size(93, 23); this.tabrun.Size = new System.Drawing.Size(93, 23);
this.tabrun.TabIndex = 1; this.tabrun.TabIndex = 1;
...@@ -98,6 +99,7 @@ ...@@ -98,6 +99,7 @@
// //
this.LocalMethodView.AllowUserToAddRows = false; this.LocalMethodView.AllowUserToAddRows = false;
this.LocalMethodView.AllowUserToDeleteRows = false; this.LocalMethodView.AllowUserToDeleteRows = false;
this.LocalMethodView.BackgroundColor = System.Drawing.Color.White;
this.LocalMethodView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.LocalMethodView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.LocalMethodView.Location = new System.Drawing.Point(7, 20); this.LocalMethodView.Location = new System.Drawing.Point(7, 20);
this.LocalMethodView.Name = "LocalMethodView"; this.LocalMethodView.Name = "LocalMethodView";
...@@ -186,6 +188,7 @@ ...@@ -186,6 +188,7 @@
// //
this.RunTableView.AllowDrop = true; this.RunTableView.AllowDrop = true;
this.RunTableView.AllowUserToAddRows = false; this.RunTableView.AllowUserToAddRows = false;
this.RunTableView.BackgroundColor = System.Drawing.Color.White;
this.RunTableView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.RunTableView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
this.RunTableView.Location = new System.Drawing.Point(13, 20); this.RunTableView.Location = new System.Drawing.Point(13, 20);
this.RunTableView.MultiSelect = false; this.RunTableView.MultiSelect = false;
...@@ -204,7 +207,7 @@ ...@@ -204,7 +207,7 @@
// //
// AddMethodbtn // AddMethodbtn
// //
this.AddMethodbtn.Location = new System.Drawing.Point(365, 316); this.AddMethodbtn.Location = new System.Drawing.Point(357, 316);
this.AddMethodbtn.Name = "AddMethodbtn"; this.AddMethodbtn.Name = "AddMethodbtn";
this.AddMethodbtn.Size = new System.Drawing.Size(75, 23); this.AddMethodbtn.Size = new System.Drawing.Size(75, 23);
this.AddMethodbtn.TabIndex = 4; this.AddMethodbtn.TabIndex = 4;
...@@ -258,7 +261,7 @@ ...@@ -258,7 +261,7 @@
// //
// stopbat // stopbat
// //
this.stopbat.Location = new System.Drawing.Point(650, 316); this.stopbat.Location = new System.Drawing.Point(648, 316);
this.stopbat.Name = "stopbat"; this.stopbat.Name = "stopbat";
this.stopbat.Size = new System.Drawing.Size(85, 23); this.stopbat.Size = new System.Drawing.Size(85, 23);
this.stopbat.TabIndex = 5; this.stopbat.TabIndex = 5;
...@@ -280,10 +283,13 @@ ...@@ -280,10 +283,13 @@
// //
this.LocalRunTableView.AllowUserToAddRows = false; this.LocalRunTableView.AllowUserToAddRows = false;
this.LocalRunTableView.AllowUserToDeleteRows = false; this.LocalRunTableView.AllowUserToDeleteRows = false;
this.LocalRunTableView.BackgroundColor = System.Drawing.Color.White;
this.LocalRunTableView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.LocalRunTableView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.LocalRunTableView.Location = new System.Drawing.Point(7, 20); this.LocalRunTableView.Location = new System.Drawing.Point(7, 20);
this.LocalRunTableView.Name = "LocalRunTableView"; this.LocalRunTableView.Name = "LocalRunTableView";
this.LocalRunTableView.ReadOnly = true;
this.LocalRunTableView.RowHeadersVisible = false; this.LocalRunTableView.RowHeadersVisible = false;
this.LocalRunTableView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders;
this.LocalRunTableView.RowTemplate.Height = 23; this.LocalRunTableView.RowTemplate.Height = 23;
this.LocalRunTableView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.LocalRunTableView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.LocalRunTableView.Size = new System.Drawing.Size(264, 104); this.LocalRunTableView.Size = new System.Drawing.Size(264, 104);
...@@ -296,7 +302,7 @@ ...@@ -296,7 +302,7 @@
this.delRunTable.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.delRunTable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.delRunTable.Location = new System.Drawing.Point(239, 340); this.delRunTable.Location = new System.Drawing.Point(239, 340);
this.delRunTable.Name = "delRunTable"; this.delRunTable.Name = "delRunTable";
this.delRunTable.Size = new System.Drawing.Size(28, 23); this.delRunTable.Size = new System.Drawing.Size(27, 23);
this.delRunTable.TabIndex = 7; this.delRunTable.TabIndex = 7;
this.delRunTable.Text = "-"; this.delRunTable.Text = "-";
this.delRunTable.UseVisualStyleBackColor = false; this.delRunTable.UseVisualStyleBackColor = false;
...@@ -313,11 +319,21 @@ ...@@ -313,11 +319,21 @@
this.addRunTable.UseVisualStyleBackColor = true; this.addRunTable.UseVisualStyleBackColor = true;
this.addRunTable.Click += new System.EventHandler(this.addRunTable_Click); this.addRunTable.Click += new System.EventHandler(this.addRunTable_Click);
// //
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(37, 343);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 9;
this.label4.Text = "双击选中";
//
// RunTables // RunTables
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(750, 380); this.ClientSize = new System.Drawing.Size(750, 380);
this.Controls.Add(this.label4);
this.Controls.Add(this.addRunTable); this.Controls.Add(this.addRunTable);
this.Controls.Add(this.delRunTable); this.Controls.Add(this.delRunTable);
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
...@@ -327,7 +343,9 @@ ...@@ -327,7 +343,9 @@
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.tabrun); this.Controls.Add(this.tabrun);
this.Controls.Add(this.rtsave); this.Controls.Add(this.rtsave);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "RunTables"; this.Name = "RunTables";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "批处理设置"; this.Text = "批处理设置";
...@@ -342,6 +360,7 @@ ...@@ -342,6 +360,7 @@
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.LocalRunTableView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LocalRunTableView)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }
...@@ -372,5 +391,6 @@ ...@@ -372,5 +391,6 @@
private System.Windows.Forms.DataGridView LocalRunTableView; private System.Windows.Forms.DataGridView LocalRunTableView;
private System.Windows.Forms.Button delRunTable; private System.Windows.Forms.Button delRunTable;
private System.Windows.Forms.Button addRunTable; private System.Windows.Forms.Button addRunTable;
private System.Windows.Forms.Label label4;
} }
} }
\ No newline at end of file
GcDevicePc/RunTables.cs
View file @ 05093bee
...@@ -515,7 +515,7 @@ namespace GcDevicePc ...@@ -515,7 +515,7 @@ namespace GcDevicePc
lfilename = null; lfilename = null;
rfilename = null; rfilename = null;
rfilename = RunTableView.Rows[i].Cells[1].Value.ToString(); rfilename = RunTableView.Rows[i].Cells[1].Value.ToString();
lfilename = System.IO.Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename); lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
if(rtclient != null) if(rtclient != null)
rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\"); rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
} }
......
GcDevicePc/SendConfig.Designer.cs
View file @ 05093bee
...@@ -93,7 +93,9 @@ ...@@ -93,7 +93,9 @@
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.localStatusList); this.Controls.Add(this.localStatusList);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "SendConfig"; this.Name = "SendConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "配置分发"; this.Text = "配置分发";
......
GcDevicePc/StartForm.Designer.cs
View file @ 05093bee
...@@ -29,43 +29,97 @@ ...@@ -29,43 +29,97 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StartForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StartForm));
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.bgpicture = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.offlinebth = new System.Windows.Forms.Button();
this.StartFormbgWorker = new System.ComponentModel.BackgroundWorker();
((System.ComponentModel.ISupportInitialize)(this.bgpicture)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// pictureBox1 // bgpicture
// //
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.bgpicture.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); this.bgpicture.Image = ((System.Drawing.Image)(resources.GetObject("bgpicture.Image")));
this.pictureBox1.ImageLocation = ""; this.bgpicture.ImageLocation = "";
this.pictureBox1.InitialImage = null; this.bgpicture.InitialImage = null;
this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.bgpicture.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Name = "pictureBox1"; this.bgpicture.Name = "bgpicture";
this.pictureBox1.Size = new System.Drawing.Size(479, 403); this.bgpicture.Size = new System.Drawing.Size(479, 403);
this.pictureBox1.TabIndex = 0; this.bgpicture.TabIndex = 0;
this.pictureBox1.TabStop = false; this.bgpicture.TabStop = false;
this.bgpicture.Paint += new System.Windows.Forms.PaintEventHandler(this.bgpicture_Paint);
this.bgpicture.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.bgpicture_MouseDoubleClick);
//
// label1
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.SystemColors.Control;
this.label1.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(12, 372);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(76, 19);
this.label1.TabIndex = 1;
this.label1.Text = "初始化:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.SystemColors.Control;
this.label2.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.White;
this.label2.Location = new System.Drawing.Point(93, 372);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(69, 19);
this.label2.TabIndex = 2;
this.label2.Text = "label2";
//
// offlinebth
//
this.offlinebth.Location = new System.Drawing.Point(392, 368);
this.offlinebth.Name = "offlinebth";
this.offlinebth.Size = new System.Drawing.Size(75, 23);
this.offlinebth.TabIndex = 3;
this.offlinebth.Text = "离线模式";
this.offlinebth.UseVisualStyleBackColor = true;
this.offlinebth.Click += new System.EventHandler(this.offlinebth_Click);
//
// StartFormbgWorker
//
this.StartFormbgWorker.WorkerReportsProgress = true;
this.StartFormbgWorker.WorkerSupportsCancellation = true;
this.StartFormbgWorker.DoWork += new System.ComponentModel.DoWorkEventHandler(this.StartFormbgWorker_DoWork);
this.StartFormbgWorker.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.StartFormbgWorker_ProgressChanged);
// //
// StartForm // StartForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(479, 403); this.ClientSize = new System.Drawing.Size(479, 403);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.offlinebth);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.bgpicture);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "StartForm"; this.Name = "StartForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "StartForm"; this.Text = "StartForm";
this.TopMost = true;
this.Load += new System.EventHandler(this.StartForm_Load); this.Load += new System.EventHandler(this.StartForm_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bgpicture)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }
#endregion #endregion
private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox bgpicture;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button offlinebth;
private System.ComponentModel.BackgroundWorker StartFormbgWorker;
} }
} }
\ No newline at end of file
GcDevicePc/StartForm.cs
View file @ 05093bee
using System; using System;
using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Threading; using System.Threading;
...@@ -13,28 +8,34 @@ namespace GcDevicePc ...@@ -13,28 +8,34 @@ namespace GcDevicePc
{ {
public partial class StartForm : Form public partial class StartForm : Form
{ {
private double m_CurrentOpacity = 0; #region 窗口效果需要变量
private double _mCurrentOpacity;
private const double OpacityInterval = 0.02; //0.02 private const double OpacityInterval = 0.02; //0.02
private const double StayTime = 2000; //5s private const double StayTime = 2000; //5s
System.Timers.Timer _opacityTimer;
#endregion
private String _appInitInfo = "系统初始化开始";
private int _initSec;
private int _initStep;
System.Timers.Timer OpacityTimer; private static Thread _tPreload;
static Thread t_preload; private MainForm _mMainForm;
MainForm m_mainform;
#region 窗口淡入淡出效果
private void OpacityTimerProcOpen(object sender, System.Timers.ElapsedEventArgs e) private void OpacityTimerProcOpen(object sender, System.Timers.ElapsedEventArgs e)
{ {
if (this.m_CurrentOpacity < 1) if (_mCurrentOpacity < 1)
{ {
////如果当前的透明度小于1，则继续增加透明度 ////如果当前的透明度小于1，则继续增加透明度
this.m_CurrentOpacity += OpacityInterval; _mCurrentOpacity += OpacityInterval;
MethodInvoker mi = new MethodInvoker(UpdateFrmOpacity); MethodInvoker mi = new MethodInvoker(UpdateFrmOpacity);
this.BeginInvoke(mi); BeginInvoke(mi);
} }
else else
{ {
//如果当前已经完全不透明，则停止timer //如果当前已经完全不透明，则停止timer
this.OpacityTimer.Stop(); _opacityTimer.Stop();
System.Timers.Timer t = new System.Timers.Timer(StayTime); //设置时间间隔为5秒 System.Timers.Timer t = new System.Timers.Timer(StayTime); //设置时间间隔为5秒
t.Elapsed += new System.Timers.ElapsedEventHandler(Timer_TimesUp); t.Elapsed += new System.Timers.ElapsedEventHandler(Timer_TimesUp);
t.AutoReset = false; //每到指定时间Elapsed事件是触发一次（false），还是一直触发（true） t.AutoReset = false; //每到指定时间Elapsed事件是触发一次（false），还是一直触发（true）
...@@ -44,20 +45,20 @@ namespace GcDevicePc ...@@ -44,20 +45,20 @@ namespace GcDevicePc
private void OpacityTimerProcClose(object sender, EventArgs e) private void OpacityTimerProcClose(object sender, EventArgs e)
{ {
if (this.m_CurrentOpacity > 0) if (this._mCurrentOpacity > 0)
{ {
t_preload.Join(); //拦截透明度下降请求 _tPreload.Join(); //拦截透明度下降请求
//如果当前的透明度>0，则降低透明度 //如果当前的透明度>0，则降低透明度
this.m_CurrentOpacity -= OpacityInterval; this._mCurrentOpacity -= OpacityInterval;
MethodInvoker mi = new MethodInvoker(UpdateFrmOpacity); MethodInvoker mi = new MethodInvoker(UpdateFrmOpacity);
this.BeginInvoke(mi); this.BeginInvoke(mi);
} }
else else
{ {
//如果完全不透明，则关闭降低透明度timer,且关闭窗体 //如果完全不透明，则关闭降低透明度timer,且关闭窗体
this.OpacityTimer.Stop(); this._opacityTimer.Stop();
this.OpacityTimer.Enabled = false; this._opacityTimer.Enabled = false;
MethodInvoker mi = new MethodInvoker(MainFrmStartProc); MethodInvoker mi = new MethodInvoker(MainFrmStartProc);
this.BeginInvoke(mi); this.BeginInvoke(mi);
...@@ -66,36 +67,59 @@ namespace GcDevicePc ...@@ -66,36 +67,59 @@ namespace GcDevicePc
private void UpdateFrmOpacity() private void UpdateFrmOpacity()
{ {
this.Opacity = this.m_CurrentOpacity; this.Opacity = this._mCurrentOpacity;
} }
public StartForm() private void Timer_TimesUp(object sender, System.Timers.ElapsedEventArgs e)
{ {
InitializeComponent(); _opacityTimer = new System.Timers.Timer();
_opacityTimer.Interval = 30;
_opacityTimer.Elapsed += new System.Timers.ElapsedEventHandler(OpacityTimerProcClose);
_opacityTimer.Start();
}
#endregion
private void bgpicture_Paint(object sender, PaintEventArgs e)
{
foreach (Control C in this.Controls)
{
if (C is Label)
{
Label L = (Label)C;
L.Visible = false;
e.Graphics.DrawString(L.Text, L.Font, new
SolidBrush(L.ForeColor), L.Left - bgpicture.Left, L.Top - bgpicture.Top);
}
}
}
this.Opacity = this.m_CurrentOpacity; private void bgpicture_MouseDoubleClick(object sender, MouseEventArgs e)
OpacityTimer = new System.Timers.Timer(); {
OpacityTimer.Interval = 30; offlinebth.Visible = true;
OpacityTimer.Elapsed += new System.Timers.ElapsedEventHandler(OpacityTimerProcOpen); offlinebth.Enabled = true;
OpacityTimer.Start();
} }
private void Timer_TimesUp(object sender, System.Timers.ElapsedEventArgs e) public StartForm()
{ {
OpacityTimer = new System.Timers.Timer(); InitializeComponent();
OpacityTimer.Interval = 30;
OpacityTimer.Elapsed += new System.Timers.ElapsedEventHandler(OpacityTimerProcClose); Opacity = _mCurrentOpacity;
OpacityTimer.Start(); _opacityTimer = new System.Timers.Timer();
_opacityTimer.Interval = 30;
_opacityTimer.Elapsed += new System.Timers.ElapsedEventHandler(OpacityTimerProcOpen);
_opacityTimer.Start();
} }
private void MainFrmStartProc() private void MainFrmStartProc()
{ {
if (t_preload != null) if (_tPreload != null)
{ {
t_preload.Join(); _tPreload.Join();
m_mainform = new MainForm(); _mMainForm = new MainForm();
this.Hide(); StartFormbgWorker.CancelAsync();
m_mainform.Show(); Hide();
_mMainForm.Show();
} }
} }
...@@ -106,25 +130,68 @@ namespace GcDevicePc ...@@ -106,25 +130,68 @@ namespace GcDevicePc
/// <param name="e"></param> /// <param name="e"></param>
private void StartForm_Load(object sender, EventArgs e) private void StartForm_Load(object sender, EventArgs e)
{ {
offlinebth.Enabled = false;
offlinebth.Visible = false;
StartFormbgWorker.RunWorkerAsync();
//载入时开启预载线程 //载入时开启预载线程
t_preload = new Thread(PreLoadingProc); _tPreload = new Thread(PreLoadingProc);
t_preload.IsBackground = true; _tPreload.IsBackground = true;
t_preload.Start(); _tPreload.Start();
} }
/// <summary> /// <summary>
/// 预载操作 /// 预载操作
/// </summary> /// </summary>
private void PreLoadingProc() private void PreLoadingProc()
{ {
_appInitInfo = "系统初始化开始";
_appInitInfo = "检测本地网络";
globaldata.m_appinit.LocalNetworkCheck();
_appInitInfo = "搜寻设备";
globaldata.m_appinit.ConnectionIPInit();
_appInitInfo = "检查运行环境";
globaldata.m_appinit.InitAppFolder(); globaldata.m_appinit.InitAppFolder();
_appInitInfo = "载入方法配置";
globaldata.m_appinit.InitAppDefaultConfig(); globaldata.m_appinit.InitAppDefaultConfig();
}
private void StartFormbgWorker_DoWork(object sender, DoWorkEventArgs e)
{
var worker = sender as BackgroundWorker;
while (true)
{
if (StartFormbgWorker.CancellationPending)
{
e.Cancel = true;
break;
}
// globaldata.m_appinit.InitDB(); _initSec++;
// globaldata.m_appinit.InitAllGC(); string tail = "";
//globaldata.m_appinit.InitAllGCConfig(); for (int i = 0; i < (_initSec % 4); i++)
//globaldata.m_appinit.InitGCThread(); {
//globaldata.m_appinit.InitGCControl(); tail += ".";
}
if (worker != null)
worker.ReportProgress(50, _appInitInfo + tail);
Thread.Sleep(500);
}
}
private void StartFormbgWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
{
label2.Text = e.UserState.ToString();
bgpicture.Invalidate();
}
private void offlinebth_Click(object sender, EventArgs e)
{
globaldata.OffLinkMode = true;
} }
} }
} }
GcDevicePc/StartForm.resx
View file @ 05093bee
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="bgpicture.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAd8AAAGTCAIAAADm+I8YAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAu iVBORw0KGgoAAAANSUhEUgAAAd8AAAGTCAIAAADm+I8YAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAu
IgAALiIBquLdkgAA/7JJREFUeF7M/fmXJEmS3wcWOsPdLnePcI/w+749PO47IyIz8r6Pqsq676quPqd7 IgAALiIBquLdkgAA/7JJREFUeF7M/fmXJEmS3wcWOsPdLnePcI/w+749PO47IyIz8r6Pqsq676quPqd7
...@@ -3597,6 +3597,9 @@ ...@@ -3597,6 +3597,9 @@
hvuLW8h2iMssDWofeG+b3WYBVzId17i9x8ubsYnLOMPbhWWxpv3/AR2VLtfAMfOXAAAAAElFTkSuQmCC hvuLW8h2iMssDWofeG+b3WYBVzId17i9x8ubsYnLOMPbhWWxpv3/AR2VLtfAMfOXAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="StartFormbgWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
......
GcDevicePc/StartWin.Designer.cs deleted 100644 → 0
View file @ 5e1bfd33
namespace GcDevicePc
{
partial class StartWin
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StartWin));
this.searchinfo = new System.Windows.Forms.Label();
this.checkhmitimer = new System.Windows.Forms.Timer(this.components);
this.infopanel = new System.Windows.Forms.Panel();
this.offline = new System.Windows.Forms.Button();
this.infopanel.SuspendLayout();
this.SuspendLayout();
//
// searchinfo
//
this.searchinfo.AutoSize = true;
this.searchinfo.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.searchinfo.Location = new System.Drawing.Point(64, 23);
this.searchinfo.Name = "searchinfo";
this.searchinfo.Size = new System.Drawing.Size(88, 16);
this.searchinfo.TabIndex = 0;
this.searchinfo.Text = "系统启动中";
//
// checkhmitimer
//
this.checkhmitimer.Enabled = true;
this.checkhmitimer.Interval = 1000;
this.checkhmitimer.Tick += new System.EventHandler(this.checkhmitimer_Tick);
//
// infopanel
//
this.infopanel.BackColor = System.Drawing.Color.White;
this.infopanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.infopanel.Controls.Add(this.searchinfo);
this.infopanel.Location = new System.Drawing.Point(12, 12);
this.infopanel.Name = "infopanel";
this.infopanel.Size = new System.Drawing.Size(225, 63);
this.infopanel.TabIndex = 1;
//
// offline
//
this.offline.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.offline.Location = new System.Drawing.Point(79, 81);
this.offline.Name = "offline";
this.offline.Size = new System.Drawing.Size(75, 23);
this.offline.TabIndex = 2;
this.offline.Text = "offline";
this.offline.UseVisualStyleBackColor = true;
this.offline.Click += new System.EventHandler(this.offline_Click);
//
// StartWin
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(238)))), ((int)(((byte)(250)))));
this.ClientSize = new System.Drawing.Size(249, 112);
this.Controls.Add(this.offline);
this.Controls.Add(this.infopanel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "StartWin";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "StartWin";
this.infopanel.ResumeLayout(false);
this.infopanel.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Label searchinfo;
private System.Windows.Forms.Timer checkhmitimer;
private System.Windows.Forms.Panel infopanel;
private System.Windows.Forms.Button offline;
}
}
\ No newline at end of file
GcDevicePc/StartWin.cs deleted 100644 → 0
View file @ 5e1bfd33
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace GcDevicePc
{
public partial class StartWin : Form
{
private int searchsec = 0;
private int i = 0;
public StartWin()
{
InitializeComponent();
}
private void checkhmitimer_Tick(object sender, EventArgs e)
{
searchsec++;
if(globaldata.StartNetwork)
{
if (!String.IsNullOrEmpty(globaldata.connection_ip))
{
this.Close();
}
else
{
this.searchinfo.Text = "设备搜索中";
for (i = 0; i < (searchsec % 4); i++)
{
this.searchinfo.Text += ".";
}
}
}
else
{
this.searchinfo.Text = "本机网络未就绪";
for (i = 0; i < (searchsec % 4); i++)
{
this.searchinfo.Text += ".";
}
}
if (globaldata.OffLinkMode)
{
this.Close();
}
}
private void offline_Click(object sender, EventArgs e)
{
globaldata.OffLinkMode = true;
}
}
}
GcDevicePc/StartWin.resx deleted 100644 → 0
View file @ 5e1bfd33
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="checkhmitimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApItECKiPQRioj
0M0qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9DNKiPQRiki
0QIpItFOKSLR7Ski0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR7Ski0U4pItPZKSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki09kpItT9KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P0oIdb/KCHW/ygh1v8oIdb/KCHV+Skh
1acpIdVAKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSHVJikh1UgpIdWnKCHV+Sgh1v8oIdb/KCHW/ygh1v8oIdf/KCHX/ygh
1/8oIdf/KCHXrSkh1ioAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApIdYqKCHXrSgh1/8oIdf/KCHX/ygh
1/8oINj/KCDY/ygg2P8oINj/KCHYZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCHYZigg
2P8oINj/KCDY/ygg2P8nINr/JyDa/ycg2v8nINr/JyDZWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAJyDZWCcg2v8nINr/JyDa/ycg2v8nINv/JyDb/ycg2/8nINv/JyDbXAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAJyDbXCcg2/8nINv/JyDb/ycg2/8nH93/Jx/d/ycf3f8nH93/Jx/dXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/dXCcf3f8nH93/Jx/d/ycf3f8nH97/Jx/e/ycf
3v8nH97/Jx/eXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/eXCcf3v8nH97/Jx/e/ycf
3v8nH9//Jx/f/ycf3/8nH9//Jx/fXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/fXCcf
3/8nH9//Jx/f/ycf3/8mH+H/Jh/h/yYf4f8mH+H/Jh/hXCcg6/8nIOv/JyDr/ycg6/8nIOv/JyDr/ycg
6/8mIOv/Jh/r/ygi7GInIewEJyHsECYg67smH+v/JiDr/ycg6/8nIOv/JyDr/ycg6/8mH+v/Jh/r/yom
7A4oIuy/JyDr/ych7P8mH+v/Jh7q/yYf680lHeo8JR7q/yYe6v8mHur/JR3q/yUd6v8lHer/JBzq/yQc
6v8kHOr/Jh/hXCYf4f8mH+H/Jh/h/yYf4f8mHuL/Jh7i/yYe4v8mHuL/Jh7iXCkm7J8pJuyrKSbsqykm
7KspJuyrKSbsqykl7K0rKOzjKyjs/yso7M0tLO0ULSrsPCoo7NkrKOz9Kifszykl7KsqJuyrKSbsqykl
7K0rKeztKyjs/zM17kAvLu25LSrt/ysm7N0nIOnfJx/o/ycg6b8mHuk8JyDq9ygg6v8nH+rjJh7qxSYe
660mHuurJR3rqyQd66skHeufJh7iXCYe4v8mHuL/Jh7i/yYe4v8mHuT/Jh7k/yYe5P8mHuT/Jh7kXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMO1wMDHt9y8w7f80OO46MjTtcC8w7fswMe3nLi7tTAAA
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
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAPUbvXD1G7/89Ru//PUbv/z1G7/8/Su//P0rv/z9K7/8/Su//P0rvXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0rvXD9K7/8/Su//P0rv/z9K7/9DT+//Q0/v/0NP
7/9DT+//Q0/vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0/vXENP7/9DT+//Q0/v/0NP
7/9GVPD/RlTw/0ZU8P9GVPD/RlTwXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARlTwXEZU
8P9GVPD/RlTw/0ZU8P9JWfD/SVnw/0lZ8P9JWfD/SVrwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAASVrwWElZ8P9JWfD/SVnw/0lZ8P9MX/H/TF/x/0xf8f9MXvH/TWHxZgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAATWHxZkxe8f9MX/H/TF/x/0xf8f9PY/H/T2Px/09j8f9PY/H/T2LxrVBl
8SpTafEGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8QZQZfEqT2LxrU9j8f9PY/H/T2Px/09j8f9SaPH/Umjx/1Jo
8f9SaPH/Umjx+VFo8aNTafFcU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8VxRaPGjUmjx+VJo8f9SaPH/Umjx/1Jo
8f9UbfL9VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v1XcfLZV3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8tlZdfJOWnby7Vp28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby7Vl18k5ZdfICXXnzRl17881dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9de/PNXXnzRll18gIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
AAD///////8AAMAAAAAAAwAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA//////AAAAH/////+AAAA//
////8AAAD//////wAAAP//////AAAA//////8AAAD//////wAAAP//////AAAAgDgCBAEAAACAGAIEAQ
AAAP+Z8ER/AAAA/4H4RH8AAAD/gfhk/wAAAP/D/OT/AAAA/8P85P8AAAD/4//k/wAAAP/n/+X/AAAA//
//5f8AAAD////l/wAAAP///+H/AAAA////4f8AAAD////h/wAAAP///+P/AAAA////4/8AAAD//////w
AAAP//////AAAA//////8AAAD//////wAAAP//////AAAA//////8AAAB//////gAAAD/////8AAAAAA
AAAAAAAAAAAAAAAAAACAAAAAAAEAAMAAAAAAAwAA////////AAD///////8AAP///////wAA////////
AAA=
</value>
</data>
</root>
\ No newline at end of file
GcDevicePc/UpdateTest.Designer.cs deleted 100644 → 0
View file @ 5e1bfd33
namespace GcDevicePc
{
partial class UpdateTest
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateTest));
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.localstr = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.runbtn = new System.Windows.Forms.Button();
this.chosenbtn = new System.Windows.Forms.Button();
this.updatebtn = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.ProName = new System.Windows.Forms.TextBox();
this.CHmibtn = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
this.groupBox1.Controls.Add(this.localstr);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.runbtn);
this.groupBox1.Controls.Add(this.chosenbtn);
this.groupBox1.Controls.Add(this.updatebtn);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.ProName);
this.groupBox1.Controls.Add(this.CHmibtn);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(434, 169);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "程序更新";
//
// localstr
//
this.localstr.AutoSize = true;
this.localstr.Location = new System.Drawing.Point(53, 69);
this.localstr.Name = "localstr";
this.localstr.Size = new System.Drawing.Size(17, 12);
this.localstr.TabIndex = 7;
this.localstr.Text = "空";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(6, 69);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.TabIndex = 6;
this.label2.Text = "目录：";
//
// runbtn
//
this.runbtn.Location = new System.Drawing.Point(154, 131);
this.runbtn.Name = "runbtn";
this.runbtn.Size = new System.Drawing.Size(127, 23);
this.runbtn.TabIndex = 5;
this.runbtn.Text = "运行HMI程序";
this.runbtn.UseVisualStyleBackColor = true;
this.runbtn.Click += new System.EventHandler(this.runbtn_Click);
//
// chosenbtn
//
this.chosenbtn.Location = new System.Drawing.Point(215, 94);
this.chosenbtn.Name = "chosenbtn";
this.chosenbtn.Size = new System.Drawing.Size(75, 23);
this.chosenbtn.TabIndex = 4;
this.chosenbtn.Text = "选择";
this.chosenbtn.UseVisualStyleBackColor = true;
this.chosenbtn.Click += new System.EventHandler(this.chosenbtn_Click);
//
// updatebtn
//
this.updatebtn.Location = new System.Drawing.Point(317, 95);
this.updatebtn.Name = "updatebtn";
this.updatebtn.Size = new System.Drawing.Size(75, 23);
this.updatebtn.TabIndex = 3;
this.updatebtn.Text = "更新";
this.updatebtn.UseVisualStyleBackColor = true;
this.updatebtn.Click += new System.EventHandler(this.updatebtn_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 100);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 2;
this.label1.Text = "程序：";
//
// ProName
//
this.ProName.Enabled = false;
this.ProName.Location = new System.Drawing.Point(53, 96);
this.ProName.Name = "ProName";
this.ProName.Size = new System.Drawing.Size(141, 21);
this.ProName.TabIndex = 1;
this.ProName.Text = "GcDevice.exe";
//
// CHmibtn
//
this.CHmibtn.Location = new System.Drawing.Point(154, 30);
this.CHmibtn.Name = "CHmibtn";
this.CHmibtn.Size = new System.Drawing.Size(127, 23);
this.CHmibtn.TabIndex = 0;
this.CHmibtn.Text = "关闭HMI程序";
this.CHmibtn.UseVisualStyleBackColor = true;
this.CHmibtn.Click += new System.EventHandler(this.CHmibtn_Click);
//
// UpdateTest
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(458, 193);
this.Controls.Add(this.groupBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "UpdateTest";
this.Text = "更新测试";
this.TopMost = true;
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Button CHmibtn;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox ProName;
private System.Windows.Forms.Button updatebtn;
private System.Windows.Forms.Button chosenbtn;
private System.Windows.Forms.Button runbtn;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label localstr;
}
}
\ No newline at end of file
GcDevicePc/UpdateTest.cs deleted 100644 → 0
View file @ 5e1bfd33
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.IO;
namespace GcDevicePc
{
public partial class UpdateTest : Form
{
public UpdateTest()
{
InitializeComponent();
//this.updatebtn.Enabled = false;
//this.runbtn.Enabled = false;
}
private string updateexe = null;
private string localpath = null;
//private string ip = "192.168.1.57";
//private ushort port = 911;
private void CHmibtn_Click(object sender, EventArgs e)
{
if (globaldata.connection_ip != null && globaldata.connection_ip !="")
{
int ret;
FileServerClient singlesend = new FileServerClient();
singlesend.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
// singlesend.WtClientInit(ip, port);
ret = singlesend.WtHMICloseRro("WtMainProc");
singlesend.WtClientClose();
this.runbtn.Enabled = true;
}
}
private void updatebtn_Click(object sender, EventArgs e)
{
int ret;
if (globaldata.connection_ip != null && globaldata.connection_ip != "")
{
FileServerClient singlesend = new FileServerClient();
singlesend.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
//singlesend.WtClientInit(ip, port);
ret = singlesend.WtClientCopytoServer(this.updateexe, this.localpath, globaldata.remoteFolder);
if(ret == 0)
{
MessageBox.Show("发送成功");
}
singlesend.WtClientClose();
}
}
private void runbtn_Click(object sender, EventArgs e)
{
int ret;
if (globaldata.connection_ip != null && globaldata.connection_ip != "")
{
FileServerClient singlesend = new FileServerClient();
singlesend.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
// singlesend.WtClientInit(ip, port);
ret = singlesend.WtHMIRunPro("GcDevice.exe", globaldata.exeremoteFolder);
singlesend.WtClientClose();
}
}
private void chosenbtn_Click(object sender, EventArgs e)
{
string file;
OpenFileDialog fileDlg = new OpenFileDialog();
fileDlg.Multiselect = false;
fileDlg.InitialDirectory = Application.StartupPath + "\\仪器方法";
fileDlg.Title = "请选择方法文件";
fileDlg.Filter = "更新程序(*.*)|*.*";
if (fileDlg.ShowDialog() == DialogResult.OK)
{
file = fileDlg.FileName;
this.updateexe = file.Substring(file.LastIndexOf("\\") + 1);
this.localpath = file; // Path.GetDirectoryName(file);
this.localstr.Text = this.localpath;
this.ProName.Text = this.updateexe;
this.updatebtn.Enabled = true;
}
}
}
}
GcDevicePc/UpdateTest.resx deleted 100644 → 0
View file @ 5e1bfd33
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApItECKiPQRioj
0M0qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9DNKiPQRiki
0QIpItFOKSLR7Ski0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR7Ski0U4pItPZKSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki09kpItT9KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P0oIdb/KCHW/ygh1v8oIdb/KCHV+Skh
1acpIdVAKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSHVJikh1UgpIdWnKCHV+Sgh1v8oIdb/KCHW/ygh1v8oIdf/KCHX/ygh
1/8oIdf/KCHXrSkh1ioAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApIdYqKCHXrSgh1/8oIdf/KCHX/ygh
1/8oINj/KCDY/ygg2P8oINj/KCHYZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCHYZigg
2P8oINj/KCDY/ygg2P8nINr/JyDa/ycg2v8nINr/JyDZWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAJyDZWCcg2v8nINr/JyDa/ycg2v8nINv/JyDb/ycg2/8nINv/JyDbXAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAJyDbXCcg2/8nINv/JyDb/ycg2/8nH93/Jx/d/ycf3f8nH93/Jx/dXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/dXCcf3f8nH93/Jx/d/ycf3f8nH97/Jx/e/ycf
3v8nH97/Jx/eXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/eXCcf3v8nH97/Jx/e/ycf
3v8nH9//Jx/f/ycf3/8nH9//Jx/fXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/fXCcf
3/8nH9//Jx/f/ycf3/8mH+H/Jh/h/yYf4f8mH+H/Jh/hXCcg6/8nIOv/JyDr/ycg6/8nIOv/JyDr/ycg
6/8mIOv/Jh/r/ygi7GInIewEJyHsECYg67smH+v/JiDr/ycg6/8nIOv/JyDr/ycg6/8mH+v/Jh/r/yom
7A4oIuy/JyDr/ych7P8mH+v/Jh7q/yYf680lHeo8JR7q/yYe6v8mHur/JR3q/yUd6v8lHer/JBzq/yQc
6v8kHOr/Jh/hXCYf4f8mH+H/Jh/h/yYf4f8mHuL/Jh7i/yYe4v8mHuL/Jh7iXCkm7J8pJuyrKSbsqykm
7KspJuyrKSbsqykl7K0rKOzjKyjs/yso7M0tLO0ULSrsPCoo7NkrKOz9Kifszykl7KsqJuyrKSbsqykl
7K0rKeztKyjs/zM17kAvLu25LSrt/ysm7N0nIOnfJx/o/ycg6b8mHuk8JyDq9ygg6v8nH+rjJh7qxSYe
660mHuurJR3rqyQd66skHeufJh7iXCYe4v8mHuL/Jh7i/yYe4v8mHuT/Jh7k/yYe5P8mHuT/Jh7kXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMO1wMDHt9y8w7f80OO46MjTtcC8w7fswMe3nLi7tTAAA
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
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAPUbvXD1G7/89Ru//PUbv/z1G7/8/Su//P0rv/z9K7/8/Su//P0rvXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0rvXD9K7/8/Su//P0rv/z9K7/9DT+//Q0/v/0NP
7/9DT+//Q0/vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0/vXENP7/9DT+//Q0/v/0NP
7/9GVPD/RlTw/0ZU8P9GVPD/RlTwXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARlTwXEZU
8P9GVPD/RlTw/0ZU8P9JWfD/SVnw/0lZ8P9JWfD/SVrwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAASVrwWElZ8P9JWfD/SVnw/0lZ8P9MX/H/TF/x/0xf8f9MXvH/TWHxZgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAATWHxZkxe8f9MX/H/TF/x/0xf8f9PY/H/T2Px/09j8f9PY/H/T2LxrVBl
8SpTafEGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8QZQZfEqT2LxrU9j8f9PY/H/T2Px/09j8f9SaPH/Umjx/1Jo
8f9SaPH/Umjx+VFo8aNTafFcU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8VxRaPGjUmjx+VJo8f9SaPH/Umjx/1Jo
8f9UbfL9VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v1XcfLZV3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8tlZdfJOWnby7Vp28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby7Vl18k5ZdfICXXnzRl17881dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9de/PNXXnzRll18gIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
AAD///////8AAMAAAAAAAwAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA//////AAAAH/////+AAAA//
////8AAAD//////wAAAP//////AAAA//////8AAAD//////wAAAP//////AAAAgDgCBAEAAACAGAIEAQ
AAAP+Z8ER/AAAA/4H4RH8AAAD/gfhk/wAAAP/D/OT/AAAA/8P85P8AAAD/4//k/wAAAP/n/+X/AAAA//
//5f8AAAD////l/wAAAP///+H/AAAA////4f8AAAD////h/wAAAP///+P/AAAA////4/8AAAD//////w
AAAP//////AAAA//////8AAAD//////wAAAP//////AAAA//////8AAAB//////gAAAD/////8AAAAAA
AAAAAAAAAAAAAAAAAACAAAAAAAEAAMAAAAAAAwAA////////AAD///////8AAP///////wAA////////
AAA=
</value>
</data>
</root>
\ No newline at end of file
GcDevicePc/UserConfig.Designer.cs
View file @ 05093bee
...@@ -485,6 +485,7 @@ ...@@ -485,6 +485,7 @@
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "UserConfig"; this.Name = "UserConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
......
GcDevicePc/WaitForm.Designer.cs
View file @ 05093bee
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
this.ClientSize = new System.Drawing.Size(339, 98); this.ClientSize = new System.Drawing.Size(339, 98);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.progressBar1); this.Controls.Add(this.progressBar1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "WaitForm"; this.Name = "WaitForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
......
GcDevicePc/auxtool.Designer.cs
View file @ 05093bee
...@@ -372,7 +372,9 @@ ...@@ -372,7 +372,9 @@
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "auxtool"; this.Name = "auxtool";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "辅助工具"; this.Text = "辅助工具";
......
GcDevicePc/auxtool.cs
View file @ 05093bee
...@@ -188,7 +188,6 @@ namespace GcDevicePc ...@@ -188,7 +188,6 @@ namespace GcDevicePc
private void updatebtn_Click(object sender, EventArgs e) private void updatebtn_Click(object sender, EventArgs e)
{ {
// int ret;
if (HmiIP != null) if (HmiIP != null)
{ {
this.CHmibtn.Enabled = false; this.CHmibtn.Enabled = false;
...@@ -200,19 +199,6 @@ namespace GcDevicePc ...@@ -200,19 +199,6 @@ namespace GcDevicePc
Thread fThread = new Thread(new ThreadStart(SleepT)); Thread fThread = new Thread(new ThreadStart(SleepT));
fThread.IsBackground = true; fThread.IsBackground = true;
fThread.Start(); fThread.Start();
//FileServerClient singlesend = new FileServerClient();
//singlesend.WtClientInit(HmiIP, HmiPort);
//ret = singlesend.WtClientCopytoServer(this.updateexe, this.localpath, "\\Hard Disk\\");
//if (ret == 1)
//{
// MessageBox.Show("更新成功");
//}
//singlesend.WtClientClose();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment