Skip to content

G
GC_Branch
Commit 20ca384f authored by wangwanxh@sina.com's avatar wangwanxh@sina.com
Browse files
Options

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

parents 18f2becb 2ad631d4
Show whitespace changes
Inline Side-by-side
Showing with 235 additions and 4 deletions
GcDevicePc/GcDevicePc.csproj
View file @ 20ca384f
...@@ -492,6 +492,12 @@ ...@@ -492,6 +492,12 @@
<Compile Include="QuitForm.Designer.cs"> <Compile Include="QuitForm.Designer.cs">
<DependentUpon>QuitForm.cs</DependentUpon> <DependentUpon>QuitForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="RestartHmi.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="RestartHmi.Designer.cs">
<DependentUpon>RestartHmi.cs</DependentUpon>
</Compile>
<Compile Include="RunTables.cs"> <Compile Include="RunTables.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -704,6 +710,9 @@ ...@@ -704,6 +710,9 @@
<EmbeddedResource Include="QuitForm.resx"> <EmbeddedResource Include="QuitForm.resx">
<DependentUpon>QuitForm.cs</DependentUpon> <DependentUpon>QuitForm.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="RestartHmi.resx">
<DependentUpon>RestartHmi.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RunTables.resx"> <EmbeddedResource Include="RunTables.resx">
<DependentUpon>RunTables.cs</DependentUpon> <DependentUpon>RunTables.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
GcDevicePc/MDIBase.cs
View file @ 20ca384f
...@@ -672,18 +672,20 @@ namespace GcDevicePc ...@@ -672,18 +672,20 @@ namespace GcDevicePc
} }
private void WaitHMIWork() private void WaitHMIWork()
{
if (!backgroundWorker2.IsBusy)
{ {
this.workProgress.Visible = true; this.workProgress.Visible = true;
this.workProgress.Value = 0; this.workProgress.Value = 0;
this.backgroundWorker2.RunWorkerAsync(); this.backgroundWorker2.RunWorkerAsync();
} }
}
private void backgroundWorker1_ProgressChanged(object sender, ProgressChangedEventArgs e) private void backgroundWorker1_ProgressChanged(object sender, ProgressChangedEventArgs e)
{ {
this.workProgress.Value = e.ProgressPercentage; this.workProgress.Value = e.ProgressPercentage;
} }
private void backgroundWorker2_ProgressChanged(object sender, ProgressChangedEventArgs e) private void backgroundWorker2_ProgressChanged(object sender, ProgressChangedEventArgs e)
{ {
this.workProgress.Value = e.ProgressPercentage; this.workProgress.Value = e.ProgressPercentage;
......
GcDevicePc/RestartHmi.Designer.cs 0 → 100644
View file @ 20ca384f
namespace GcDevicePc
{
partial class DebugForm
{
/// <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.button1 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// button1
//
this.button1.Location = new System.Drawing.Point(58, 30);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 0;
this.button1.Text = "重启hmi";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// DebugForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(195, 88);
this.Controls.Add(this.button1);
this.Name = "DebugForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Debug工具";
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button button1;
}
}
\ No newline at end of file
GcDevicePc/RestartHmi.cs 0 → 100644
View file @ 20ca384f
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 DebugForm : Form
{
public DebugForm()
{
InitializeComponent();
}
private void button1_Click(object sender, EventArgs e)
{
int ret = 1;
FileServerClient singlesend = new FileServerClient();
singlesend.WtClientInit("192.168.10.230", 911);
ret = singlesend.WtHMICloseRro("WtMainProc");
if (ret == 1)
{
MessageBox.Show("停止HMI成功！");
ret = singlesend.WtHMIRunPro("GcDevice.exe", globaldata.exeremoteFolder);
if (ret == 1)
{
MessageBox.Show("启动HMI成功！");
}
}
singlesend.WtClientClose();
}
}
}
GcDevicePc/RestartHmi.resx 0 → 100644
View file @ 20ca384f
<?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>
</root>
\ No newline at end of file
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