From 1ffbb63753cbfec5c0e84adfb651a44e2fdb290b Mon Sep 17 00:00:00 2001
From: lafay <2021211506@stu.hit.edu.cn>
Date: Wed, 18 Mar 2026 10:58:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=B1=8F=E5=B9=95=E7=9A=84=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 有 header 的屏幕使用 edges={['bottom']}（React Navigation 自动处理顶部）
- 没有 header 的屏幕使用 edges={['top', 'bottom']}（需要自己处理顶部）
- 修复了以下屏幕：
  - HomeScreen: edges={['bottom']} → ['top', 'bottom']
  - MessageListScreen: edges={['top']} → ['top', 'bottom']
  - ScheduleScreen: edges={['top']} → ['top', 'bottom']
  - ProfileScreen: edges={['top', 'bottom']} ✓ 已正确
  - PostDetailScreen: 空状态添加 edges={['bottom']}
  - UserScreen: 空状态添加 edges={['bottom']}
  - NotificationsScreen: edges={[]} → ['bottom']
  - SearchScreen: edges={['left', 'right']} → ['bottom']
  - BlockedUsersScreen: 加载状态添加 edges={['bottom']}
  - GroupInfoScreen: edges={['bottom']} ✓ 已正确
  - PrivateChatInfoScreen: 加载状态添加 edges={['bottom']}
---
 src/screens/home/HomeScreen.tsx               | 4 ++--
 src/screens/home/PostDetailScreen.tsx         | 2 +-
 src/screens/home/SearchScreen.tsx             | 2 +-
 src/screens/message/GroupInfoScreen.tsx       | 4 ++--
 src/screens/message/MessageListScreen.tsx     | 4 ++--
 src/screens/message/NotificationsScreen.tsx   | 4 ++--
 src/screens/message/PrivateChatInfoScreen.tsx | 2 +-
 src/screens/profile/BlockedUsersScreen.tsx    | 2 +-
 src/screens/profile/ProfileScreen.tsx         | 2 +-
 src/screens/profile/UserScreen.tsx            | 2 +-
 src/screens/schedule/ScheduleScreen.tsx       | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/screens/home/HomeScreen.tsx b/src/screens/home/HomeScreen.tsx
index 6a74b3d..cfff548 100644
--- a/src/screens/home/HomeScreen.tsx
+++ b/src/screens/home/HomeScreen.tsx
@@ -643,7 +643,7 @@ export const HomeScreen: React.FC = () => {
   // 搜索页面内嵌模式
   if (showSearch) {
     return (
-      <SafeAreaView style={styles.container} edges={['top']}>
+      <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
         <StatusBar barStyle="dark-content" backgroundColor={colors.background.paper} />
         <SearchScreen
           onBack={() => setShowSearch(false)}
@@ -654,7 +654,7 @@ export const HomeScreen: React.FC = () => {
   
   // 正常首页内容
   return (
-    <SafeAreaView style={styles.container} edges={['top']}>
+    <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
       <StatusBar barStyle="dark-content" backgroundColor={colors.background.paper} />
       
       {/* 顶部Header */}
diff --git a/src/screens/home/PostDetailScreen.tsx b/src/screens/home/PostDetailScreen.tsx
index dea7aea..f7ced6d 100644
--- a/src/screens/home/PostDetailScreen.tsx
+++ b/src/screens/home/PostDetailScreen.tsx
@@ -1406,7 +1406,7 @@ export const PostDetailScreen: React.FC = () => {
 
   if (!post) {
     return (
-      <SafeAreaView style={styles.container}>
+      <SafeAreaView style={styles.container} edges={['bottom']}>
         <EmptyState
           title="帖子不存在"
           description="该帖子可能已被删除"
diff --git a/src/screens/home/SearchScreen.tsx b/src/screens/home/SearchScreen.tsx
index 3c815cc..ac4774a 100644
--- a/src/screens/home/SearchScreen.tsx
+++ b/src/screens/home/SearchScreen.tsx
@@ -407,7 +407,7 @@ export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack, navigation:
   };
 
   return (
-    <SafeAreaView style={styles.container} edges={['left', 'right']}>
+    <SafeAreaView style={styles.container} edges={['bottom']}>
       {/* 搜索输入框 */}
       <View
         style={[
diff --git a/src/screens/message/GroupInfoScreen.tsx b/src/screens/message/GroupInfoScreen.tsx
index 677c5dd..812a411 100644
--- a/src/screens/message/GroupInfoScreen.tsx
+++ b/src/screens/message/GroupInfoScreen.tsx
@@ -534,7 +534,7 @@ const GroupInfoScreen: React.FC = () => {
 
   if (loading) {
     return (
-      <SafeAreaView style={styles.container}>
+      <SafeAreaView style={styles.container} edges={['bottom']}>
         <Loading />
       </SafeAreaView>
     );
@@ -542,7 +542,7 @@ const GroupInfoScreen: React.FC = () => {
 
   if (!group) {
     return (
-      <SafeAreaView style={styles.container}>
+      <SafeAreaView style={styles.container} edges={['bottom']}>
         <View style={styles.errorContainer}>
           <Text variant="body" color={colors.text.secondary}>
             群组信息不存在
diff --git a/src/screens/message/MessageListScreen.tsx b/src/screens/message/MessageListScreen.tsx
index 08353d9..217ca1d 100644
--- a/src/screens/message/MessageListScreen.tsx
+++ b/src/screens/message/MessageListScreen.tsx
@@ -931,7 +931,7 @@ export const MessageListScreen: React.FC = () => {
   // 桌面端双栏布局
   if (isWideScreen && !isSearchMode) {
     return (
-      <SafeAreaView style={styles.container} edges={['top']}>
+      <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
         <View style={styles.desktopContainer}>
           {/* 左侧会话列表 */}
           <View style={[styles.sidebar, { width: sidebarWidth }]}>
@@ -966,7 +966,7 @@ export const MessageListScreen: React.FC = () => {
   }
 
   return (
-    <SafeAreaView style={styles.container} edges={['top']}>
+    <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
       {showNotifications ? (
         // 显示系统通知页面，传入 onBack 回调
         <NotificationsScreen onBack={() => setShowNotifications(false)} />
diff --git a/src/screens/message/NotificationsScreen.tsx b/src/screens/message/NotificationsScreen.tsx
index 6a05791..f7ddef1 100644
--- a/src/screens/message/NotificationsScreen.tsx
+++ b/src/screens/message/NotificationsScreen.tsx
@@ -372,7 +372,7 @@ export const NotificationsScreen: React.FC<{ onBack?: () => void }> = ({ onBack
   // 如果还未hydrated，显示加载占位符，避免竞态条件导致的渲染问题
   if (!isHydrated) {
     return (
-      <SafeAreaView style={styles.container} edges={[]}>
+      <SafeAreaView style={styles.container} edges={['bottom']}>
         <View style={styles.loadingContainer}>
           <ActivityIndicator size="large" color={colors.primary.main} />
         </View>
@@ -381,7 +381,7 @@ export const NotificationsScreen: React.FC<{ onBack?: () => void }> = ({ onBack
   }
 
   return (
-    <SafeAreaView style={styles.container} edges={[]}>
+    <SafeAreaView style={styles.container} edges={['bottom']}>
       {isWideScreen ? (
         <ResponsiveContainer maxWidth={containerMaxWidth}>
           {/* 头部 - 大屏模式下隐藏返回按钮 */}
diff --git a/src/screens/message/PrivateChatInfoScreen.tsx b/src/screens/message/PrivateChatInfoScreen.tsx
index 0571d2f..e3aebbe 100644
--- a/src/screens/message/PrivateChatInfoScreen.tsx
+++ b/src/screens/message/PrivateChatInfoScreen.tsx
@@ -307,7 +307,7 @@ const PrivateChatInfoScreen: React.FC = () => {
 
   if (loading) {
     return (
-      <SafeAreaView style={styles.container}>
+      <SafeAreaView style={styles.container} edges={['bottom']}>
         <Loading />
       </SafeAreaView>
     );
diff --git a/src/screens/profile/BlockedUsersScreen.tsx b/src/screens/profile/BlockedUsersScreen.tsx
index 92da377..9ba463b 100644
--- a/src/screens/profile/BlockedUsersScreen.tsx
+++ b/src/screens/profile/BlockedUsersScreen.tsx
@@ -100,7 +100,7 @@ export const BlockedUsersScreen: React.FC = () => {
 
   if (loading) {
     return (
-      <SafeAreaView style={styles.container}>
+      <SafeAreaView style={styles.container} edges={['bottom']}>
         <View style={styles.loadingWrap}>
           <ActivityIndicator size="large" color={colors.primary.main} />
         </View>
diff --git a/src/screens/profile/ProfileScreen.tsx b/src/screens/profile/ProfileScreen.tsx
index 1053576..c460d9b 100644
--- a/src/screens/profile/ProfileScreen.tsx
+++ b/src/screens/profile/ProfileScreen.tsx
@@ -363,7 +363,7 @@ export const ProfileScreen: React.FC = () => {
 
   if (!currentUser) {
     return (
-      <SafeAreaView style={styles.container}>
+      <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
         <EmptyState
           title="未登录"
           description="请先登录"
diff --git a/src/screens/profile/UserScreen.tsx b/src/screens/profile/UserScreen.tsx
index 3c93997..8febb3e 100644
--- a/src/screens/profile/UserScreen.tsx
+++ b/src/screens/profile/UserScreen.tsx
@@ -416,7 +416,7 @@ export const UserScreen: React.FC = () => {
 
   if (!user) {
     return (
-      <SafeAreaView style={styles.container}>
+      <SafeAreaView style={styles.container} edges={['bottom']}>
         <EmptyState
           title="用户不存在"
           description="该用户可能已被删除"
diff --git a/src/screens/schedule/ScheduleScreen.tsx b/src/screens/schedule/ScheduleScreen.tsx
index 42639e4..6db217c 100644
--- a/src/screens/schedule/ScheduleScreen.tsx
+++ b/src/screens/schedule/ScheduleScreen.tsx
@@ -718,7 +718,7 @@ export const ScheduleScreen: React.FC = () => {
   };
 
   return (
-    <SafeAreaView style={styles.container} edges={['top']}>
+    <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
       <StatusBar barStyle="light-content" backgroundColor={colors.primary.main} />
 
       {/* 周选择器 */}