diff --git a/app/(tabs)/explore.tsx b/app/(tabs)/explore.tsx
index bc1e10e..40743ee 100644
--- a/app/(tabs)/explore.tsx
+++ b/app/(tabs)/explore.tsx
@@ -14,8 +14,8 @@ import { useAuthGuard } from '@/hooks/useAuthGuard';
 import { TrainingPlan } from '@/services/trainingPlanApi';
 import { useRouter } from 'expo-router';
 import React from 'react';
-import { Animated, Image, PanResponder, Pressable, SafeAreaView, ScrollView, StyleSheet, useWindowDimensions, View } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { Animated, Image, PanResponder, Pressable, ScrollView, StyleSheet, useWindowDimensions, View } from 'react-native';
+import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 
 // 移除旧的“热门活动”滑动数据，改为固定的“热点功能”卡片
 
diff --git a/app/(tabs)/personal.tsx b/app/(tabs)/personal.tsx
index 299819a..223b46b 100644
--- a/app/(tabs)/personal.tsx
+++ b/app/(tabs)/personal.tsx
@@ -11,8 +11,8 @@ import { Ionicons } from '@expo/vector-icons';
 import { useBottomTabBarHeight } from '@react-navigation/bottom-tabs';
 import { useFocusEffect } from '@react-navigation/native';
 import React, { useEffect, useMemo, useState } from 'react';
-import { Alert, Image, Linking, SafeAreaView, ScrollView, StatusBar, StyleSheet, Switch, Text, TouchableOpacity, View } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { Alert, Image, Linking, ScrollView, StatusBar, StyleSheet, Switch, Text, TouchableOpacity, View } from 'react-native';
+import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 
 const DEFAULT_AVATAR_URL = 'https://plates-1251306435.cos.ap-guangzhou.myqcloud.com/images/avatar/avatarGirl01.jpeg';
 
diff --git a/app/challenge/day.tsx b/app/challenge/day.tsx
index ad1df71..954ea4c 100644
--- a/app/challenge/day.tsx
+++ b/app/challenge/day.tsx
@@ -5,7 +5,8 @@ import { completeDay, setCustom } from '@/store/challengeSlice';
 import type { Exercise, ExerciseCustomConfig } from '@/utils/pilatesPlan';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import React, { useState } from 'react';
-import { FlatList, SafeAreaView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { FlatList, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
 
 export default function ChallengeDayScreen() {
   const { day } = useLocalSearchParams<{ day: string }>();
diff --git a/app/challenge/index.tsx b/app/challenge/index.tsx
index 5cf0a0c..6dd9820 100644
--- a/app/challenge/index.tsx
+++ b/app/challenge/index.tsx
@@ -7,7 +7,8 @@ import { estimateSessionMinutesWithCustom } from '@/utils/pilatesPlan';
 import { Ionicons } from '@expo/vector-icons';
 import { useRouter } from 'expo-router';
 import React, { useEffect, useMemo } from 'react';
-import { Dimensions, FlatList, SafeAreaView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { Dimensions, FlatList, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
 
 export default function ChallengeHomeScreen() {
   const dispatch = useAppDispatch();
diff --git a/app/goals-list.tsx b/app/goals-list.tsx
index 0d7ea5b..6155be7 100644
--- a/app/goals-list.tsx
+++ b/app/goals-list.tsx
@@ -10,7 +10,8 @@ import { useFocusEffect } from '@react-navigation/native';
 import { LinearGradient } from 'expo-linear-gradient';
 import { useRouter } from 'expo-router';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Alert, FlatList, RefreshControl, SafeAreaView, StatusBar, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { Alert, FlatList, RefreshControl, StatusBar, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
 
 export default function GoalsListScreen() {
   const theme = (useColorScheme() ?? 'light') as 'light' | 'dark';
diff --git a/app/task-list.tsx b/app/task-list.tsx
index 74e6db9..7a8e9e7 100644
--- a/app/task-list.tsx
+++ b/app/task-list.tsx
@@ -12,7 +12,8 @@ import dayjs from 'dayjs';
 import { LinearGradient } from 'expo-linear-gradient';
 import { useRouter } from 'expo-router';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Alert, FlatList, RefreshControl, SafeAreaView, StatusBar, StyleSheet, Text, View } from 'react-native';
+import { Alert, FlatList, RefreshControl, StatusBar, StyleSheet, Text, View } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
 
 export default function GoalsDetailScreen() {
   const theme = (useColorScheme() ?? 'light') as 'light' | 'dark';