From 4356a3eab833cee90234ea7951bfb11768b736fc Mon Sep 17 00:00:00 2001 From: zby <2494737567@qq.com> Date: Fri, 11 Oct 2024 15:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E5=8C=85=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=AF=AD=E9=9F=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Repository/Station/BinInfoRepository.cs | 2 +- Service/Execute/Step/CarCtrlState.cs | 4 ++-- Service/Execute/Step/SwapDoneState.cs | 5 +++-- Service/Sound/SoundClient/SoundClient.cs | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Repository/Station/BinInfoRepository.cs b/Repository/Station/BinInfoRepository.cs index b02a6d7..af21f58 100644 --- a/Repository/Station/BinInfoRepository.cs +++ b/Repository/Station/BinInfoRepository.cs @@ -75,7 +75,7 @@ public class BinInfoRepository : BaseRepository } // 符合soc，不在充电 - var socList = list.Where(i => i.ChargeStatus == 2 || i.ChargeStatus == 4 ||i.ChargeStatus == 0).ToList(); + var socList = list.Where(i => (i.ChargeStatus == 2 || i.ChargeStatus == 4 ||i.ChargeStatus == 0)&&i.Status!=0).ToList(); if (socList.Count <= 0) { // 符合soc，在充电 diff --git a/Service/Execute/Step/CarCtrlState.cs b/Service/Execute/Step/CarCtrlState.cs index dfb3447..18f739f 100644 --- a/Service/Execute/Step/CarCtrlState.cs +++ b/Service/Execute/Step/CarCtrlState.cs @@ -48,7 +48,7 @@ public class CarCtrlState : IState /// public InvokeStatus UnLockCar(SwappingStateMachine machine) { - return Invoker.Invoke("UnLockCar", 500, 20, machine.IsCanceled, + return Invoker.Invoke("UnLockCar", 500, 10, machine.IsCanceled, () => machine.VelUnlockFlag, () => { Task result = TBoxApi.UnLockCarManyTimes(machine.RfidReadModel.VelVin); @@ -89,6 +89,6 @@ public class CarCtrlState : IState }, false, () => { machine.ExceptionReason = ExceptionReason.UnLockCarError; } - , 40, InvokeStatus.None); + , 10, InvokeStatus.None); } } \ No newline at end of file diff --git a/Service/Execute/Step/SwapDoneState.cs b/Service/Execute/Step/SwapDoneState.cs index 3dcb940..41f52d1 100644 --- a/Service/Execute/Step/SwapDoneState.cs +++ b/Service/Execute/Step/SwapDoneState.cs @@ -215,9 +215,10 @@ public class SwapDoneState : IState //_CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.VelLockFlag, // machine); var SoundClient = AppInfo.Container.Resolve(); - SoundClient.SoundPlay(SoundEnum.music77); - Thread.Sleep(4000); + SoundClient.SoundPlay(SoundEnum.music76); + Thread.Sleep(5000); + SoundClient.SoundPlay(SoundEnum.music77); machine.BoxCarInfoModel = carInfo.Result; SoundApi.PlayOneSound(machine.SwapStatus == (int)InfoEnum.SwapOrderResult.Success diff --git a/Service/Sound/SoundClient/SoundClient.cs b/Service/Sound/SoundClient/SoundClient.cs index 62ad87b..4f939c8 100644 --- a/Service/Sound/SoundClient/SoundClient.cs +++ b/Service/Sound/SoundClient/SoundClient.cs @@ -193,7 +193,7 @@ public enum SoundEnum music91,//[Info("换电开始印尼")] ErrStartSwap, music92,//[Info(" 解锁成功中")] ErrStartSwap, music93,//[Info(" 解锁成功印尼")] ErrStartSwap, - music100,//[Info(" 车辆停放不到位印尼")] ErrStartSwap, + music100=100,//[Info(" 车辆停放不到位印尼")] ErrStartSwap, music101,//[Info(" 车辆停放不到位")] ErrStartSwap, music102,//[Info(" 正在等待车辆连接印尼")] ErrStartSwap, music103,//[Info(" 正在等待车辆连接")] ErrStartSwap,