Skip to content

G
GC_Branch
Commit 42831dfa authored by 周磊's avatar 周磊
Browse files
Options

1.版本变更至2.0.3 

2.选项新增"温度精度":保留一位,保留两位.重启生效,影响界面的温度值小数点显示
parent e66588c8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 98431 additions and 1011 deletions
GcDevicePc/DataState.cs
View file @ 42831dfa
......@@ -1037,9 +1037,15 @@ namespace GcDevicePc
}
else
{
switch (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.TempAccuracy)
{
case "保留一位": return data.ToString("#0.0");
case "保留两位": return data.ToString("#0.00");
default:
return data.ToString("#0.0");
}
}
}
double fDetvalueold = 0;
double iDetvalueold = 0;
......@@ -1932,7 +1938,7 @@ namespace GcDevicePc
this.datalist.Items.Add(tempshow);
tempshow = new ListViewItem();
tempshow.Text = bEnglishLanguage == false ? "桥流值" : "Electric";
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showDet.fDetStatue.ToString()+"mA");
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showDet.fDetStatue.ToString() + "mA");
this.datalist.Items.Add(tempshow);
}
else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1)
......@@ -2125,7 +2131,7 @@ namespace GcDevicePc
tempshow = new ListViewItem();
tempshow.Text = bEnglishLanguage == false ? "桥流值" : "Electric(mA)";
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showDet.iDetStatue.ToString()+"mA");
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showDet.iDetStatue.ToString() + "mA");
this.datalist.Items.Add(tempshow);
}
//else if ((CProfileDevice.m_DevParam.syspara.u16DetInterType == 1 ||
......@@ -2306,7 +2312,7 @@ namespace GcDevicePc
tempshow = new ListViewItem();
tempshow.Text = bEnglishLanguage == false ? "桥流值" : "Electric(mA)";
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showDet.bDetStatue.ToString()+"mA");
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showDet.bDetStatue.ToString() + "mA");
this.datalist.Items.Add(tempshow);
}
//else if ((CProfileDevice.m_DevParam.syspara.u16DetBehindType == 1 ||
......
GcDevicePc/GCBuffer/PCBuffer.cs
View file @ 42831dfa
......@@ -93,6 +93,10 @@ namespace GcDevicePc.GCBuffer
public string hmimac; //
public bool hmi_log; //
public string sendType;
/// <summary>
/// 温度精度
/// </summary>
public string TempAccuracy;
}
public struct ModuleInfo
......@@ -162,14 +166,14 @@ namespace GcDevicePc.GCBuffer
gcpcinfo.pcworkinfo.system_Statue = false;
gcpcinfo.pcworkinfo.work_Statue = 0;
gcpcinfo.pcworkinfo.TempAccuracy="保留一位";
gcpcinfo.pcworkinfo.info_log = false;
gcpcinfo.pcworkinfo.error_log = false;
gcpcinfo.pcworkinfo.hmi_log = false;
gcpcinfo.pcworkinfo.sendtoZb = false;
gcpcinfo.pcworkinfo.sendtohw = false;
gcpcinfo.pcworkinfo.sendtoSP = false;
gcpcinfo.pcworkinfo.sendType=null;
gcpcinfo.pcworkinfo.sendType = null;
gcpcinfo.moduleinfo.ip = "";
gcpcinfo.outputinfo.port = 0;
......@@ -194,20 +198,20 @@ namespace GcDevicePc.GCBuffer
int opensys = ini.ReadInteger("StartUp", "打开系统");
int runtype = ini.ReadInteger("StartUp", "运行类型");
string strpath=ini.ReadString("DataFolder", "历史数据");
if (strpath=="")
gcpcinfo.pcworkinfo.TempAccuracy= ini.ReadString("StartUp", "温度精度");
string strpath = ini.ReadString("DataFolder", "历史数据");
if (strpath == "")
{
string strnewpath=Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\Historical Data");
gcpcinfo.pcfolderinfo.DataFolder =strnewpath ;
ini.WriteString("DataFolder", "历史数据",strnewpath);
string strnewpath = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\Historical Data");
gcpcinfo.pcfolderinfo.DataFolder = strnewpath;
ini.WriteString("DataFolder", "历史数据", strnewpath);
}
else
{
gcpcinfo.pcfolderinfo.DataFolder =strpath ;
gcpcinfo.pcfolderinfo.DataFolder = strpath;
}
gcpcinfo.pcfolderinfo.FileClassification=ini.ReadString("DataFolder", "分级文件夹");
gcpcinfo.pcfolderinfo.FileClassification = ini.ReadString("DataFolder", "分级文件夹");
int Version = ini.ReadInteger("Version", "VersionType");
......@@ -216,7 +220,7 @@ namespace GcDevicePc.GCBuffer
int dsf = ini.ReadInteger("SendData", "Thirdparty");
string strSendType=ini.ReadString("SendData","SendType");
string strSendType = ini.ReadString("SendData", "SendType");
int dw = ini.ReadInteger("SendData", "Foreign");
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
string apname = ini.ReadString("Version", "AppName");
......@@ -250,7 +254,7 @@ namespace GcDevicePc.GCBuffer
{
gcpcinfo.pcworkinfo.sendtoZb = true;
}
else if(dsf == 2)
else if (dsf == 2)
{
gcpcinfo.pcworkinfo.sendtoSP = true;
}
......@@ -261,13 +265,13 @@ namespace GcDevicePc.GCBuffer
gcpcinfo.pcworkinfo.sendtoSP = false;
}
if (strSendType=="Routine")
if (strSendType == "Routine")
{
gcpcinfo.pcworkinfo.sendType="Routine";
gcpcinfo.pcworkinfo.sendType = "Routine";
}
else if (strSendType=="KeepSending")
else if (strSendType == "KeepSending")
{
gcpcinfo.pcworkinfo.sendType="KeepSending";
gcpcinfo.pcworkinfo.sendType = "KeepSending";
}
//string wtd624x_ip = ini.ReadString("WTD624X", "IP");
//string wtd624x_mask = ini.ReadString("WTD624X", "MASK");
......@@ -338,7 +342,7 @@ namespace GcDevicePc.GCBuffer
gcpcinfo.pcworkinfo.sendtoSP = false;
gcpcinfo.pcworkinfo.sendType = null;
gcpcinfo.pcfolderinfo.DataFolder = null;
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FileClassification=null;
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FileClassification = null;
}
}
catch (Exception e)
......
GcDevicePc/GcDevicePc.csproj
View file @ 42831dfa
......@@ -110,6 +110,9 @@
<Reference Include="AutoClosingMessageBox, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AutoClosingMessageBox.1.0.0.2\lib\net40\AutoClosingMessageBox.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="C1.C1DataExtender.2, Version=2.0.20113.81, Culture=neutral, PublicKeyToken=7c4b5683f80b910e, processorArchitecture=MSIL" />
<Reference Include="C1.Win.2, Version=2.0.20201.416, Culture=neutral, PublicKeyToken=944ae1ea0e47ca04" />
<Reference Include="C1.Win.C1Chart.2, Version=2.0.20201.416, Culture=neutral, PublicKeyToken=a22e16972c085838, processorArchitecture=MSIL" />
......@@ -117,6 +120,9 @@
<Reference Include="C1.Win.C1Command.2, Version=2.0.20201.416, Culture=neutral, PublicKeyToken=e808566f358766d8" />
<Reference Include="C1.Win.C1Command.4, Version=4.0.20201.416, Culture=neutral, PublicKeyToken=e808566f358766d8, processorArchitecture=MSIL" />
<Reference Include="C1.Win.C1Input.2, Version=2.0.20201.416, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Ini.Net, Version=1.0.5531.18665, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ini.net.1.1.0\lib\net20\Ini.Net.dll</HintPath>
</Reference>
......@@ -129,6 +135,18 @@
<Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
</Reference>
<Reference Include="NPOI.OOXML, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OOXML.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXml4Net, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
</Reference>
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="SamplerCounterControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......@@ -205,6 +223,9 @@
<Link>TTControl\MouseMoveController.designer.cs</Link>
<DependentUpon>MouseMoveController.cs</DependentUpon>
</Compile>
<Compile Include="..\..\..\..\TTControl\ThirdPartyAPI\WindowsAPI.cs">
<Link>TTControl\WindowsAPI.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\Tool.cs">
<Link>TTControl\Tool.cs</Link>
</Compile>
......@@ -212,9 +233,6 @@
<Link>TTControl\UniversalPopUpWindow.cs</Link>
<SubType>Form</SubType>
</Compile>
<Compile Include="..\..\..\..\TTControl\WindowsAPI.cs">
<Link>TTControl\WindowsAPI.cs</Link>
</Compile>
<Compile Include="AboutForm.cs">
<SubType>Form</SubType>
</Compile>
......@@ -1209,9 +1227,6 @@
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.iu-Cans-CA.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
<SubType>Designer</SubType>
......@@ -1224,12 +1239,6 @@
<DependentUpon>SysConfig.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.zh-Hans.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.zh.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="TestForm.resx">
<DependentUpon>TestForm.cs</DependentUpon>
</EmbeddedResource>
......
GcDevicePc/SysConfig.cs
View file @ 42831dfa
......@@ -101,34 +101,13 @@ namespace GcDevicePc
{
IniFile ini = new IniFile(file);
string value = ini.ReadString("StartUp", "自启动");
string opensys = ini.ReadString("StartUp", "打开系统");
string runtype = ini.ReadString("StartUp", "运行类型");
string info_log = ini.ReadString("Logs", "InfoLog");
string err_log = ini.ReadString("Logs", "ErrLog");
string hmi_log = ini.ReadString("Logs", "HmiLog");
int Version = ini.ReadInteger("Version", "VersionType");
string appname = ini.ReadString("Version", "AppName");
string uname = ini.ReadString("User", "Name");
string upwd = ini.ReadString("User", "Password");
int dsf = ini.ReadInteger("SendData", "Thirdparty");
string strSendType = ini.ReadString("SendData", "SendType");
int dw = ini.ReadInteger("SendData", "Foreign");
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
int fi = ini.ReadInteger("StartUp", "Forceintegral");
string sp = ini.ReadString("StartUp", "space");
string dt = ini.ReadString("StartUp", "Datetime");
//string unit = ini.ReadString("StartUp", "Unit");
string sappname = ini.ReadString("StartUp", "TdName");
string strHMISearchTime = ini.ReadString("NetWorkConfig", "搜索时间");
int usStartLog = ini.KeyExists("StartUp", "开机界面") == true ? ini.ReadInteger("StartUp", "开机界面") : 0;
string strEmail = ini.ReadString("Email", "邮件地址");
this.textBox9.Text = appname;
ushort usHMISearchTime = 0;
// if(usStartLog != null)
{
......
GcDevicePc/SysConfigSecondary.cs
View file @ 42831dfa
......@@ -145,18 +145,18 @@ namespace GcDevicePc
if (File.Exists(file))
{
IniFile ini = new IniFile(file);
string tempAccuracy = ini.ReadString("StartUp", "温度精度");
string value = ini.ReadString("StartUp", "自启动");
string str_Cloud=ini.ReadString("StartUp", "启用云盒子");
string str_Cloud = ini.ReadString("StartUp", "启用云盒子");
string opensys = ini.ReadString("StartUp", "打开系统");
string runtype = ini.ReadString("StartUp", "运行类型");
string info_log = ini.ReadString("Logs", "InfoLog");
string err_log = ini.ReadString("Logs", "ErrLog");
string hmi_log = ini.ReadString("Logs", "HmiLog");
string strAntiControlMode=ini.ReadString("反控", "反控模式");
string strAntiControlFormName=ini.ReadString("反控", "反控进程名称");
string strStartStopTrigger=ini.ReadString("反控", "开始停止触发");
string strNMHC=ini.ReadString("NMHC", "测定方式");
string strAntiControlMode = ini.ReadString("反控", "反控模式");
string strAntiControlFormName = ini.ReadString("反控", "反控进程名称");
string strStartStopTrigger = ini.ReadString("反控", "开始停止触发");
string strNMHC = ini.ReadString("NMHC", "测定方式");
int Version = ini.ReadInteger("Version", "VersionType");
string appname = ini.ReadString("Version", "AppName");
......@@ -176,59 +176,59 @@ namespace GcDevicePc
string strHMISearchTime = ini.ReadString("NetWorkConfig", "搜索时间");
int usStartLog = ini.KeyExists("StartUp", "开机界面") == true ? ini.ReadInteger("StartUp", "开机界面") : 0;
string strEmail = ini.ReadString("Email", "邮件地址");
string strLevitationPrompt=ini.ReadString("组分", "悬浮信息");;
string strLevitationPrompt = ini.ReadString("组分", "悬浮信息"); ;
ushort usHMISearchTime = 0;
if (strLevitationPrompt==""||strLevitationPrompt=="不显示")
if (strLevitationPrompt == "" || strLevitationPrompt == "不显示")
{
checkBox_LevitationPrompt.Checked=false;
checkBox_LevitationPrompt.Checked = false;
}
else if (strLevitationPrompt=="显示")
else if (strLevitationPrompt == "显示")
{
checkBox_LevitationPrompt.Checked=true;
checkBox_LevitationPrompt.Checked = true;
}
if (strAntiControlMode=="")
if (strAntiControlMode == "")
{
this.comboBox_AntiControlMode.Text="关闭反控";
ini.WriteString("反控", "反控模式","关闭反控");
this.comboBox_AntiControlMode.Text = "关闭反控";
ini.WriteString("反控", "反控模式", "关闭反控");
}
else
{
this.comboBox_AntiControlMode.Text=strAntiControlMode;
this.comboBox_AntiControlMode.Text = strAntiControlMode;
}
if (strAntiControlFormName=="")
if (strAntiControlFormName == "")
{
this.textBox_AntiControlFormName.Text="微裂解";
ini.WriteString("反控", "反控进程名称","SmartSampler");
this.textBox_AntiControlFormName.Text = "微裂解";
ini.WriteString("反控", "反控进程名称", "SmartSampler");
}
else
{
this.textBox_AntiControlFormName.Text=strAntiControlFormName;
this.textBox_AntiControlFormName.Text = strAntiControlFormName;
}
if (strStartStopTrigger=="")
if (strStartStopTrigger == "")
{
this.comboBox_FollowStop.Text="只触发开始";
ini.WriteString("反控", "开始停止触发","只触发开始");
this.comboBox_FollowStop.Text = "只触发开始";
ini.WriteString("反控", "开始停止触发", "只触发开始");
}
else
{
this.comboBox_FollowStop.Text=strStartStopTrigger;
this.comboBox_FollowStop.Text = strStartStopTrigger;
}
if (strNMHC=="")
if (strNMHC == "")
{
//兼容
this.comboBox1.Text="间接";
ini.WriteString("NMHC", "测定方式","间接");
this.comboBox1.Text = "间接";
ini.WriteString("NMHC", "测定方式", "间接");
}
else
{
this.comboBox1.Text=strNMHC;
this.comboBox1.Text = strNMHC;
}
if (ushort.TryParse(strHMISearchTime, out usHMISearchTime) == true)
{
this.SerachHMINumericUpDown1.Value = usHMISearchTime;
}
comboBox2.SelectedIndex = comboBox2.FindString(tempAccuracy);
if (Convert.ToInt32(value) == 1)
{
this.appstartup.Checked = true;
......@@ -237,13 +237,13 @@ namespace GcDevicePc
{
this.appstartup.Checked = false;
}
if (str_Cloud=="1")
if (str_Cloud == "1")
{
this.checkBox_Cloud.Checked=true;
this.checkBox_Cloud.Checked = true;
}
else
{
this.checkBox_Cloud.Checked=false;
this.checkBox_Cloud.Checked = false;
}
if (Convert.ToInt32(opensys) == 1)
{
......@@ -421,9 +421,9 @@ namespace GcDevicePc
private void Data_Load1()
{
this.textBox11.Text = Sys_ini.Get_Sys_OxyCpdCount_Y1();
this.textBox12.Text =Sys_ini.Get_Sys_OxyCpdCount_Y2();
bIsAutoDisO2=Sys_ini.Get_Sys_OxyCpdCount_Enable();
this.richTextBox1.Text =Sys_ini.Get_Sys_OxyCpdCount_Formula();
this.textBox12.Text = Sys_ini.Get_Sys_OxyCpdCount_Y2();
bIsAutoDisO2 = Sys_ini.Get_Sys_OxyCpdCount_Enable();
this.richTextBox1.Text = Sys_ini.Get_Sys_OxyCpdCount_Formula();
if (bIsAutoDisO2 == true)
{
richTextBox1.Enabled = true;
......@@ -637,6 +637,7 @@ namespace GcDevicePc
{
ini.WriteString("组分", "悬浮信息", "不显示");
}
ini.WriteString("StartUp", "温度精度",comboBox2.Text);
if (appstartup.Checked)
{
......@@ -748,7 +749,7 @@ namespace GcDevicePc
ini.WriteString("SendData", "Foreign", "2");//无
}
if (comboBox1.Text==""||comboBox1.Text=="间接")
if (comboBox1.Text == "" || comboBox1.Text == "间接")
{
ini.WriteString("NMHC", "测定方式", "间接");//NMHC测定方式
}
......@@ -818,7 +819,7 @@ namespace GcDevicePc
//一般不会出现,除非保存配置耗时太长
}
if (MessageBox.Show("下发完成，需要重启色谱和软件，是否马上重启软件？\n建议等色谱重启完成后再点击\"是(Y)\"", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question,MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly) == DialogResult.Yes)
if (MessageBox.Show("下发完成，需要重启色谱和软件，是否马上重启软件？\n建议等色谱重启完成后再点击\"是(Y)\"", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly) == DialogResult.Yes)
{
Process.Start(Application.ExecutablePath);
Process.GetCurrentProcess().Kill();
......@@ -1205,7 +1206,7 @@ namespace GcDevicePc
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
if ( checkBox1.Checked)
if (checkBox1.Checked)
{
this.textBox2.UseSystemPasswordChar = false;
this.textBox3.UseSystemPasswordChar = false;
......
GcDevicePc/SysConfigSecondary.iu-Cans-CA.resx deleted 100644 → 0
View file @ e66588c8
This diff is collapsed.
GcDevicePc/SysConfigSecondary.resx
View file @ 42831dfa
......@@ -1140,6 +1140,63 @@
<data name="groupBox4.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left, Right</value>
</data>
<data name="label13.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 42</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>53, 12</value>
</data>
<data name="label13.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="label13.Text" xml:space="preserve">
<value>温度精度</value>
</data>
<data name="&gt;&gt;label13.Name" xml:space="preserve">
<value>label13</value>
</data>
<data name="&gt;&gt;label13.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label13.Parent" xml:space="preserve">
<value>groupBox4</value>
</data>
<data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="comboBox2.Items" xml:space="preserve">
<value>保留一位</value>
</data>
<data name="comboBox2.Items1" xml:space="preserve">
<value>保留两位</value>
</data>
<data name="comboBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>87, 39</value>
</data>
<data name="comboBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 20</value>
</data>
<data name="comboBox2.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
<data name="&gt;&gt;comboBox2.Name" xml:space="preserve">
<value>comboBox2</value>
</data>
<data name="&gt;&gt;comboBox2.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;comboBox2.Parent" xml:space="preserve">
<value>groupBox4</value>
</data>
<data name="&gt;&gt;comboBox2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="checkBox_Cloud.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
......@@ -1168,7 +1225,7 @@
<value>groupBox4</value>
</data>
<data name="&gt;&gt;checkBox_Cloud.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<data name="appstartup.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
......@@ -1195,7 +1252,7 @@
<value>groupBox4</value>
</data>
<data name="&gt;&gt;appstartup.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 23</value>
......
GcDevicePc/SysConfigSecondary.zh-Hans.resx deleted 100644 → 0
View file @ e66588c8
<?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="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>471, 110</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>474, 81</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>471, 117</value>
</data>
</root>
\ No newline at end of file
GcDevicePc/SysConfigSecondary.zh.resx deleted 100644 → 0
View file @ e66588c8
<?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="groupBox9.Location" type="System.Drawing.Point, System.Drawing">
<value>273, 21</value>
</data>
<data name="groupBox7.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 147</value>
</data>
<data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 251</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>557, 98</value>
</data>
<data name="groupBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 200</value>
</data>
<data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>558, 45</value>
</data>
<data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 92</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>558, 49</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 39</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 47</value>
</data>
<data name="groupBox11.Location" type="System.Drawing.Point, System.Drawing">
<value>34, 144</value>
</data>
<data name="groupBox11.Size" type="System.Drawing.Size, System.Drawing">
<value>543, 67</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>539, 118</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>540, 78</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>540, 41</value>
</data>
<data name="textBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>368, 109</value>
</data>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>368, 70</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>368, 33</value>
</data>
<data name="radioButton13.Text" xml:space="preserve">
<value>正常控制信号发送</value>
</data>
<data name="groupBox8.Location" type="System.Drawing.Point, System.Drawing">
<value>28, 108</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>438, 110</value>
</data>
<data name="radioButton3.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 60</value>
</data>
<data name="radioButton1.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 32</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 81</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 117</value>
</data>
</root>
\ No newline at end of file
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ 42831dfa
This diff is collapsed.
GcDevicePc/globaldata.cs
View file @ 42831dfa
......@@ -78,6 +78,7 @@ namespace GcDevicePc
public static int CurrentVersion; //当前版本(是否显示用户界面)
public static string UserName;//用户名
public static string UserPwd;//密码
/// <summary>
......
GcDevicePc/packages.config
View file @ 42831dfa
......@@ -7,5 +7,8 @@
<package id="M2Mqtt" version="4.3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
<package id="NModbus4" version="2.1.0" targetFramework="net45" />
<package id="NPOI" version="2.5.6" targetFramework="net45" />
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net45" />
<package id="SharpZipLib" version="1.3.3" targetFramework="net45" />
<package id="WinFormAnimation" version="1.5.6298.3372" targetFramework="net40" />
</packages>
\ No newline at end of file
VocsSetup/GC_Config/GC_Set/Startup/startup.ini
View file @ 42831dfa
......@@ -12,6 +12,7 @@ Datetime=1
TdName=TVOC5.7
开机界面=0
启用云盒子=0
温度精度=保留两位
[DataFolder]
历史数据=D:\work\Vocs\VocsSetup\GC_Config\GC_Set\Historical Data
分级文件夹=1
......
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ 42831dfa
......@@ -8,7 +8,7 @@ Count3=FALSE
[O2CpdCount]
O2value=21
[免登录]
锚点日期=2022/10/9
锚点日期=2022/10/17
勾选类型=2
[TempTrend]
启用网格X=FALSE
......
VocsSetup/GC_Control/BouncyCastle.Crypto.xml 0 → 100644
View file @ 42831dfa
This diff is collapsed.
VocsSetup/GC_Control/ICSharpCode.SharpZipLib.xml 0 → 100644
View file @ 42831dfa
This diff is collapsed.
VocsSetup/GC_Control/NPOI.OOXML.xml 0 → 100644
View file @ 42831dfa
This diff is collapsed.
VocsSetup/GC_Control/NPOI.OpenXml4Net.xml 0 → 100644
View file @ 42831dfa
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_Control/NPOI.xml 0 → 100644
View file @ 42831dfa
This diff is collapsed.
VocsSetup/GC_User/Operation Log/OperLog/OperLog.txt
View file @ 42831dfa
......@@ -2108,3 +2108,14 @@
【2022-10-09 18:29:45.2893】,服务器IP连接失败：192.168.10.217:12345
【2022-10-09 18:30:28.8162】,服务器IP连接失败：192.168.10.217:12345
【2022-10-09 18:35:28.8010】,服务器IP连接失败：192.168.10.217:12345
【2022-10-12 13:32:46.9692】,服务器IP连接失败：192.168.10.217:12345
【2022-10-17 08:54:45.1488】,服务器IP连接失败：192.168.10.217:12345
【2022-10-17 08:56:29.2915】,服务器IP连接失败：192.168.10.217:12345
【2022-10-17 09:01:02.1536】,服务器IP连接失败：192.168.10.217:12345
【2022-10-17 09:01:20.7769】,用户admin，进入调试模式
【2022-10-17 09:02:02.1523】,服务器IP连接失败：192.168.10.217:12345
【2022-10-17 09:02:14.4693】,用户admin，进入调试模式
【2022-10-17 09:04:37.1508】,服务器IP连接失败：192.168.10.217:12345
【2022-10-17 09:04:41.0972】,用户admin，进入调试模式
【2022-10-17 09:06:04.3652】,服务器IP连接失败：192.168.10.217:12345
【2022-10-17 09:06:14.4991】,用户admin，进入调试模式
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