diff --git a/src/screens/PlayDetail/Horizontal/components/Header.tsx b/src/screens/PlayDetail/Horizontal/components/Header.tsx index 461f475..08a5b9e 100644 --- a/src/screens/PlayDetail/Horizontal/components/Header.tsx +++ b/src/screens/PlayDetail/Horizontal/components/Header.tsx @@ -59,6 +59,7 @@ export default memo(() => { const styles = StyleSheet.create({ container: { + flex: 0, // backgroundColor: '#ccc', flexDirection: 'row', // justifyContent: 'center', diff --git a/src/screens/PlayDetail/Vertical/Player/components/ControlBtn.tsx b/src/screens/PlayDetail/Vertical/Player/components/ControlBtn.tsx index 09deb3e..b78d88d 100644 --- a/src/screens/PlayDetail/Vertical/Player/components/ControlBtn.tsx +++ b/src/screens/PlayDetail/Vertical/Player/components/ControlBtn.tsx @@ -5,7 +5,7 @@ import { useTheme } from '@/store/theme/hook' import { playNext, playPrev, togglePlay } from '@/core/player/player' import { useIsPlay } from '@/store/player/hook' import { createStyle } from '@/utils/tools' -import { useLayout, useWindowSize } from '@/utils/hooks' +import { useWindowSize } from '@/utils/hooks' import { BTN_WIDTH } from './MoreBtn/Btn' import { useMemo } from 'react' @@ -47,7 +47,6 @@ const MIN_SIZE = BTN_WIDTH * 1.2 export default () => { const winSize = useWindowSize() - const { onLayout, width } = useLayout() const maxHeight = Math.max(winSize.height * 0.11, MIN_SIZE) const containerStyle = useMemo(() => { return { @@ -55,10 +54,10 @@ export default () => { maxHeight, } }, [maxHeight]) - const size = Math.min(Math.max(width * 0.33 * global.lx.fontSize * 0.4, MIN_SIZE), MAX_SIZE, maxHeight) + const size = Math.min(Math.max(winSize.width * 0.33 * global.lx.fontSize * 0.4, MIN_SIZE), MAX_SIZE, maxHeight) return ( - + diff --git a/src/screens/PlayDetail/Vertical/Player/index.tsx b/src/screens/PlayDetail/Vertical/Player/index.tsx index 215682c..de9fc50 100644 --- a/src/screens/PlayDetail/Vertical/Player/index.tsx +++ b/src/screens/PlayDetail/Vertical/Player/index.tsx @@ -21,8 +21,7 @@ export default memo(() => { const styles = createStyle({ container: { - flexShrink: 1, - flexGrow: 1, + flex: 0, width: '100%', // paddingTop: progressContentPadding, // marginTop: -progressContentPadding, diff --git a/src/screens/PlayDetail/Vertical/index.tsx b/src/screens/PlayDetail/Vertical/index.tsx index d50efb8..e032fb7 100644 --- a/src/screens/PlayDetail/Vertical/index.tsx +++ b/src/screens/PlayDetail/Vertical/index.tsx @@ -9,7 +9,6 @@ import PagerView, { type PagerViewOnPageSelectedEvent } from 'react-native-pager import Pic from './Pic' import Lyric from './Lyric' import { screenkeepAwake, screenUnkeepAwake } from '@/utils/nativeModules/utils' -import { NAV_SHEAR_NATIVE_IDS } from '@/config/constant' import commonState, { type InitState as CommonState } from '@/store/common/state' import { createStyle } from '@/utils/tools' // import { useTheme } from '@/store/theme/hook' @@ -91,9 +90,7 @@ export default memo(({ componentId }: { componentId: string }) => { */} - - - + ) @@ -107,9 +104,6 @@ const styles = createStyle({ pagerView: { flex: 1, }, - footer: { - flex: 0, - }, // pageIndicator: { // flex: 0, // flexDirection: 'row',