Commit ac604cd7 张东亮

1

1 个父辈 0403fa4e
...@@ -19,6 +19,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -19,6 +19,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public bool IsDebug = false; public bool IsDebug = false;
private System.Timers.Timer ledProcessTimer = null; private System.Timers.Timer ledProcessTimer = null;
private System.Timers.Timer uploadProcessTimer = null;
/// <summary> /// <summary>
/// 分出一个线程,专门处理急停,报警,气压检测,工单信号检测等处理 /// 分出一个线程,专门处理急停,报警,气压检测,工单信号检测等处理
/// </summary> /// </summary>
...@@ -126,6 +127,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -126,6 +127,23 @@ namespace OnlineStore.DeviceLibrary
serverConTimer.AutoReset = true; serverConTimer.AutoReset = true;
serverConTimer.Elapsed += ServerConTimer_Elapsed; serverConTimer.Elapsed += ServerConTimer_Elapsed;
serverConTimer.Enabled = false; serverConTimer.Enabled = false;
uploadProcessTimer = new System.Timers.Timer();
uploadProcessTimer.Interval = 1000;
uploadProcessTimer.AutoReset = true;
uploadProcessTimer.Elapsed += UploadProcessTimer_Elapsed; ;
uploadProcessTimer.Enabled = false;
}
private void UploadProcessTimer_Elapsed(object sender, ElapsedEventArgs e)
{
if(Monitor.TryEnter(uploadProcessTimer))
try
{
//上报容器状态
ContainerManager.UpdateContainerStatus();
}catch (Exception ex) { }
finally { Monitor.Exit(uploadProcessTimer); }
} }
...@@ -204,6 +222,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -204,6 +222,7 @@ namespace OnlineStore.DeviceLibrary
IoCheckTimer.Enabled = true; IoCheckTimer.Enabled = true;
mainTimer.Enabled = true; mainTimer.Enabled = true;
serverConTimer.Enabled = true; serverConTimer.Enabled = true;
uploadProcessTimer.Enabled = true;
return true; return true;
} }
} }
...@@ -290,6 +309,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -290,6 +309,7 @@ namespace OnlineStore.DeviceLibrary
IoCheckTimer.Enabled = true; IoCheckTimer.Enabled = true;
mainTimer.Enabled = true; mainTimer.Enabled = true;
serverConTimer.Enabled = true; serverConTimer.Enabled = true;
uploadProcessTimer.Enabled = true;
return true; return true;
} }
private void EquipReset(EquipBase equip, bool isNeedAllReset) private void EquipReset(EquipBase equip, bool isNeedAllReset)
...@@ -320,6 +340,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -320,6 +340,7 @@ namespace OnlineStore.DeviceLibrary
IoCheckTimer.Enabled = false; IoCheckTimer.Enabled = false;
mainTimer.Enabled = false; mainTimer.Enabled = false;
serverConTimer.Enabled = false; serverConTimer.Enabled = false;
uploadProcessTimer.Enabled = false;
//停止运行时,把阻挡气缸上升 //停止运行时,把阻挡气缸上升
//StopMove(); //StopMove();
foreach (EquipBase equip in this.AllEquipMap.Values) foreach (EquipBase equip in this.AllEquipMap.Values)
...@@ -884,8 +905,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -884,8 +905,6 @@ namespace OnlineStore.DeviceLibrary
} }
//发送呼叫任务 //发送呼叫任务
ContainerManager.HandlePendingTask(); ContainerManager.HandlePendingTask();
//上报容器状态
ContainerManager.UpdateContainerStatus();
} }
catch (Exception ex) catch (Exception ex)
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!