Skip to content

李娜 / SO664-HCSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e867fe81 由 LN
选项

增加暂停运动选项

1 个父辈 a0f57fba
内嵌 并排
正在显示 4 个修改的文件 包含 41 行增加 和 11 行删除
source/DeviceLibrary/acSingleStore/BoxBean.cs
...@@ -31,7 +31,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -31,7 +31,7 @@ namespace OnlineStore.DeviceLibrary
private System.Timers.Timer serverConnectTimer = new System.Timers.Timer(); private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
private System.Timers.Timer IoCheckTimer = new System.Timers.Timer(); private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
private System.Timers.Timer readDITimer = new System.Timers.Timer(); private System.Timers.Timer readDITimer = new System.Timers.Timer();
public bool MoveStop = false;
public BoxBean(BoxConfig config) public BoxBean(BoxConfig config)
{ {
...@@ -748,8 +748,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -748,8 +748,11 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveType != StoreMoveType.None) if (MoveInfo.MoveType != StoreMoveType.None)
{ {
BusyMoveProcess(); if (!MoveStop)
ShowTimeLog("BusyMoveProcess"); {
BusyMoveProcess();
ShowTimeLog("BusyMoveProcess");
}
} }
else if (storeRunStatus.Equals(StoreRunStatus.Runing)) else if (storeRunStatus.Equals(StoreRunStatus.Runing))
{ {
......
source/HCSingleStore/FrmBox.Designer.cs
...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox5 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.chbStop = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
...@@ -267,6 +268,7 @@ ...@@ -267,6 +268,7 @@
// //
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.chbStop);
this.tabPage2.Controls.Add(this.btnImgSave); this.tabPage2.Controls.Add(this.btnImgSave);
this.tabPage2.Controls.Add(this.btnFcomp); this.tabPage2.Controls.Add(this.btnFcomp);
this.tabPage2.Controls.Add(this.btnForig); this.tabPage2.Controls.Add(this.btnForig);
...@@ -295,7 +297,7 @@ ...@@ -295,7 +297,7 @@
this.btnImgSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnImgSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnImgSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnImgSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnImgSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnImgSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnImgSave.Location = new System.Drawing.Point(278, 550); this.btnImgSave.Location = new System.Drawing.Point(278, 554);
this.btnImgSave.Name = "btnImgSave"; this.btnImgSave.Name = "btnImgSave";
this.btnImgSave.Size = new System.Drawing.Size(105, 38); this.btnImgSave.Size = new System.Drawing.Size(105, 38);
this.btnImgSave.TabIndex = 284; this.btnImgSave.TabIndex = 284;
...@@ -308,7 +310,7 @@ ...@@ -308,7 +310,7 @@
this.btnFcomp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnFcomp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnFcomp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFcomp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFcomp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFcomp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFcomp.Location = new System.Drawing.Point(132, 550); this.btnFcomp.Location = new System.Drawing.Point(132, 554);
this.btnFcomp.Name = "btnFcomp"; this.btnFcomp.Name = "btnFcomp";
this.btnFcomp.Size = new System.Drawing.Size(105, 38); this.btnFcomp.Size = new System.Drawing.Size(105, 38);
this.btnFcomp.TabIndex = 283; this.btnFcomp.TabIndex = 283;
...@@ -321,7 +323,7 @@ ...@@ -321,7 +323,7 @@
this.btnForig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnForig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnForig.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnForig.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnForig.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnForig.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnForig.Location = new System.Drawing.Point(20, 550); this.btnForig.Location = new System.Drawing.Point(20, 554);
this.btnForig.Name = "btnForig"; this.btnForig.Name = "btnForig";
this.btnForig.Size = new System.Drawing.Size(105, 38); this.btnForig.Size = new System.Drawing.Size(105, 38);
this.btnForig.TabIndex = 282; this.btnForig.TabIndex = 282;
...@@ -335,7 +337,7 @@ ...@@ -335,7 +337,7 @@
this.lblLSend.AutoSize = true; this.lblLSend.AutoSize = true;
this.lblLSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblLSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLSend.ForeColor = System.Drawing.Color.Green; this.lblLSend.ForeColor = System.Drawing.Color.Green;
this.lblLSend.Location = new System.Drawing.Point(13, 493); this.lblLSend.Location = new System.Drawing.Point(13, 497);
this.lblLSend.Name = "lblLSend"; this.lblLSend.Name = "lblLSend";
this.lblLSend.Size = new System.Drawing.Size(0, 17); this.lblLSend.Size = new System.Drawing.Size(0, 17);
this.lblLSend.TabIndex = 280; this.lblLSend.TabIndex = 280;
...@@ -346,7 +348,7 @@ ...@@ -346,7 +348,7 @@
this.lblSend.AutoSize = true; this.lblSend.AutoSize = true;
this.lblSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblSend.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSend.ForeColor = System.Drawing.Color.Green; this.lblSend.ForeColor = System.Drawing.Color.Green;
this.lblSend.Location = new System.Drawing.Point(13, 517); this.lblSend.Location = new System.Drawing.Point(13, 521);
this.lblSend.Name = "lblSend"; this.lblSend.Name = "lblSend";
this.lblSend.Size = new System.Drawing.Size(0, 17); this.lblSend.Size = new System.Drawing.Size(0, 17);
this.lblSend.TabIndex = 278; this.lblSend.TabIndex = 278;
...@@ -386,7 +388,7 @@ ...@@ -386,7 +388,7 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(505, 340); this.groupBox1.Location = new System.Drawing.Point(505, 344);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -566,7 +568,7 @@ ...@@ -566,7 +568,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 398); this.groupBox2.Location = new System.Drawing.Point(11, 402);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -612,7 +614,7 @@ ...@@ -612,7 +614,7 @@
this.lblTemp.AutoSize = true; this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black; this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(420, 22); this.lblTemp.Location = new System.Drawing.Point(535, 22);
this.lblTemp.Name = "lblTemp"; this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20); this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 275; this.lblTemp.TabIndex = 275;
...@@ -1736,6 +1738,18 @@ ...@@ -1736,6 +1738,18 @@
this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 297); this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 297);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// chbStop
//
this.chbStop.AutoSize = true;
this.chbStop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbStop.Location = new System.Drawing.Point(415, 20);
this.chbStop.Name = "chbStop";
this.chbStop.Size = new System.Drawing.Size(93, 25);
this.chbStop.TabIndex = 285;
this.chbStop.Text = "暂停运动";
this.chbStop.UseVisualStyleBackColor = true;
this.chbStop.CheckedChanged += new System.EventHandler(this.chbStop_CheckedChanged);
//
// FrmBox // FrmBox
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -1894,6 +1908,7 @@ ...@@ -1894,6 +1908,7 @@
private System.Windows.Forms.Button btnFcomp; private System.Windows.Forms.Button btnFcomp;
private System.Windows.Forms.Button btnForig; private System.Windows.Forms.Button btnForig;
private System.Windows.Forms.Button btnImgSave; private System.Windows.Forms.Button btnImgSave;
private System.Windows.Forms.CheckBox chbStop;
} }
} }
source/HCSingleStore/FrmBox.cs
...@@ -39,6 +39,7 @@ namespace OnlineStore.ACSingleStore ...@@ -39,6 +39,7 @@ namespace OnlineStore.ACSingleStore
LoadStore(); LoadStore();
chbDebug.Checked = boxBean.IsDebug; chbDebug.Checked = boxBean.IsDebug;
chbStop.Checked = boxBean.MoveStop;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
tabPage2.Text = " 设备[" + boxBean.CID + "]状态 "; tabPage2.Text = " 设备[" + boxBean.CID + "]状态 ";
this.Opacity = 1; this.Opacity = 1;
...@@ -1176,5 +1177,16 @@ namespace OnlineStore.ACSingleStore ...@@ -1176,5 +1177,16 @@ namespace OnlineStore.ACSingleStore
string msg = boxBean.CamerSaveImg(); string msg = boxBean.CamerSaveImg();
MessageBox.Show(msg); MessageBox.Show(msg);
} }
private void chbStop_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
boxBean.MoveStop = chbStop.Checked;
LogUtil.info(boxBean.Name + "用户切换是否暂停： " + boxBean.MoveStop);
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!