Commit dc10e44d authored by wangwanxh@sina.com's avatar wangwanxh@sina.com

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

parents d2bdff5d bb1a29a3
......@@ -113,6 +113,11 @@ namespace GcDevicePc.Common
{
switch(address)
{
case 3:
{
value = SharedSpace.Data.change == true ? (ushort)1 : (ushort)0;
}
break;
case 4:
{
value = globaldata.m_hmibuffer.gcinfo.HMIMac[0];
......
......@@ -39,6 +39,7 @@
//
// bgpicture
//
this.bgpicture.BackColor = System.Drawing.Color.Black;
this.bgpicture.Dock = System.Windows.Forms.DockStyle.Fill;
this.bgpicture.Image = ((System.Drawing.Image)(resources.GetObject("bgpicture.Image")));
this.bgpicture.ImageLocation = "";
......@@ -96,6 +97,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Black;
this.ClientSize = new System.Drawing.Size(479, 403);
this.Controls.Add(this.offlinebth);
this.Controls.Add(this.label2);
......
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