重整多余的UI组件和未定功能的逻辑链路的修正

This commit is contained in:
2026-11-11 16:33:04 +08:00
parent 34cb9d2805
commit 47f518f94c
100 changed files with 5789 additions and 3070 deletions

View File

@@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:get_it/get_it.dart';
@@ -40,8 +41,9 @@ class MainWrapper extends StatefulWidget {
}
class _MainWrapperState extends State<MainWrapper> {
int _currentIndex = 0;
final PageController _pageController = PageController();
String? _selectedTabId;
List<String> _tabIds = const [];
PageController? _pageController;
@override
void initState() {
@@ -53,15 +55,34 @@ class _MainWrapperState extends State<MainWrapper> {
@override
void dispose() {
_pageController.dispose();
_pageController?.dispose();
super.dispose();
}
void _onTabChanged(int index) {
setState(() {
_currentIndex = index;
});
_pageController.jumpToPage(index);
int _syncTabPages(List<TabConfigItem> tabs) {
final ids = tabs.map((tab) => tab.id).toList();
final selectedIndex = ids.indexOf(_selectedTabId ?? '');
final index = selectedIndex < 0 ? 0 : selectedIndex;
if (!listEquals(ids, _tabIds)) {
final previousController = _pageController;
_pageController = PageController(initialPage: index, keepPage: false);
_tabIds = ids;
_selectedTabId = ids[index];
if (previousController != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
previousController.dispose();
});
}
}
return index;
}
void _onTabChanged(String tabId) {
final controller = _pageController;
final index = _tabIds.indexOf(tabId);
if (controller == null || !controller.hasClients || index < 0) return;
setState(() => _selectedTabId = tabId);
controller.jumpToPage(index);
}
/// Tab 图标:选中用 filled(实心),未选用 outlined(描边),对比更清晰
@@ -94,10 +115,7 @@ class _MainWrapperState extends State<MainWrapper> {
}
}
Widget _buildCurrentPage(
TabConfigItem tab,
List<TabConfigItem> enabledItems,
) {
Widget _buildCurrentPage(TabConfigItem tab, String activeTabId) {
switch (tab.id) {
case 'home_v2':
return BlocProvider(
@@ -107,17 +125,16 @@ class _MainWrapperState extends State<MainWrapper> {
case 'home':
return const HomePage();
case 'device':
return const DeviceStatusPageV2();
return DeviceStatusPageV2(
isActive: activeTabId == tab.id,
);
// 作业首页(W01):返回键切回「设备」tab
case 'work':
return WorkHomePageV2(
isActive: enabledItems[_currentIndex].id == tab.id,
onBack: () {
final int deviceIndex = enabledItems.indexWhere(
(item) => item.id == 'device',
);
_onTabChanged(deviceIndex >= 0 ? deviceIndex : 0);
},
isActive: activeTabId == tab.id,
onBack: () => _onTabChanged(
_tabIds.contains('device') ? 'device' : _tabIds.first,
),
);
case 'ai':
return const AiPage();
@@ -141,8 +158,8 @@ class _MainWrapperState extends State<MainWrapper> {
@override
Widget build(BuildContext context) {
// 🔥 个人角色(roleKey == 'personal')底部导航强制只显示「设备 + 我的」
final roleKey = context.watch<AppUserCubit>().state.user?.roleKey;
final user = context.watch<AppUserCubit>().state.user;
final isAdmin = user?.isAdmin == true;
return BlocBuilder<TabConfigCubit, TabConfigState>(
builder: (context, state) {
if (state is! TabConfigLoaded) {
@@ -152,15 +169,15 @@ class _MainWrapperState extends State<MainWrapper> {
}
final config = state.config;
final enabledItems = config.navItemsForRole(roleKey);
final enabledItems = config.navItemsForRole(user?.roleKey);
if (enabledItems.isEmpty) {
return const Scaffold(body: Center(child: Text('请至少启用一个 Tab')));
}
if (_currentIndex >= enabledItems.length) {
_currentIndex = 0;
}
final currentIndex = _syncTabPages(enabledItems);
final controller = _pageController!;
final activeTabId = enabledItems[currentIndex].id;
// 键盘弹出时 body 已被 Scaffold 缩短到底栏之上,无需再叠加导航高度
final mq = MediaQuery.of(context);
@@ -184,28 +201,27 @@ class _MainWrapperState extends State<MainWrapper> {
child: Stack(
children: [
PageView(
controller: _pageController,
// 🔥 启用左右滑动切换 Tab
key: ObjectKey(controller),
controller: controller,
physics: const BouncingScrollPhysics(),
onPageChanged: (index) {
setState(() {
_currentIndex = index;
});
},
children: enabledItems
.map((tab) => _buildCurrentPage(tab, enabledItems))
.toList(),
),
// 悬浮条 - 可拖动的悬浮按钮
ValueListenableBuilder<bool>(
valueListenable: FloatBarSettingService.settingNotifier,
builder: (context, isEnabled, child) {
return Visibility(
visible: isEnabled,
child: const FloatBarWidget(),
);
if (_pageController != controller) return;
final tabId = enabledItems[index].id;
if (tabId != _selectedTabId) {
setState(() => _selectedTabId = tabId);
}
},
children: [
for (final tab in enabledItems)
_buildCurrentPage(tab, activeTabId),
],
),
if (isAdmin)
ValueListenableBuilder<bool>(
valueListenable: FloatBarSettingService.settingNotifier,
builder: (context, isEnabled, child) =>
isEnabled ? const FloatBarWidget() : const SizedBox.shrink(),
),
],
),
),
@@ -220,7 +236,7 @@ class _MainWrapperState extends State<MainWrapper> {
final double maxBarWidth = constraints.maxWidth;
// 3 个及以上 Tab 直接铺满可用宽度:每格自然等分(3 个时约 108/格),
// 不会像固定 84/格 那样缩成一小段胶囊;
// 只有 2 个 Tab(如个人角色:设备 + 我的)才收窄居中,避免太空旷
// 管理员只启用 1~2 个 Tab 时收窄居中
final double barWidth = itemCount >= 3
? maxBarWidth
: (itemCount * 116 < maxBarWidth
@@ -265,7 +281,7 @@ class _MainWrapperState extends State<MainWrapper> {
AnimatedPositioned(
duration: const Duration(milliseconds: 280),
curve: Curves.easeOutCubic,
left: _currentIndex * tabWidth +
left: currentIndex * tabWidth +
(tabWidth - indicatorW) / 2,
top: (56 - indicatorH) / 2,
width: indicatorW,
@@ -295,14 +311,14 @@ class _MainWrapperState extends State<MainWrapper> {
enabledItems.asMap().entries.map((entry) {
final index = entry.key;
final item = entry.value;
final isSelected = _currentIndex == index;
final isSelected = currentIndex == index;
return Expanded(
child: InkWell(
borderRadius: BorderRadius.circular(
indicatorH / 2,
),
onTap: () => _onTabChanged(index),
onTap: () => _onTabChanged(item.id),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,