mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-04-21 00:32:04 +00:00
Z-Index fix
This commit is contained in:
parent
a5dc2c4d66
commit
3ea069926b
3 changed files with 26 additions and 16 deletions
|
|
@ -2950,13 +2950,14 @@ const AndroidVideoPlayer: React.FC = () => {
|
||||||
|
|
||||||
{/* Next Episode Button */}
|
{/* Next Episode Button */}
|
||||||
{showNextEpisodeButton && nextEpisode && (
|
{showNextEpisodeButton && nextEpisode && (
|
||||||
<Animated.View
|
<Animated.View
|
||||||
style={{
|
style={{
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
bottom: 80 + insets.bottom,
|
bottom: 80 + insets.bottom,
|
||||||
right: 8 + insets.right,
|
right: 8 + insets.right,
|
||||||
opacity: nextEpisodeButtonOpacity,
|
opacity: nextEpisodeButtonOpacity,
|
||||||
transform: [{ scale: nextEpisodeButtonScale }],
|
transform: [{ scale: nextEpisodeButtonScale }],
|
||||||
|
zIndex: 50,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
|
|
|
||||||
|
|
@ -2614,6 +2614,7 @@ const VideoPlayer: React.FC = () => {
|
||||||
right: 8 + insets.right,
|
right: 8 + insets.right,
|
||||||
opacity: nextEpisodeButtonOpacity,
|
opacity: nextEpisodeButtonOpacity,
|
||||||
transform: [{ scale: nextEpisodeButtonScale }],
|
transform: [{ scale: nextEpisodeButtonScale }],
|
||||||
|
zIndex: 50,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
|
|
|
||||||
|
|
@ -940,22 +940,30 @@ export const StreamsScreen = () => {
|
||||||
const isMkvByPath = lowerUri.includes('.mkv') || /[?&]ext=mkv\b/.test(lowerUri) || /format=mkv\b/.test(lowerUri) || /container=mkv\b/.test(lowerUri);
|
const isMkvByPath = lowerUri.includes('.mkv') || /[?&]ext=mkv\b/.test(lowerUri) || /format=mkv\b/.test(lowerUri) || /container=mkv\b/.test(lowerUri);
|
||||||
const isMkvFile = Boolean(isMkvByHeader || isMkvByPath);
|
const isMkvFile = Boolean(isMkvByHeader || isMkvByPath);
|
||||||
|
|
||||||
// Also check if the provider declares MKV format support
|
// Special case: moviebox should always use AndroidVideoPlayer
|
||||||
let providerSupportsMkv = false;
|
if (streamProvider === 'moviebox') {
|
||||||
try {
|
forceVlc = false;
|
||||||
const availableScrapers = await localScraperService.getAvailableScrapers();
|
logger.log(`[StreamsScreen] Provider ${streamProvider} -> always using AndroidVideoPlayer`);
|
||||||
const provider = availableScrapers.find(scraper => scraper.id === streamProvider);
|
} else {
|
||||||
if (provider && provider.formats) {
|
// Also check if the provider declares MKV format support
|
||||||
providerSupportsMkv = provider.formats.includes('mkv');
|
let providerSupportsMkv = false;
|
||||||
logger.log(`[StreamsScreen] Provider ${streamProvider} formats:`, provider.formats, 'supports MKV:', providerSupportsMkv);
|
try {
|
||||||
|
const availableScrapers = await localScraperService.getAvailableScrapers();
|
||||||
|
const provider = availableScrapers.find(scraper => scraper.id === streamProvider);
|
||||||
|
if (provider && provider.formats) {
|
||||||
|
providerSupportsMkv = provider.formats.includes('mkv');
|
||||||
|
logger.log(`[StreamsScreen] Provider ${streamProvider} formats:`, provider.formats, 'supports MKV:', providerSupportsMkv);
|
||||||
|
}
|
||||||
|
} catch (providerError) {
|
||||||
|
logger.warn('[StreamsScreen] Failed to check provider formats:', providerError);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isMkvFile || providerSupportsMkv) {
|
||||||
|
forceVlc = true;
|
||||||
|
logger.log(`[StreamsScreen] Stream is MKV format (detected: ${isMkvFile}, provider supports: ${providerSupportsMkv}) -> forcing VLC`);
|
||||||
|
} else {
|
||||||
|
logger.log(`[StreamsScreen] Stream is NOT MKV format (detected: ${isMkvFile}, provider supports: ${providerSupportsMkv}) -> using AndroidVideoPlayer`);
|
||||||
}
|
}
|
||||||
} catch (providerError) {
|
|
||||||
logger.warn('[StreamsScreen] Failed to check provider formats:', providerError);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isMkvFile || providerSupportsMkv) {
|
|
||||||
forceVlc = true;
|
|
||||||
logger.log(`[StreamsScreen] Stream is MKV format (detected: ${isMkvFile}, provider supports: ${providerSupportsMkv}) -> forcing VLC`);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue