Merge branch 'develop' into feature/digitalZoom

This commit is contained in:
2025-12-09 13:04:03 +00:00
11 changed files with 236 additions and 8 deletions

View File

@@ -2,6 +2,7 @@ import { Tabs, Tab, TabList, TabPanel } from "react-tabs";
import { useEffect } from "react";
import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
import RegionSelector from "./RegionSelector";
import CameraControls from "./cameraControls/CameraControls";
type CameraPanelProps = {
tabIndex: number;
@@ -54,10 +55,7 @@ const CameraPanel = ({ tabIndex, isResetAllModalOpen, handleClose, setIsResetMod
/>
</TabPanel>
<TabPanel>
<div className="p-4">
<h2 className="text-lg font-semibold mb-4">Camera Controls</h2>
<p>Controls for camera {cameraFeedID} will go here.</p>
</div>
<CameraControls cameraFeedID={cameraFeedID} />
</TabPanel>
</Tabs>
);

View File

@@ -0,0 +1,42 @@
import { useCameraFeedContext } from "../../../../../app/context/CameraFeedContext";
import SliderComponent from "../../../../../ui/SliderComponent";
import { useCameraZoom } from "../../../hooks/useCameraZoom";
import { useDebouncedCallback } from "use-debounce";
type CameraControlsProps = {
cameraFeedID: "A" | "B" | "C";
};
const CameraControls = ({ cameraFeedID }: CameraControlsProps) => {
const { state, dispatch } = useCameraFeedContext();
const { cameraZoomMutation } = useCameraZoom(cameraFeedID);
const zoomLevel = state.zoomLevel ? state.zoomLevel[cameraFeedID] : 1;
const debouncedMutation = useDebouncedCallback(async (value) => {
await cameraZoomMutation.mutateAsync({
cameraFeedID,
zoomLevel: value as number,
});
}, 1000);
const handleChange = (value: number | number[]) => {
const newZoom = value as number;
dispatch({
type: "SET_ZOOM_LEVEL",
payload: { cameraFeedID: cameraFeedID, zoomLevel: value as number },
});
debouncedMutation(newZoom);
};
return (
<div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
<h2 className="text-2xl mb-4">Camera {cameraFeedID}</h2>
<div className="w-[70%] ">
<label htmlFor="zoom">Zoom {zoomLevel} </label>
<SliderComponent id="zoom" onChange={handleChange} value={zoomLevel} min={1} max={3} step={0.1} />
</div>
</div>
);
};
export default CameraControls;

View File

@@ -0,0 +1,48 @@
import { useQuery, useMutation } from "@tanstack/react-query";
import { CAMBASE } from "../../../utils/config";
import type { CameraZoomConfig } from "../../../types/types";
const fetchZoomLevel = async (cameraFeedID: string) => {
const response = await fetch(`${CAMBASE}/api/fetch-config?id=Camera${cameraFeedID}-onvif-controller`);
if (!response.ok) {
throw new Error("Network response was not ok");
}
return response.json();
};
const postZoomLevel = async (zoomConfig: CameraZoomConfig) => {
const fields = [
{ property: "propPhysCurrent", value: zoomConfig.zoomLevel },
{ property: "propCameraHost", value: "192.168.0.101" },
{ property: "propCameraPort", value: 80 },
{ property: "propCameraUsername", value: "administrator" },
{ property: "propCameraPassword", value: "MAV12345" },
];
const zoomPayload = {
id: `Camera${zoomConfig.cameraFeedID}-onvif-controller`,
fields,
};
console.log(zoomPayload);
const response = await fetch(`${CAMBASE}/api/update-config`, {
method: "POST",
body: JSON.stringify(zoomPayload),
});
if (!response.ok) {
throw new Error("Network response was not ok");
}
return response.json();
};
export const useCameraZoom = (cameraFeedID: "A" | "B" | "C") => {
const cameraZoomQuery = useQuery({
queryKey: ["cameraZoom", cameraFeedID],
queryFn: () => fetchZoomLevel(cameraFeedID),
});
const cameraZoomMutation = useMutation({
mutationKey: ["postCameraZoom"],
mutationFn: (zoomConfig: CameraZoomConfig) => postZoomLevel(zoomConfig),
});
return { cameraZoomQuery, cameraZoomMutation };
};