Skip to content

李娜 / Line-Smart-Workstation

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

自动模式下 暂停/继续 切换

1 个父辈 2216c537
内嵌 并排
正在显示 1 个修改的文件 包含 27 行增加 和 11 行删除
DeviceLibrary/manager/TSAVBean.cs
...@@ -52,6 +52,8 @@ namespace TSA_V.DeviceLibrary ...@@ -52,6 +52,8 @@ namespace TSA_V.DeviceLibrary
/// </summary> /// </summary>
public static bool WorkPause = false; public static bool WorkPause = false;
public static bool canQieHuan = false;
public static int AuToModeSeconds = ConfigAppSettings.GetIntValue(Setting_Init.AuToModeSeconds); public static int AuToModeSeconds = ConfigAppSettings.GetIntValue(Setting_Init.AuToModeSeconds);
...@@ -623,7 +625,8 @@ namespace TSA_V.DeviceLibrary ...@@ -623,7 +625,8 @@ namespace TSA_V.DeviceLibrary
{ {
TimeSpan span = DateTime.Now - Work.endWorkTime; TimeSpan span = DateTime.Now - Work.endWorkTime;
bool IsFootOk = IOManager.IOValue(IOManager.Footrest_Single).Equals(IO_VALUE.HIGH) && (WorkMode.Equals(0)); //bool IsFootOk = IOManager.IOValue(IOManager.Footrest_Single).Equals(IO_VALUE.HIGH) && (WorkMode.Equals(0));
bool IsFootOk = IOManager.IOValue(IOManager.Footrest_Single).Equals(IO_VALUE.HIGH) ;
if (Work.WorkType.Equals(1)) if (Work.WorkType.Equals(1))
{ {
...@@ -631,25 +634,38 @@ namespace TSA_V.DeviceLibrary ...@@ -631,25 +634,38 @@ namespace TSA_V.DeviceLibrary
{ {
if (IsFootOk) if (IsFootOk)
{ {
if (WorkPause) if (canQieHuan)
{ {
LogUtil.info("自动模式下 已暂停：再次踩脚踏信号,退出暂停状态，重置Work.endWorkTime"); if (WorkPause)
Work.endWorkTime = new DateTime(); {
WorkPause = false; LogUtil.info("自动模式下 已暂停：再次踩脚踏信号,退出暂停状态，重置Work.endWorkTime");
Work.endWorkTime = new DateTime();
WorkPause = false;
}
else
{
LogUtil.info("自动模式下：收到脚踏信号，自动模式暂停，重置Work.endWorkTime");
Work.endWorkTime = new DateTime();
WorkPause = true;
}
canQieHuan = false;
} }
else }
else
{
if (!canQieHuan)
{ {
LogUtil.info("自动模式下：收到脚踏信号，自动模式暂停，重置Work.endWorkTime"); canQieHuan = true;
Work.endWorkTime = new DateTime(); LogUtil.info("自动模式下：脚踏信号灭，设置 canQieHuan = true");
WorkPause = true;
} }
} }
else if (WorkPause) if (WorkPause)
{ {
//暂停中 //暂停中
} }
else else
{ {
//自动模式 //自动模式
if ((span.TotalSeconds > AuToModeSeconds && IsDebug) if ((span.TotalSeconds > AuToModeSeconds && IsDebug)
|| (span.TotalSeconds > AuToModeSeconds && WorkMode.Equals(1)) || (span.TotalSeconds > AuToModeSeconds && WorkMode.Equals(1))
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!