hacks for iOS

ohcnetwork · Jun 3, 2024 · be9bd11 · be9bd11
1 parent a85085c
commit be9bd11
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/Components/CameraFeed/CameraFeed.tsx b/src/Components/CameraFeed/CameraFeed.tsx
@@ -4,7 +4,7 @@ import useOperateCamera, { PTZPayload } from "./useOperateCamera";
 import usePlayer from "./usePlayer";
 import { getStreamUrl } from "./utils";
 import ReactPlayer from "react-player";
-import { classNames, isIOS } from "../../Utils/utils";
+import { classNames, isAppleDevice, isIOS } from "../../Utils/utils";
 import FeedAlert, { FeedAlertState } from "./FeedAlert";
 import FeedNetworkSignal from "./FeedNetworkSignal";
 import NoFeedAvailable from "./NoFeedAvailable";
@@ -28,6 +28,7 @@ interface Props {
   constrolsDisabled?: boolean;
   shortcutsDisabled?: boolean;
   onMove?: () => void;
+  onReset?: () => void;
 }
 
 export default function CameraFeed(props: Props) {
@@ -87,6 +88,7 @@ export default function CameraFeed(props: Props) {
 
   const resetStream = () => {
     setState("loading");
+    props.onReset?.();
     initializeStream();
   };
   return (
@@ -108,6 +110,7 @@ export default function CameraFeed(props: Props) {
         className={classNames(
           "flex flex-col overflow-clip rounded-xl bg-black md:max-h-screen",
           props.className,
+          isAppleDevice && isFullscreen && "px-20",
         )}
       >
         <div className="flex items-center justify-between bg-zinc-900 px-4 py-1.5 md:py-2">
@@ -120,14 +123,16 @@ export default function CameraFeed(props: Props) {
               />
               {props.asset.name}
             </span>
-            <div className={state === "loading" ? "animate-pulse" : ""}>
-              <FeedNetworkSignal
-                playerRef={playerRef as any}
-                playedOn={player.playedOn}
-                status={player.status}
-                onReset={resetStream}
-              />
-            </div>
+            {!isIOS && (
+              <div className={state === "loading" ? "animate-pulse" : ""}>
+                <FeedNetworkSignal
+                  playerRef={playerRef as any}
+                  playedOn={player.playedOn}
+                  status={player.status}
+                  onReset={resetStream}
+                />
+              </div>
+            )}
           </div>
         </div>
 

diff --git a/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
@@ -16,7 +16,7 @@ import useOperateCamera, {
   PTZPayload,
 } from "../../CameraFeed/useOperateCamera";
 import request from "../../../Utils/request/request";
-import { classNames } from "../../../Utils/utils";
+import { classNames, isIOS } from "../../../Utils/utils";
 
 export const ConsultationFeedTab = (props: ConsultationTabProps) => {
   const authUser = useAuthUser();
@@ -27,6 +27,7 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
   const [preset, setPreset] = useState<AssetBedModel>();
   const [isUpdatingPreset, setIsUpdatingPreset] = useState(false);
   const [hasMoved, setHasMoved] = useState(false);
+  const [key, setKey] = useState(0);
   const divRef = useRef<any>();
 
   const operate = useOperateCamera(asset?.id ?? "", true);
@@ -106,9 +107,15 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
       </span>
       <div ref={divRef}>
         <CameraFeed
+          key={key}
           asset={asset}
           preset={preset?.meta.position}
           onMove={() => setHasMoved(true)}
+          onReset={() => {
+            if (isIOS) {
+              setKey(key + 1);
+            }
+          }}
           onStreamError={() => {
             triggerGoal("Camera Feed Viewed", {
               consultationId: props.consultationId,