Skip to content

G
GC_Branch
Commit 6a89d9ad authored by 周磊's avatar 周磊
Browse files
Options

暂放到临时库

parent 42831dfa
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 56 deletions
GcDevicePc/GCBuffer/PCBuffer.cs
View file @ 6a89d9ad
......@@ -94,7 +94,7 @@ namespace GcDevicePc.GCBuffer
public bool hmi_log; //
public string sendType;
/// <summary>
/// 温度精度
/// 温度显示精度
/// </summary>
public string TempAccuracy;
}
......@@ -198,7 +198,7 @@ namespace GcDevicePc.GCBuffer
int opensys = ini.ReadInteger("StartUp", "打开系统");
int runtype = ini.ReadInteger("StartUp", "运行类型");
gcpcinfo.pcworkinfo.TempAccuracy= ini.ReadString("StartUp", "温度精度");
gcpcinfo.pcworkinfo.TempAccuracy= ini.ReadString("StartUp", "温度显示精度");
string strpath = ini.ReadString("DataFolder", "历史数据");
if (strpath == "")
{
......
GcDevicePc/GcDevicePc.csproj
View file @ 6a89d9ad
......@@ -207,29 +207,27 @@
<Compile Include="..\..\..\..\TTControl\IOOperations.cs">
<Link>TTControl\IOOperations.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\LeftLowerPopUpWindow.cs">
<Compile Include="..\..\..\..\TTControl\ThirdPartyAPI\WindowsAPI.cs">
<Link>TTControl\WindowsAPI.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\Tool.cs">
<Link>TTControl\Tool.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\UISpecialEffects\LeftLowerPopUpWindow.cs">
<Link>TTControl\LeftLowerPopUpWindow.cs</Link>
<SubType>UserControl</SubType>
</Compile>
<Compile Include="..\..\..\..\TTControl\LeftLowerPopUpWindow.designer.cs">
<Compile Include="..\..\..\..\TTControl\UISpecialEffects\LeftLowerPopUpWindow.designer.cs">
<Link>TTControl\LeftLowerPopUpWindow.designer.cs</Link>
<DependentUpon>LeftLowerPopUpWindow.cs</DependentUpon>
</Compile>
<Compile Include="..\..\..\..\TTControl\MouseMoveController.cs">
<Compile Include="..\..\..\..\TTControl\UISpecialEffects\MouseMoveController.cs">
<Link>TTControl\MouseMoveController.cs</Link>
<SubType>Component</SubType>
</Compile>
<Compile Include="..\..\..\..\TTControl\MouseMoveController.designer.cs">
<Link>TTControl\MouseMoveController.designer.cs</Link>
<DependentUpon>MouseMoveController.cs</DependentUpon>
<Compile Include="..\..\..\..\TTControl\UISpecialEffects\MouseMoveController.Designer.cs">
<Link>TTControl\MouseMoveController.Designer.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\ThirdPartyAPI\WindowsAPI.cs">
<Link>TTControl\WindowsAPI.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\Tool.cs">
<Link>TTControl\Tool.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\UniversalPopUpWindow.cs">
<Compile Include="..\..\..\..\TTControl\UISpecialEffects\UniversalPopUpWindow.cs">
<Link>TTControl\UniversalPopUpWindow.cs</Link>
<SubType>Form</SubType>
</Compile>
......@@ -823,10 +821,6 @@
<Compile Include="WaitForm.Designer.cs">
<DependentUpon>WaitForm.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="..\..\..\..\TTControl\LeftLowerPopUpWindow.resx">
<Link>TTControl\LeftLowerPopUpWindow.resx</Link>
<DependentUpon>LeftLowerPopUpWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="AboutForm.en.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
<SubType>Designer</SubType>
......
GcDevicePc/MDIBase.cs
View file @ 6a89d9ad
......@@ -61,7 +61,7 @@ namespace GcDevicePc
/// <summary>
/// PC版本号,主界面显示,关于显示
/// </summary>
public static string PCVersion = "2.0.2";
public static string PCVersion = "2.0.3";
/// <summary>
/// 云盒子接口
......
GcDevicePc/StartForm.cs
View file @ 6a89d9ad
......@@ -20,7 +20,9 @@ namespace GcDevicePc
private const double StayTime = 2000; //5s
System.Timers.Timer _opacityTimer;
#endregion
/// <summary>
/// 启动中的状态
/// </summary>
private String _appInitInfo = "系统初始化开始";
private int _initSec;
//private int _initStep;
......@@ -34,6 +36,11 @@ namespace GcDevicePc
private bool bWaitOver = false;
private bool bNoSearchOK = false;
#region 窗口淡入淡出效果
/// <summary>
/// 窗体逐渐显示
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void OpacityTimerProcOpen(object sender, System.Timers.ElapsedEventArgs e)
{
if (_mCurrentOpacity < 1)
......@@ -54,7 +61,11 @@ namespace GcDevicePc
Timer_TimesUp();
}
}
/// <summary>
/// 窗体完全显示后
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void OpacityTimerProcClose(object sender, EventArgs e)
{
if (this._mCurrentOpacity > 0)
......@@ -76,12 +87,16 @@ namespace GcDevicePc
this.BeginInvoke(mi);
}
}
/// <summary>
/// 更新透明度
/// </summary>
private void UpdateFrmOpacity()
{
this.Opacity = this._mCurrentOpacity;
}
/// <summary>
/// 转为窗体完全显示
/// </summary>
private void Timer_TimesUp()
{
_opacityTimer = new System.Timers.Timer();
......@@ -91,7 +106,11 @@ namespace GcDevicePc
}
#endregion
/// <summary>
/// 开机图片上绘制字符
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void bgpicture_Paint(object sender, PaintEventArgs e)
{
foreach (Control C in this.Controls)
......@@ -105,7 +124,11 @@ namespace GcDevicePc
}
}
}
/// <summary>
/// 打开"离线"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void bgpicture_MouseDoubleClick(object sender, MouseEventArgs e)
{
offlinebth.Visible = true;
......@@ -160,7 +183,9 @@ namespace GcDevicePc
_opacityTimer.Elapsed += new System.Timers.ElapsedEventHandler(OpacityTimerProcOpen);
_opacityTimer.Start();
}
/// <summary>
/// 准备开启预加载,通过Join等待预加载完成,预加载完成后打开主界面,关闭
/// </summary>
private void MainFrmStartProc()
{
if (_tPreload != null)
......@@ -297,7 +322,11 @@ namespace GcDevicePc
//窗体控件预加载
}
/// <summary>
/// 省略号进度条
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void StartFormbgWorker_DoWork(object sender, DoWorkEventArgs e)
{
......@@ -321,18 +350,30 @@ namespace GcDevicePc
}
}
/// <summary>
/// 实现进度条字符更新
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void StartFormbgWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
{
label2.Text = e.UserState.ToString();
bgpicture.Invalidate();
}
/// <summary>
/// 离线模式
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void offlinebth_Click(object sender, EventArgs e)
{
globaldata.OffLinkMode = true;
}
/// <summary>
/// 绑定
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void BindButton1_Click(object sender, EventArgs e)
{
try
......@@ -354,7 +395,9 @@ namespace GcDevicePc
{
}
}
/// <summary>
/// 搜索HMI
/// </summary>
private void vSearch_HMI_Poll()
{
if (ini_startup.INIGetStringValue("Version", "VersionType","0")=="1")
......@@ -381,7 +424,11 @@ namespace GcDevicePc
}
}
}
/// <summary>
/// 防止退出不干净
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void StartForm_FormClosed(object sender, FormClosedEventArgs e)
{
System.Environment.Exit(0);
......
GcDevicePc/SysConfigSecondary.cs
View file @ 6a89d9ad
......@@ -145,7 +145,7 @@ namespace GcDevicePc
if (File.Exists(file))
{
IniFile ini = new IniFile(file);
string tempAccuracy = ini.ReadString("StartUp", "温度精度");
string tempAccuracy = ini.ReadString("StartUp", "温度显示精度");
string value = ini.ReadString("StartUp", "自启动");
string str_Cloud = ini.ReadString("StartUp", "启用云盒子");
string opensys = ini.ReadString("StartUp", "打开系统");
......@@ -637,7 +637,7 @@ namespace GcDevicePc
{
ini.WriteString("组分", "悬浮信息", "不显示");
}
ini.WriteString("StartUp", "温度精度",comboBox2.Text);
ini.WriteString("StartUp", "温度显示精度",comboBox2.Text);
if (appstartup.Checked)
{
......
GcDevicePc/SysConfigSecondary.resx
View file @ 6a89d9ad
......@@ -1150,13 +1150,13 @@
<value>18, 42</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>53, 12</value>
<value>77, 12</value>
</data>
<data name="label13.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="label13.Text" xml:space="preserve">
<value>温度精度</value>
<value>温度显示精度</value>
</data>
<data name="&gt;&gt;label13.Name" xml:space="preserve">
<value>label13</value>
......@@ -1177,7 +1177,7 @@
<value>保留两位</value>
</data>
<data name="comboBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>87, 39</value>
<value>101, 38</value>
</data>
<data name="comboBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 20</value>
......
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ 6a89d9ad
......@@ -70,6 +70,8 @@
this.runbat = new System.Windows.Forms.CheckBox();
this.runsingle = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.label13 = new System.Windows.Forms.Label();
this.comboBox2 = new System.Windows.Forms.ComboBox();
this.checkBox_Cloud = new System.Windows.Forms.CheckBox();
this.appstartup = new System.Windows.Forms.CheckBox();
this.panel3 = new System.Windows.Forms.Panel();
......@@ -133,8 +135,6 @@
this.button2 = new System.Windows.Forms.Button();
this.ToolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.label13 = new System.Windows.Forms.Label();
this.comboBox2 = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
......@@ -488,6 +488,20 @@
this.groupBox4.Name = "groupBox4";
this.groupBox4.TabStop = false;
//
// label13
//
resources.ApplyResources(this.label13, "label13");
this.label13.Name = "label13";
//
// comboBox2
//
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Items.AddRange(new object[] {
resources.GetString("comboBox2.Items"),
resources.GetString("comboBox2.Items1")});
resources.ApplyResources(this.comboBox2, "comboBox2");
this.comboBox2.Name = "comboBox2";
//
// checkBox_Cloud
//
resources.ApplyResources(this.checkBox_Cloud, "checkBox_Cloud");
......@@ -916,20 +930,6 @@
//
this.backgroundWorker1.WorkerReportsProgress = true;
//
// label13
//
resources.ApplyResources(this.label13, "label13");
this.label13.Name = "label13";
//
// comboBox2
//
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Items.AddRange(new object[] {
resources.GetString("comboBox2.Items"),
resources.GetString("comboBox2.Items1")});
resources.ApplyResources(this.comboBox2, "comboBox2");
this.comboBox2.Name = "comboBox2";
//
// SysConfigSecondary
//
resources.ApplyResources(this, "$this");
......
VocsSetup/GC_Config/GC_Set/Startup/startup.ini
View file @ 6a89d9ad
......@@ -13,6 +13,7 @@ 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 @ 6a89d9ad
......@@ -8,7 +8,7 @@ Count3=FALSE
[O2CpdCount]
O2value=21
[免登录]
锚点日期=2022/10/17
锚点日期=2022/10/18
勾选类型=2
[TempTrend]
启用网格X=FALSE
......
VocsSetup/GC_User/Operation Log/OperLog/OperLog.txt
View file @ 6a89d9ad
......@@ -2119,3 +2119,7 @@
【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，进入调试模式
【2022-10-18 08:36:33.5536】,服务器IP连接失败：192.168.10.217:12345
【2022-10-18 08:36:47.1593】,用户admin，进入调试模式
【2022-10-18 08:39:07.4588】,服务器IP连接失败：192.168.10.217:12345
【2022-10-19 10:04:53.6486】,服务器IP连接失败：192.168.10.217:12345
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