From 8ebc6e1928e0940b53bca9b9495f3da12a03025d Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@localhost.localdomain>
Date: Thu, 19 Feb 2026 21:49:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20v1.1.9+11=20-=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94?=
 =?UTF-8?q?(=E5=8F=8CScaffold=E5=B5=8C=E5=A5=97)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

问题原因: ActivityListScreen 在展示 MessagesScreen/ProfileScreen 时，
外层 Scaffold 的 AppBar 和 FloatingActionButton 仍然显示，
导致双层 Scaffold 嵌套，页面交互被遮挡/挤压。

修复方案: 当 _selectedIndex 为消息(3)或我的(4)时，
外层 Scaffold 不渲染 AppBar 和 FAB，
让内嵌的 MessagesScreen/ProfileScreen 自己的 Scaffold 正常工作。
---
 lib/screens/activity_list_screen.dart | 8 ++++++++
 pubspec.yaml                          | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/screens/activity_list_screen.dart b/lib/screens/activity_list_screen.dart
index a6ccf08..8f8b596 100644
--- a/lib/screens/activity_list_screen.dart
+++ b/lib/screens/activity_list_screen.dart
@@ -119,6 +119,14 @@ class _ActivityListScreenState extends State<ActivityListScreen> {
 
   @override
   Widget build(BuildContext context) {
+    // When showing messages or profile, use their own Scaffold directly
+    if (_selectedIndex == 3 || _selectedIndex == 4) {
+      return Scaffold(
+        backgroundColor: const Color(0xFFFFF8F0),
+        body: _buildBody(),
+        bottomNavigationBar: _buildBottomNavigationBar(),
+      );
+    }
     return Scaffold(
       backgroundColor: const Color(0xFFFFF8F0),
       appBar: AppBar(
diff --git a/pubspec.yaml b/pubspec.yaml
index 99ab626..e63e8ef 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: banxiang_app
 description: 伴享
-version: 1.1.8+10
+version: 1.1.9+11
 
 environment:
   sdk: '>=3.0.0 <4.0.0'