From d5a097e022542a176807c6b7f9c0d6a84615b5a4 Mon Sep 17 00:00:00 2001
From: zby <2494737567@qq.com>
Date: Tue, 15 Oct 2024 08:55:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E9=9F=B3=E4=B8=AD?=
 =?UTF-8?q?=E9=97=B4=E6=97=B6=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/Constant/InfoEnum.cs           |  2 +-
 Service/Execute/Step/CarCtrlState.cs  | 12 ++++++------
 Service/Execute/Step/SwapDoneState.cs |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Entity/Constant/InfoEnum.cs b/Entity/Constant/InfoEnum.cs
index b606ae6..3501ce2 100644
--- a/Entity/Constant/InfoEnum.cs
+++ b/Entity/Constant/InfoEnum.cs
@@ -119,8 +119,8 @@ public class InfoEnum
         [Const("PLC状态检测")] Plc,
         [Const("rfid扫描完成")] RfidReadFlag,
         [Const("二次雷达检测")] Carradar,
-        [Const("车辆到位")] CarInPositionFlag,
         [Const("选包成功")] SelectPackSuccess,
+        [Const("车辆到位")] CarInPositionFlag,
         [Const("车辆解锁")] VelUnlockFlag,
         [Const("下发plc选包")] DistributeSelectPackFlag,
         [Const("开始换电")] StartSwappingFlag,
diff --git a/Service/Execute/Step/CarCtrlState.cs b/Service/Execute/Step/CarCtrlState.cs
index eb68d9b..3f66d33 100644
--- a/Service/Execute/Step/CarCtrlState.cs
+++ b/Service/Execute/Step/CarCtrlState.cs
@@ -47,7 +47,7 @@ public class CarCtrlState : IState
     /// <returns></returns>
     public InvokeStatus UnLockCar(SwappingStateMachine machine)
     {
-        return Invoker.Invoke("UnLockCar", 500, 3, machine.IsCanceled,
+        return Invoker.Invoke("UnLockCar", 500, 5, machine.IsCanceled,
             () => machine.VelUnlockFlag, () =>
             {
                 Task<bool> result = TBoxApi.UnLockCarManyTimes(machine.RfidReadModel.VelVin);
@@ -71,7 +71,7 @@ public class CarCtrlState : IState
 
                         SoundClient = AppInfo.Container.Resolve<SoundClient>();
                         SoundClient.SoundPlay(SoundEnum.music93);
-                        Thread.Sleep(3000);
+                        Thread.Sleep(6000);
                         SoundClient.SoundPlay(SoundEnum.music92);
                     }
                 }
@@ -82,12 +82,12 @@ public class CarCtrlState : IState
                 LedClient.SendMsgByKey(InfoEnum.SwapInfo.ErrUnLockCar.GetLed());
                 SoundClient = AppInfo.Container.Resolve<SoundClient>();
              
-                    SoundClient.SoundPlay(SoundEnum.music105);
-                    Thread.Sleep(4000);
-                    SoundClient.SoundPlay(SoundEnum.music106); 
+                    SoundClient.SoundPlay(SoundEnum.music106);
+                    Thread.Sleep(7000);
+                    SoundClient.SoundPlay(SoundEnum.music105); 
                    
                
             }, false, () => { machine.ExceptionReason = ExceptionReason.UnLockCarError; }
-            , 2, InvokeStatus.None);
+            , 4, InvokeStatus.None);
     }
 }
\ No newline at end of file
diff --git a/Service/Execute/Step/SwapDoneState.cs b/Service/Execute/Step/SwapDoneState.cs
index db94036..0fb9a01 100644
--- a/Service/Execute/Step/SwapDoneState.cs
+++ b/Service/Execute/Step/SwapDoneState.cs
@@ -217,9 +217,9 @@ public class SwapDoneState : IState
                         var SoundClient = AppInfo.Container.Resolve<SoundClient>();
                            
                             SoundClient.SoundPlay(SoundEnum.music76);
-                            Thread.Sleep(5000);
-                            SoundClient.SoundPlay(SoundEnum.music77);
+                            Thread.Sleep(7000);
                             SoundClient.SoundPlay(SoundEnum.music77);
+                          //  SoundClient.SoundPlay(SoundEnum.music77);
                             
                         machine.BoxCarInfoModel = carInfo.Result;
                         SoundApi.PlayOneSound(machine.SwapStatus == (int)InfoEnum.SwapOrderResult.Success