雷达 超时 回归到原来

master
lxw 4 months ago
parent d973b95141
commit b560b11d7c

@ -119,6 +119,7 @@ public class StationReadyState : IState
string welcomeContent = "欢迎光临" + StaticStationInfo.StationName + "正在营业"; string welcomeContent = "欢迎光临" + StaticStationInfo.StationName + "正在营业";
SoundApi.PlayOneSound((int)InfoEnum.SwapInfo.WelcomeInfo); SoundApi.PlayOneSound((int)InfoEnum.SwapInfo.WelcomeInfo);
// machine.LedTool?.WriteContent(welcomeContent); // machine.LedTool?.WriteContent(welcomeContent);
//查看雷达
isRemote = true; isRemote = true;
} }
} }
@ -132,7 +133,7 @@ public class StationReadyState : IState
public InvokeStatus EntranceRadar(SwappingStateMachine machine) 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, () => () => machine.RadarInFlag, () =>
{ {
if (!PlcApi.EntranceRadar()) if (!PlcApi.EntranceRadar())
@ -146,7 +147,7 @@ public class StationReadyState : IState
_log.Info("entrance radar true"); _log.Info("entrance radar true");
machine.RadarInFlag = true; machine.RadarInFlag = true;
} }
}); }, () => { }, true, () => { }, 2, InvokeStatus.TimeOut);
} }
public InvokeStatus BeginRead(SwappingStateMachine machine) public InvokeStatus BeginRead(SwappingStateMachine machine)
@ -211,11 +212,11 @@ public class StationReadyState : IState
Task<RfidReadModel?> rfidReadModel = RfidApi.ReadRfid(); Task<RfidReadModel?> rfidReadModel = RfidApi.ReadRfid();
rfidReadModel.Wait(); rfidReadModel.Wait();
var machineRfidReadModel = rfidReadModel.Result; var machineRfidReadModel = rfidReadModel.Result;
if ( rfidReadModel.IsCompletedSuccessfully && machineRfidReadModel != null if (rfidReadModel.IsCompletedSuccessfully && machineRfidReadModel != null
&& machineRfidReadModel.Result==1 && machineRfidReadModel.Result == 1
&& !string.IsNullOrEmpty(machineRfidReadModel.VelVin)) && !string.IsNullOrEmpty(machineRfidReadModel.VelVin))
{ {
machine.RfidReadModel = machineRfidReadModel; machine.RfidReadModel = machineRfidReadModel;
_log.Info($"read rfid={JsonConvert.SerializeObject(machine.RfidReadModel)}"); _log.Info($"read rfid={JsonConvert.SerializeObject(machine.RfidReadModel)}");

Loading…
Cancel
Save