From b560b11d7c1c12a9528dd56553eb052607159072 Mon Sep 17 00:00:00 2001 From: lxw Date: Thu, 11 Jul 2024 16:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B7=E8=BE=BE=20=E8=B6=85=E6=97=B6=20?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E5=88=B0=E5=8E=9F=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Execute/Step/StationReadyState.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Service/Execute/Step/StationReadyState.cs b/Service/Execute/Step/StationReadyState.cs index 580a8a1..ec82834 100644 --- a/Service/Execute/Step/StationReadyState.cs +++ b/Service/Execute/Step/StationReadyState.cs @@ -119,6 +119,7 @@ public class StationReadyState : IState string welcomeContent = "欢迎光临" + StaticStationInfo.StationName + "正在营业"; SoundApi.PlayOneSound((int)InfoEnum.SwapInfo.WelcomeInfo); // machine.LedTool?.WriteContent(welcomeContent); + //查看雷达 isRemote = true; } } @@ -132,7 +133,7 @@ public class StationReadyState : IState public InvokeStatus EntranceRadar(SwappingStateMachine machine) { - return Invoker.Invoke("wait entrance radar", 1000, 5, machine.IsCanceled, + return Invoker.Invoke("wait entrance radar", 1000, 2, machine.IsCanceled, () => machine.RadarInFlag, () => { if (!PlcApi.EntranceRadar()) @@ -146,7 +147,7 @@ public class StationReadyState : IState _log.Info("entrance radar true"); machine.RadarInFlag = true; } - }); + }, () => { }, true, () => { }, 2, InvokeStatus.TimeOut); } public InvokeStatus BeginRead(SwappingStateMachine machine) @@ -211,11 +212,11 @@ public class StationReadyState : IState Task rfidReadModel = RfidApi.ReadRfid(); rfidReadModel.Wait(); var machineRfidReadModel = rfidReadModel.Result; - - - if ( rfidReadModel.IsCompletedSuccessfully && machineRfidReadModel != null - && machineRfidReadModel.Result==1 - && !string.IsNullOrEmpty(machineRfidReadModel.VelVin)) + + + if (rfidReadModel.IsCompletedSuccessfully && machineRfidReadModel != null + && machineRfidReadModel.Result == 1 + && !string.IsNullOrEmpty(machineRfidReadModel.VelVin)) { machine.RfidReadModel = machineRfidReadModel; _log.Info($"read rfid={JsonConvert.SerializeObject(machine.RfidReadModel)}");