From 5867ccfa94be467cea2989bd6bec63fcca2275e5 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Thu, 27 Jun 2024 15:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=8E=A7=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BA=AE?= =?UTF-8?q?=E7=BA=A2=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/Ops.cs | 4 ++-- Rs.SkyLine/Flow/TestCenter.cs | 7 +++++++ Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs index 01f2855..8d8ca4a 100644 --- a/Rs.SkyLine/Commom/Ops.cs +++ b/Rs.SkyLine/Commom/Ops.cs @@ -227,7 +227,7 @@ namespace Rs.MotionPlat.Commom } } - public static void Stop() + public static void Stop(Action act=null) { if(MachineManage.Instance.MachineStatus== EMachineStatus.Working) { @@ -252,7 +252,7 @@ namespace Rs.MotionPlat.Commom HomeFlow.Instance.CancleHome(); MachineManage.Instance.SetLocalMachineStatus(EMachineStatus.HomeFail); } - + act?.Invoke(); } public static void GoHome() diff --git a/Rs.SkyLine/Flow/TestCenter.cs b/Rs.SkyLine/Flow/TestCenter.cs index 1671bf4..c2ccef3 100644 --- a/Rs.SkyLine/Flow/TestCenter.cs +++ b/Rs.SkyLine/Flow/TestCenter.cs @@ -246,6 +246,13 @@ namespace Rs.MotionPlat.Flow case EInstruction.ChangeState: SchedulingResult cs = JsonConvert.DeserializeObject(msg); client.Send(cs.ToString()); + if(cs.State== ERunState.Error) + { + MessageQueue.Instance.Insert("中控报警"); + Ops.Stop(() => { + LightManger.Instance.SetStatus(ELightStatus.Red); + }); + } ReplayTaskEvent?.Invoke(cs.ToString()); break; case EInstruction.ShowMessage: diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index b2868b2..23e7476 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("3.20.24.22")] + [assembly: AssemblyVersion("3.20.24.24")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]