mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
UI Tweaks (#11459)
* refresh dashboard activity on visibility change * Make video controls more consistent * Use const
This commit is contained in:
parent
dda65ba514
commit
2a86969f54
@ -221,7 +221,7 @@ export function useFrigateStats(): { payload: FrigateStats } {
|
|||||||
|
|
||||||
export function useInitialCameraState(
|
export function useInitialCameraState(
|
||||||
camera: string,
|
camera: string,
|
||||||
refreshOnStart: boolean,
|
revalidateOnFocus: boolean,
|
||||||
): {
|
): {
|
||||||
payload: FrigateCameraState;
|
payload: FrigateCameraState;
|
||||||
} {
|
} {
|
||||||
@ -232,12 +232,25 @@ export function useInitialCameraState(
|
|||||||
const data = JSON.parse(payload as string);
|
const data = JSON.parse(payload as string);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (refreshOnStart) {
|
let listener = undefined;
|
||||||
|
if (revalidateOnFocus) {
|
||||||
sendCommand("onConnect");
|
sendCommand("onConnect");
|
||||||
|
listener = () => {
|
||||||
|
if (document.visibilityState == "visible") {
|
||||||
|
sendCommand("onConnect");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
addEventListener("visibilitychange", listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (listener) {
|
||||||
|
removeEventListener("visibilitychange", listener);
|
||||||
|
}
|
||||||
|
};
|
||||||
// only refresh when onRefresh value changes
|
// only refresh when onRefresh value changes
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [refreshOnStart]);
|
}, [revalidateOnFocus]);
|
||||||
|
|
||||||
return { payload: data ? data[camera] : undefined };
|
return { payload: data ? data[camera] : undefined };
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,8 @@ import { AxiosResponse } from "axios";
|
|||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { useOverlayState } from "@/hooks/use-overlay-state";
|
import { useOverlayState } from "@/hooks/use-overlay-state";
|
||||||
import { usePersistence } from "@/hooks/use-persistence";
|
import { usePersistence } from "@/hooks/use-persistence";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { ASPECT_VERTICAL_LAYOUT } from "@/types/record";
|
||||||
|
|
||||||
// Android native hls does not seek correctly
|
// Android native hls does not seek correctly
|
||||||
const USE_NATIVE_HLS = !isAndroid;
|
const USE_NATIVE_HLS = !isAndroid;
|
||||||
@ -70,6 +72,11 @@ export default function HlsVideoPlayer({
|
|||||||
height: videoRef.current.videoHeight,
|
height: videoRef.current.videoHeight,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setTallCamera(
|
||||||
|
videoRef.current.videoWidth / videoRef.current.videoHeight <
|
||||||
|
ASPECT_VERTICAL_LAYOUT,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}, [videoRef, setFullResolution]);
|
}, [videoRef, setFullResolution]);
|
||||||
|
|
||||||
@ -109,6 +116,7 @@ export default function HlsVideoPlayer({
|
|||||||
|
|
||||||
// controls
|
// controls
|
||||||
|
|
||||||
|
const [tallCamera, setTallCamera] = useState(false);
|
||||||
const [isPlaying, setIsPlaying] = useState(true);
|
const [isPlaying, setIsPlaying] = useState(true);
|
||||||
const [muted, setMuted] = useOverlayState("playerMuted", true);
|
const [muted, setMuted] = useOverlayState("playerMuted", true);
|
||||||
const [volume, setVolume] = useOverlayState("playerVolume", 1.0);
|
const [volume, setVolume] = useOverlayState("playerVolume", 1.0);
|
||||||
@ -153,7 +161,10 @@ export default function HlsVideoPlayer({
|
|||||||
return (
|
return (
|
||||||
<TransformWrapper minScale={1.0}>
|
<TransformWrapper minScale={1.0}>
|
||||||
<VideoControls
|
<VideoControls
|
||||||
className="absolute bottom-5 left-1/2 z-50 -translate-x-1/2"
|
className={cn(
|
||||||
|
"absolute left-1/2 z-50 -translate-x-1/2",
|
||||||
|
tallCamera ? "bottom-12" : "bottom-5",
|
||||||
|
)}
|
||||||
video={videoRef.current}
|
video={videoRef.current}
|
||||||
isPlaying={isPlaying}
|
isPlaying={isPlaying}
|
||||||
show={visible && (controls || controlsOpen)}
|
show={visible && (controls || controlsOpen)}
|
||||||
|
@ -19,7 +19,7 @@ type useCameraActivityReturn = {
|
|||||||
|
|
||||||
export function useCameraActivity(
|
export function useCameraActivity(
|
||||||
camera: CameraConfig,
|
camera: CameraConfig,
|
||||||
refreshOnStart: boolean = true,
|
revalidateOnFocus: boolean = true,
|
||||||
): useCameraActivityReturn {
|
): useCameraActivityReturn {
|
||||||
const [objects, setObjects] = useState<ObjectType[]>([]);
|
const [objects, setObjects] = useState<ObjectType[]>([]);
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ export function useCameraActivity(
|
|||||||
|
|
||||||
const { payload: initialCameraState } = useInitialCameraState(
|
const { payload: initialCameraState } = useInitialCameraState(
|
||||||
camera.name,
|
camera.name,
|
||||||
refreshOnStart,
|
revalidateOnFocus,
|
||||||
);
|
);
|
||||||
|
|
||||||
const updatedCameraState = useDeepMemo(initialCameraState);
|
const updatedCameraState = useDeepMemo(initialCameraState);
|
||||||
|
Loading…
Reference in New Issue
Block a user