From 260ac45cb78bd46bca97ee100c4f2446b8a4d130 Mon Sep 17 00:00:00 2001
From: xudan <staysky25@outlook.com>
Date: Wed, 29 Oct 2025 09:42:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(playback-websocket):=20=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE=E4=BF=9D=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E5=85=85=E7=94=B5=E4=BF=A1=E6=81=AF=E7=9A=84=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/usePlaybackWebSocket.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/hooks/usePlaybackWebSocket.ts b/src/hooks/usePlaybackWebSocket.ts
index c3a3c8a..5aa9618 100644
--- a/src/hooks/usePlaybackWebSocket.ts
+++ b/src/hooks/usePlaybackWebSocket.ts
@@ -171,7 +171,7 @@ export function usePlaybackWebSocket(editorService: ShallowRef<EditorService | u
     updates.forEach(({ id, data }) => {
       const robotExists = editor.checkRobotById(id);
       if (robotExists) {
-        const { x, y, angle, state, ...rest } = data;
+        const { x, y, angle, state, isCharging, isCarrying, canOrder, ...rest } = data;
         const pen = editor.getPenById(id);
         const currentState = pen?.robot?.state;
         // 将业务数据和位置数据合并到一个对象中，通过 setValue 一次性更新
@@ -186,10 +186,17 @@ export function usePlaybackWebSocket(editorService: ShallowRef<EditorService | u
               ...rest,
               // 增加更严格的校验：确保 state 的值存在于 RobotState 枚举中
               state: RobotState[state] ? state : (currentState ?? RobotState.未知),
+              // 确保传递载货和充电状态
+              isCharging: isCharging ?? 0,
+              isCarrying: isCarrying ?? 0,
+              canOrder: canOrder ?? true,
             }, // 将业务数据挂载到图元的 robot 属性上
           },
           { render: false },
         );
+        
+        // 更新状态覆盖图标
+        editor.updateRobotStatusOverlay(id, false);
       }
     });
   };