legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-15 17:12:59 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bobile

Browse Source
This commit is contained in:
legop3
2026-07-12 02:21:13 -04:00
parent 9732f6c080
commit fd1b3e103d
7 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/public/assets/index-C26pmzSZ.js.map
-1
View File
File diff suppressed because one or more lines are too long
server/public/assets/index-DUzYA1uF.css
+1
View File
File diff suppressed because one or more lines are too long
server/public/assets/index-C26pmzSZ.js → server/public/assets/index-Dgumk83n.js
+2 -2
View File
File diff suppressed because one or more lines are too long
server/public/assets/index-Dgumk83n.js.map
+1
View File
File diff suppressed because one or more lines are too long
server/public/assets/index-LBneybK0.css
-1
View File
File diff suppressed because one or more lines are too long
server/public/index.html
+2 -2
View File
@@ -78,8 +78,8 @@
<script defer src="https://analytics.otter.land/script.js" data-website-id="82dd56a5-db44-4279-bd1e-a4d9fee39af7" data-domains="rover.otter.land"></script> <script defer src="https://analytics.otter.land/script.js" data-website-id="82dd56a5-db44-4279-bd1e-a4d9fee39af7" data-domains="rover.otter.land"></script>
<script defer src="https://analytics.otter.land/recorder.js" data-website-id="82dd56a5-db44-4279-bd1e-a4d9fee39af7" data-domains="rover.otter.land" data-sample-rate="0.15" data-mask-level="moderate" data-max-duration="300000"></script> <script defer src="https://analytics.otter.land/recorder.js" data-website-id="82dd56a5-db44-4279-bd1e-a4d9fee39af7" data-domains="rover.otter.land" data-sample-rate="0.15" data-mask-level="moderate" data-max-duration="300000"></script>
<title>Roomba Rover</title> <title>Roomba Rover</title>
<script type="module" crossorigin src="/assets/index-C26pmzSZ.js"></script> <script type="module" crossorigin src="/assets/index-Dgumk83n.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-LBneybK0.css"> <link rel="stylesheet" crossorigin href="/assets/index-DUzYA1uF.css">
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
webui/src/components/PtzCamera/index.jsx
+22 -13
View File
@@ -339,22 +339,31 @@ function buildPtzTurnModel(ptz, selfId) {
}; };
} }
function PtzMediaPane({ ptz, open }) { function PtzMediaPane({ ptz, open, framed = true }) {
const isOperator = Boolean(ptz?.isOperator); const isOperator = Boolean(ptz?.isOperator);
const selfId = useSessionSelector((state) => state.session?.socketId || null); const selfId = useSessionSelector((state) => state.session?.socketId || null);
const snapshotFeeds = usePtzCameraSnapshots([PTZ_CAMERA_ID], { enabled: open && !isOperator }); const snapshotFeeds = usePtzCameraSnapshots([PTZ_CAMERA_ID], { enabled: open && !isOperator });
const snapshot = snapshotFeeds[PTZ_CAMERA_ID] || null; const snapshot = snapshotFeeds[PTZ_CAMERA_ID] || null;
const turnModel = useMemo(() => buildPtzTurnModel(ptz, selfId), [ptz, selfId]); const turnModel = useMemo(() => buildPtzTurnModel(ptz, selfId), [ptz, selfId]);
const media = (
<>
{isOperator ? (
<PtzLiveVideo enabled={open} startMuted={false} label={ptz?.name || 'PTZ Camera'} />
) : (
<PtzSnapshotPreview feed={snapshot} label={ptz?.name || 'PTZ Camera'} />
)}
<TurnsOverlay turnModel={turnModel} />
</>
);
if (!framed) {
return <div className="relative h-full min-h-0 w-full overflow-hidden bg-black">{media}</div>;
}
return ( return (
<div className="flex h-full min-h-0 w-full items-center justify-center overflow-hidden bg-black"> <div className="flex h-full min-h-0 w-full items-center justify-center overflow-hidden bg-black">
<div className="relative aspect-video max-h-full w-full max-w-full overflow-hidden bg-black"> <div className="relative aspect-video max-h-full w-full max-w-full overflow-hidden bg-black">
{isOperator ? ( {media}
<PtzLiveVideo enabled={open} startMuted={false} label={ptz?.name || 'PTZ Camera'} />
) : (
<PtzSnapshotPreview feed={snapshot} label={ptz?.name || 'PTZ Camera'} />
)}
<TurnsOverlay turnModel={turnModel} />
</div> </div>
</div> </div>
); );
@@ -362,12 +371,12 @@ function PtzMediaPane({ ptz, open }) {
function PtzDesktopFullscreen({ ptz, releasePending }) { function PtzDesktopFullscreen({ ptz, releasePending }) {
return ( return (
<div className="grid h-full min-h-0 grid-rows-[minmax(0,1fr)_minmax(9rem,0.32fr)] gap-0.5 overflow-hidden p-0.5"> <div className="grid h-full min-h-0 grid-rows-[minmax(0,1fr)_minmax(7rem,0.22fr)] gap-0.5 overflow-hidden p-0.5">
<div className="flex min-h-0 min-w-0 gap-0.5 overflow-hidden"> <div className="flex min-h-0 min-w-0 gap-0.5 overflow-hidden">
<main className="min-h-0 shrink-0 overflow-hidden bg-black" style={{ aspectRatio: '16 / 9' }}> <main className="min-h-0 shrink-0 overflow-hidden bg-black" style={{ aspectRatio: '16 / 9' }}>
<PtzMediaPane ptz={ptz} open /> <PtzMediaPane ptz={ptz} open framed />
</main> </main>
<aside className="flex min-h-0 min-w-72 flex-1 flex-col gap-0.5 overflow-y-auto bg-neutral-950 text-sm"> <aside className="flex min-h-0 min-w-56 flex-1 flex-col gap-0.5 overflow-y-auto bg-neutral-950 text-sm">
<PtzQueueSummary ptz={ptz} /> <PtzQueueSummary ptz={ptz} />
{ptz?.isOperator ? ( {ptz?.isOperator ? (
<PtzLightingControls ptz={ptz} /> <PtzLightingControls ptz={ptz} />
@@ -398,12 +407,12 @@ function PtzDesktopFullscreen({ ptz, releasePending }) {
function PtzMobileFullscreen({ ptz, layout }) { function PtzMobileFullscreen({ ptz, layout }) {
const landscape = layout === 'mobile-landscape'; const landscape = layout === 'mobile-landscape';
const videoClass = landscape ? 'h-[62svh]' : 'h-[42svh]'; const videoClass = landscape ? 'h-[58dvh]' : 'h-[44dvh]';
return ( return (
<div className="flex min-h-0 flex-1 flex-col gap-0.5 overflow-y-auto p-0.5"> <div className="flex min-h-0 flex-1 flex-col gap-0.5 overflow-y-auto p-0.5">
<main className={`${videoClass} min-h-0 overflow-hidden bg-black`}> <main className={`${videoClass} min-h-48 shrink-0 overflow-hidden bg-black`}>
<PtzMediaPane ptz={ptz} open /> <PtzMediaPane ptz={ptz} open framed={false} />
</main> </main>
<section className="mobile-touch-control"> <section className="mobile-touch-control">
<PtzMobileControlsPanel ptz={ptz} disabled={!ptz?.isOperator} /> <PtzMobileControlsPanel ptz={ptz} disabled={!ptz?.isOperator} />