Skip to content

张东亮 / SO1131-ConveyorLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit cc23dd9a 由 张东亮
选项

agv上报

1 个父辈 553e6f4f
内嵌 并排
正在显示 8 个修改的文件 包含 86 行增加 和 97 行删除
AssemblyLine.sln
......@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RFID_PuYue", "source\RFID_P
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PosConfig", "source\PosConfig\PosConfig\PosConfig.csproj", "{4A2857DF-01D4-46D4-A1F8-340B59828260}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigHelper", "..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj", "{290182DB-D949-434E-9FF7-C59BDE3F433A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -72,14 +70,6 @@ Global
{4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|Any CPU.Build.0 = Release|Any CPU
{4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|x64.ActiveCfg = Release|Any CPU
{4A2857DF-01D4-46D4-A1F8-340B59828260}.Release|x64.Build.0 = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|x64.ActiveCfg = Debug|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|x64.Build.0 = Debug|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|Any CPU.Build.0 = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|x64.ActiveCfg = Release|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
source/AssemblyLineClient/App.config
......@@ -9,7 +9,7 @@
<add key="App_Title" value="流水线客户端" />
<add key="UseBuzzer" value="1" />
<!--Server address-->
<add key="http.server" value="http://127.0.0.1/smf-core/" />
<add key="http.server" value="http://192.168.1.84:8801/" />
<!--<add key="http.server" value="http://127.0.0.1:8800/" />-->
<!--ESS server address-->
<add key="ESS_Server" value="http://10.42.176.205:9046" />
......
source/AssemblyLineClient/ConveyorLineClient.csproj
......@@ -61,6 +61,9 @@
<Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="ConfigHelper">
<HintPath>..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath>
</Reference>
......@@ -203,10 +206,6 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj">
<Project>{290182db-d949-434e-9ff7-c59bde3f433a}</Project>
<Name>ConfigHelper</Name>
</ProjectReference>
<ProjectReference Include="..\Common\Common.csproj">
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name>
......
source/AssemblyLineClient/FrmLine.Designer.cs
......@@ -93,9 +93,9 @@
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.lblStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.lblContainerWarn = new System.Windows.Forms.ToolStripStatusLabel();
this.lblMemory = new System.Windows.Forms.ToolStripStatusLabel();
this.lblCPU = new System.Windows.Forms.ToolStripStatusLabel();
this.lblContainerWarn = new System.Windows.Forms.ToolStripStatusLabel();
this.panel3 = new System.Windows.Forms.Panel();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
......@@ -124,16 +124,16 @@
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1002, 489);
this.tabControl1.Size = new System.Drawing.Size(1002, 447);
this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
//
// tabPage1
//
this.tabPage1.Controls.Add(this.tableLayoutPanel1);
this.tabPage1.Location = new System.Drawing.Point(4, 37);
this.tabPage1.Location = new System.Drawing.Point(10, 63);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(994, 448);
this.tabPage1.Size = new System.Drawing.Size(982, 374);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 运行日志 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -150,16 +150,16 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.20536F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.79464F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(994, 448);
this.tableLayoutPanel1.Size = new System.Drawing.Size(982, 374);
this.tableLayoutPanel1.TabIndex = 107;
//
// logBox
//
this.logBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(3, 98);
this.logBox.Location = new System.Drawing.Point(3, 82);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(988, 347);
this.logBox.Size = new System.Drawing.Size(976, 289);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -170,16 +170,16 @@
this.warnBox.ForeColor = System.Drawing.Color.Green;
this.warnBox.Location = new System.Drawing.Point(3, 3);
this.warnBox.Name = "warnBox";
this.warnBox.Size = new System.Drawing.Size(988, 89);
this.warnBox.Size = new System.Drawing.Size(976, 73);
this.warnBox.TabIndex = 107;
this.warnBox.Text = "";
//
// tabPage2
//
this.tabPage2.Controls.Add(this.panel2);
this.tabPage2.Location = new System.Drawing.Point(4, 37);
this.tabPage2.Location = new System.Drawing.Point(10, 63);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(994, 446);
this.tabPage2.Size = new System.Drawing.Size(982, 374);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "模块";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -190,7 +190,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(994, 446);
this.panel2.Size = new System.Drawing.Size(982, 374);
this.panel2.TabIndex = 98;
//
// panel1
......@@ -199,7 +199,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(994, 446);
this.panel1.Size = new System.Drawing.Size(982, 374);
this.panel1.TabIndex = 0;
//
// flowLayoutPanel1
......@@ -208,15 +208,15 @@
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(994, 446);
this.flowLayoutPanel1.Size = new System.Drawing.Size(982, 374);
this.flowLayoutPanel1.TabIndex = 0;
//
// tabPage5
//
this.tabPage5.Controls.Add(this.panel5);
this.tabPage5.Location = new System.Drawing.Point(4, 37);
this.tabPage5.Location = new System.Drawing.Point(10, 63);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(994, 446);
this.tabPage5.Size = new System.Drawing.Size(982, 416);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "示意图";
this.tabPage5.UseVisualStyleBackColor = true;
......@@ -229,7 +229,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(994, 446);
this.panel5.Size = new System.Drawing.Size(982, 416);
this.panel5.TabIndex = 108;
//
// picLine
......@@ -238,7 +238,7 @@
this.picLine.Image = global::ConveyorLine.Properties.Resources.line;
this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(994, 446);
this.picLine.Size = new System.Drawing.Size(982, 416);
this.picLine.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picLine.TabIndex = 107;
this.picLine.TabStop = false;
......@@ -260,24 +260,24 @@
this.toolStripSeparator8,
this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(137, 86);
this.contextMenuStrip1.Size = new System.Drawing.Size(185, 126);
//
// 显示ToolStripMenuItem
//
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(136, 38);
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(184, 58);
this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(133, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(181, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(136, 38);
this.toolStripMenuItem1.Size = new System.Drawing.Size(184, 58);
this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
......@@ -299,60 +299,60 @@
this.toolStripSeparator2,
this.退出ToolStripMenuItem});
this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem";
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(140, 35);
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(230, 56);
this.操作ToolStripMenuItem.Text = " 设备操作 ";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(170, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(281, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(173, 40);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(170, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(281, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(173, 40);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(170, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(281, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(173, 40);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(170, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(281, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(170, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(281, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(173, 40);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
......@@ -368,56 +368,56 @@
this.toolStripSeparator14,
this.线体IOToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(133, 35);
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(218, 56);
this.设置TToolStripMenuItem.Text = "设备调试 ";
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(259, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator6.Visible = false;
//
// 查看容器编码ToolStripMenuItem
//
this.查看容器编码ToolStripMenuItem.Name = "查看容器编码ToolStripMenuItem";
this.查看容器编码ToolStripMenuItem.Size = new System.Drawing.Size(262, 40);
this.查看容器编码ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.查看容器编码ToolStripMenuItem.Text = "查看容器编码";
this.查看容器编码ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(259, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator9.Visible = false;
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(262, 40);
this.toolStripMenuItem2.Size = new System.Drawing.Size(432, 60);
this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(259, 6);
this.toolStripSeparator13.Size = new System.Drawing.Size(429, 6);
//
// 查看托盘信息ToolStripMenuItem
//
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(262, 40);
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.查看托盘信息ToolStripMenuItem.Text = "查看容器信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(259, 6);
this.toolStripSeparator14.Size = new System.Drawing.Size(429, 6);
//
// 线体IOToolStripMenuItem
//
this.线体IOToolStripMenuItem.Name = "线体IOToolStripMenuItem";
this.线体IOToolStripMenuItem.Size = new System.Drawing.Size(262, 40);
this.线体IOToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.线体IOToolStripMenuItem.Text = "查看线体IO";
this.线体IOToolStripMenuItem.Click += new System.EventHandler(this.线体IOToolStripMenuItem_Click);
//
......@@ -430,37 +430,37 @@
this.toolStripSeparator11,
this.版本号ToolStripMenuItem});
this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(99, 35);
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(162, 56);
this.帮助ToolStripMenuItem.Text = " 系统 ";
//
// 清空日志ToolStripMenuItem
//
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(214, 40);
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 60);
this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(211, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(349, 6);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(214, 40);
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 60);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(211, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(349, 6);
//
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(214, 40);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(352, 60);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......@@ -477,7 +477,7 @@
this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1002, 39);
this.menuStrip1.Size = new System.Drawing.Size(1002, 60);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -489,32 +489,32 @@
this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator24});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(126, 35);
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(206, 56);
this.运行参数ToolStripMenuItem.Text = "运行参数";
//
// 开机自动启动ToolStripMenuItem
//
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(262, 40);
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.开机自动启动ToolStripMenuItem.Text = "开机自动启动";
this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(259, 6);
this.toolStripSeparator15.Size = new System.Drawing.Size(429, 6);
//
// 启用蜂鸣器ToolStripMenuItem
//
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(262, 40);
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator24
//
this.toolStripSeparator24.Name = "toolStripSeparator24";
this.toolStripSeparator24.Size = new System.Drawing.Size(259, 6);
this.toolStripSeparator24.Size = new System.Drawing.Size(429, 6);
//
// contextMenuStrip_control
//
......@@ -533,73 +533,73 @@
this.control_Debug,
this.toolStripSeparator22});
this.contextMenuStrip_control.Name = "contextMenuStrip1";
this.contextMenuStrip_control.Size = new System.Drawing.Size(211, 210);
this.contextMenuStrip_control.Size = new System.Drawing.Size(311, 300);
//
// toolStripSeparator21
//
this.toolStripSeparator21.Name = "toolStripSeparator21";
this.toolStripSeparator21.Size = new System.Drawing.Size(207, 6);
this.toolStripSeparator21.Size = new System.Drawing.Size(307, 6);
this.toolStripSeparator21.Visible = false;
//
// toolName
//
this.toolName.BackColor = System.Drawing.Color.White;
this.toolName.Name = "toolName";
this.toolName.Size = new System.Drawing.Size(210, 34);
this.toolName.Size = new System.Drawing.Size(310, 52);
this.toolName.Visible = false;
//
// toolStripSeparator23
//
this.toolStripSeparator23.Name = "toolStripSeparator23";
this.toolStripSeparator23.Size = new System.Drawing.Size(207, 6);
this.toolStripSeparator23.Size = new System.Drawing.Size(307, 6);
//
// control_InDetial
//
this.control_InDetial.Name = "control_InDetial";
this.control_InDetial.Size = new System.Drawing.Size(210, 34);
this.control_InDetial.Size = new System.Drawing.Size(310, 52);
this.control_InDetial.Text = "进入详情界面";
this.control_InDetial.Click += new System.EventHandler(this.control_InDetial_Click);
//
// toolStripSeparator18
//
this.toolStripSeparator18.Name = "toolStripSeparator18";
this.toolStripSeparator18.Size = new System.Drawing.Size(207, 6);
this.toolStripSeparator18.Size = new System.Drawing.Size(307, 6);
//
// control_StartDebug
//
this.control_StartDebug.Name = "control_StartDebug";
this.control_StartDebug.Size = new System.Drawing.Size(210, 34);
this.control_StartDebug.Size = new System.Drawing.Size(310, 52);
this.control_StartDebug.Text = "启动调试";
this.control_StartDebug.Click += new System.EventHandler(this.control_StartDebug_Click);
//
// toolStripSeparator19
//
this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(207, 6);
this.toolStripSeparator19.Size = new System.Drawing.Size(307, 6);
//
// control_Stop
//
this.control_Stop.Name = "control_Stop";
this.control_Stop.Size = new System.Drawing.Size(210, 34);
this.control_Stop.Size = new System.Drawing.Size(310, 52);
this.control_Stop.Text = "停止运行";
this.control_Stop.Click += new System.EventHandler(this.control_Stop_Click);
//
// toolStripSeparator20
//
this.toolStripSeparator20.Name = "toolStripSeparator20";
this.toolStripSeparator20.Size = new System.Drawing.Size(207, 6);
this.toolStripSeparator20.Size = new System.Drawing.Size(307, 6);
//
// control_Debug
//
this.control_Debug.Name = "control_Debug";
this.control_Debug.Size = new System.Drawing.Size(210, 34);
this.control_Debug.Size = new System.Drawing.Size(310, 52);
this.control_Debug.Text = "启用调试";
this.control_Debug.Click += new System.EventHandler(this.control_Debug_Click);
//
// toolStripSeparator22
//
this.toolStripSeparator22.Name = "toolStripSeparator22";
this.toolStripSeparator22.Size = new System.Drawing.Size(207, 6);
this.toolStripSeparator22.Size = new System.Drawing.Size(307, 6);
//
// statusStrip1
//
......@@ -609,9 +609,9 @@
this.lblMemory,
this.lblCPU,
this.lblContainerWarn});
this.statusStrip1.Location = new System.Drawing.Point(0, 528);
this.statusStrip1.Location = new System.Drawing.Point(0, 507);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1002, 31);
this.statusStrip1.Size = new System.Drawing.Size(1002, 52);
this.statusStrip1.TabIndex = 97;
this.statusStrip1.Text = "statusStrip1";
//
......@@ -619,33 +619,33 @@
//
this.lblStatus.ForeColor = System.Drawing.Color.Green;
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(82, 24);
this.lblStatus.Size = new System.Drawing.Size(137, 39);
this.lblStatus.Text = "等待启动";
//
// lblContainerWarn
//
this.lblContainerWarn.Name = "lblContainerWarn";
this.lblContainerWarn.Size = new System.Drawing.Size(0, 24);
//
// lblMemory
//
this.lblMemory.Name = "lblMemory";
this.lblMemory.Size = new System.Drawing.Size(50, 24);
this.lblMemory.Size = new System.Drawing.Size(83, 39);
this.lblMemory.Text = "0MB";
//
// lblCPU
//
this.lblCPU.Name = "lblCPU";
this.lblCPU.Size = new System.Drawing.Size(37, 24);
this.lblCPU.Size = new System.Drawing.Size(62, 39);
this.lblCPU.Text = "0%";
//
// lblContainerWarn
//
this.lblContainerWarn.Name = "lblContainerWarn";
this.lblContainerWarn.Size = new System.Drawing.Size(0, 39);
//
// panel3
//
this.panel3.Controls.Add(this.tabControl1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 39);
this.panel3.Location = new System.Drawing.Point(0, 60);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(1002, 489);
this.panel3.Size = new System.Drawing.Size(1002, 447);
this.panel3.TabIndex = 98;
//
// FrmLine
......
source/AssemblyLineClient/FrmLine.cs
......@@ -34,6 +34,7 @@ namespace OnlineStore.AssemblyLine
startTimer.Interval = 1000;
startTimer.Enabled = false;
startTimer.AutoReset = false;
//SServerManager.UpdateAgvStatus(new List<AgvStatus>() { new AgvStatus() { name ="agv1", elec="20", loc= "WAREHOUSE", message="test", type=1 } });
}
private void FrmMain_Load(object sender, EventArgs e)
{
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -43,6 +43,9 @@
<Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="ConfigHelper">
<HintPath>..\..\..\..\SharedRefDll\Neotel\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath>
</Reference>
......@@ -115,10 +118,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj">
<Project>{290182db-d949-434e-9ff7-c59bde3f433a}</Project>
<Name>ConfigHelper</Name>
</ProjectReference>
<ProjectReference Include="..\Common\Common.csproj">
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name>
......
source/DeviceLibrary/lineManager/ALineManager.cs
......@@ -265,7 +265,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error("UploadAGVStatus", ex);
LogUtil.error($"UploadAGVStatus:{JsonHelper.SerializeObject(robotStates)}", ex);
}
}
/// <summary>
......
source/DeviceLibrary/lineManager/SServerManager.cs
......@@ -535,7 +535,7 @@ namespace OnlineStore.DeviceLibrary
Dictionary<string, string> queryStr = new Dictionary<string, string>();
//queryStr.Add("rfid", rfid);
string server = GetAddr(Addr_agvStatus, queryStr);
string json = HttpHelper.Post(server,"");
string json = HttpHelper.Post(server,JsonHelper.SerializeObject(agvStatuses));
ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json);
if(!agvStr.Equals(json))
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!