diff --git a/_backend/api.py b/_backend/api.py index 6588722..7201a06 100644 --- a/_backend/api.py +++ b/_backend/api.py @@ -221,7 +221,8 @@ async def chat(websocket: WebSocket): if isinstance(message, TaskResult): continue print(f"----------------{message.source}----------------\n {message.content}") - await websocket.send_json(message.model_dump()) + if message.type == 'TextMessage' and message.type == 'HandoffMessage': + await websocket.send_json(message.model_dump()) if not isinstance(message, UserInputRequestedEvent): history.append(message.model_dump()) diff --git a/frontend/src/components/CameraView/index.vue b/frontend/src/components/CameraView/index.vue index a7d1eac..55d1854 100644 --- a/frontend/src/components/CameraView/index.vue +++ b/frontend/src/components/CameraView/index.vue @@ -48,14 +48,32 @@ const handleTwoMessage = (e: any) => { } } const cameraNumber = ref(0) -const ws: any = useWebSocket(handleMessage, import.meta.env.VITE_WB_CAMERA_ONE_URL) -const wsTwo: any = useWebSocket( - handleTwoMessage, - import.meta.env.VITE_WB_CAMERA_TWO_URL -) +// const ws: any = useWebSocket(handleMessage, import.meta.env.VITE_WB_CAMERA_ONE_URL) +// const wsTwo: any = useWebSocket( +// handleTwoMessage, +// import.meta.env.VITE_WB_CAMERA_TWO_URL +// ) +let ws:any = null +let wsTwo:any = null const emit = defineEmits(['closeCamera']) // const ws = new WebSocket(import.meta.env.VITE_WB_CAMERA_ONE_URL) -onMounted(() => {}) +onMounted(() => { + // ws = useWebSocket(handleMessage, import.meta.env.VITE_WB_CAMERA_ONE_URL) + // wsTwo = useWebSocket(handleTwoMessage, import.meta.env.VITE_WB_CAMERA_TWO_URL) +}) +const connectCameraOne = () => { + if (ws) { + return + } + ws = useWebSocket(handleMessage, import.meta.env.VITE_WB_CAMERA_ONE_URL) +} +const connectCameraTwo = () => { + if (wsTwo) { + return + } + wsTwo = useWebSocket(handleTwoMessage, import.meta.env.VITE_WB_CAMERA_TWO_URL) + +} const closeCamera = () => { cameraNumber.value = 0 emit('closeCamera')