diff --git a/apps/expo/package.json b/apps/expo/package.json index d2ce58f..b152b72 100644 --- a/apps/expo/package.json +++ b/apps/expo/package.json @@ -31,6 +31,7 @@ "expo-brightness": "~11.8.0", "expo-build-properties": "~0.11.1", "expo-constants": "~15.4.5", + "expo-haptics": "~12.8.1", "expo-linking": "~6.2.2", "expo-navigation-bar": "^2.8.1", "expo-router": "~3.4.6", diff --git a/apps/expo/src/components/player/VideoPlayer.tsx b/apps/expo/src/components/player/VideoPlayer.tsx index 2e71865..3b7ccfd 100644 --- a/apps/expo/src/components/player/VideoPlayer.tsx +++ b/apps/expo/src/components/player/VideoPlayer.tsx @@ -51,6 +51,7 @@ export const VideoPlayer = () => { const isIdle = usePlayerStore((state) => state.interface.isIdle); const stream = usePlayerStore((state) => state.interface.currentStream); + const hlsTracks = usePlayerStore((state) => state.interface.hlsTracks); const setVideoRef = usePlayerStore((state) => state.setVideoRef); const setStatus = usePlayerStore((state) => state.setStatus); const setIsIdle = usePlayerStore((state) => state.setIsIdle); @@ -136,7 +137,7 @@ export const VideoPlayer = () => { const initializePlayer = async () => { if (!stream) { await dismissFullscreenPlayer(); - return router.push("/(tabs)"); + return router.back(); } setIsLoading(true); @@ -144,6 +145,7 @@ export const VideoPlayer = () => { if (stream.type === "hls") { url = stream.playlist; + console.log(hlsTracks); } if (stream.type === "file") { @@ -153,7 +155,7 @@ export const VideoPlayer = () => { if (!url) { await dismissFullscreenPlayer(); - return router.push("/(tabs)"); + return router.back(); } setVideoSrc({ @@ -179,7 +181,7 @@ export const VideoPlayer = () => { return () => { clearTimeout(timeout); }; - }, [dismissFullscreenPlayer, hasStartedPlaying, router, stream]); + }, [dismissFullscreenPlayer, hasStartedPlaying, hlsTracks, router, stream]); const onVideoLoadStart = () => { setIsLoading(true); @@ -190,8 +192,6 @@ export const VideoPlayer = () => { setHasStartedPlaying(true); }; - console.log(videoSrc, isLoading); - return ( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a04dbb3..4578095 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,6 +65,9 @@ importers: expo-constants: specifier: ~15.4.5 version: 15.4.5(expo@50.0.5) + expo-haptics: + specifier: ~12.8.1 + version: 12.8.1(expo@50.0.5) expo-linking: specifier: ~6.2.2 version: 6.2.2(expo@50.0.5) @@ -5615,6 +5618,14 @@ packages: fontfaceobserver: 2.3.0 dev: false + /expo-haptics@12.8.1(expo@50.0.5): + resolution: {integrity: sha512-ntLsHkfle8K8w9MW8pZEw92ZN3sguaGUSSIxv30fPKNeQFu7Cq/h47Qv3tONv2MO3wU48N9FbKnant6XlfptpA==} + peerDependencies: + expo: '*' + dependencies: + expo: 50.0.5(@babel/core@7.23.9)(@react-native/babel-preset@0.73.20) + dev: false + /expo-keep-awake@12.8.2(expo@50.0.5): resolution: {integrity: sha512-uiQdGbSX24Pt8nGbnmBtrKq6xL/Tm3+DuDRGBk/3ZE/HlizzNosGRIufIMJ/4B4FRw4dw8KU81h2RLuTjbay6g==} peerDependencies: