页面UI替换1远程遥控和各项弹窗和作业主页面和子页面+路径规划的主页面重构等

This commit is contained in:
2026-10-28 14:38:24 +08:00
parent 8a41113c92
commit eb8dec2868
64 changed files with 25316 additions and 1174 deletions

View File

@@ -20,12 +20,18 @@ import 'package:maibu_satabot_v2/features/v2/my/presentation/pages/my_page_v2.da
as my_v2_new;
import 'package:maibu_satabot_v2/features/v2/workorder/presentation/pages/workorder_page.dart';
import 'package:maibu_satabot_v2/features/v2/report/presentation/pages/report_page.dart';
import 'package:maibu_satabot_v2/features/v2/work/presentation/pages/work_home_page_v2.dart';
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/view/float_bar_widget.dart';
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/cubit/float_bar_setting_cubit.dart';
import 'package:maibu_satabot_v2/core/di/injection.dart';
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
import 'package:maibu_satabot_v2/core/app/app_user_cubit.dart';
/// 底部悬浮导航占据的高度(不含系统手势条安全区):
/// 上下 Padding 16×2 + 胶囊内上下 padding 2×2 + 胶囊内容高 56 = 92
/// 页面内容需要在这个高度之上收住,否则会被悬浮导航盖住
const double kBottomNavDock = 92;
class MainWrapper extends StatefulWidget {
const MainWrapper({super.key});
@@ -65,6 +71,8 @@ class _MainWrapperState extends State<MainWrapper> {
return selected ? Icons.home_rounded : Icons.home_outlined;
case 'grid_view_rounded':
return selected ? Icons.grid_view_rounded : Icons.grid_view_outlined;
case 'map_rounded':
return selected ? Icons.map_rounded : Icons.map_outlined;
case 'devices_rounded':
return selected ? Icons.devices_rounded : Icons.devices_outlined;
case 'auto_awesome_rounded':
@@ -86,7 +94,10 @@ class _MainWrapperState extends State<MainWrapper> {
}
}
Widget _buildCurrentPage(TabConfigItem tab) {
Widget _buildCurrentPage(
TabConfigItem tab,
List<TabConfigItem> enabledItems,
) {
switch (tab.id) {
case 'home_v2':
return BlocProvider(
@@ -97,6 +108,16 @@ class _MainWrapperState extends State<MainWrapper> {
return const HomePage();
case 'device':
return const DeviceStatusPageV2();
// 作业首页(W01):返回键切回「设备」tab
case 'work':
return WorkHomePageV2(
onBack: () {
final int deviceIndex = enabledItems.indexWhere(
(item) => item.id == 'device',
);
_onTabChanged(deviceIndex >= 0 ? deviceIndex : 0);
},
);
case 'ai':
return const AiPage();
case 'warning':
@@ -140,36 +161,52 @@ class _MainWrapperState extends State<MainWrapper> {
_currentIndex = 0;
}
// 键盘弹出时 body 已被 Scaffold 缩短到底栏之上,无需再叠加导航高度
final mq = MediaQuery.of(context);
final keyboardOpen = mq.viewInsets.bottom > 0;
return Scaffold(
extendBody: false,
// 底部导航预留区(SafeArea 那条)与页面同色,消除突兀的底色带
// 底部导航改为「真正悬浮」:body 铺满到屏幕底部(含手势条区域),
// 这样底栏区域不再被 Scaffold 的 pageBackground 盖成一条白带,
// 页面自身的背景(背景图/渐变)可以一直延伸到底。
extendBody: true,
backgroundColor: context.appColors.pageBackground,
body: Stack(
children: [
PageView(
controller: _pageController,
// 🔥 启用左右滑动切换 Tab
physics: const BouncingScrollPhysics(),
onPageChanged: (index) {
setState(() {
_currentIndex = index;
});
},
children: enabledItems
.map((tab) => _buildCurrentPage(tab))
.toList(),
// 向 body 子树注入「底部导航高度」:使用 SafeArea 的页面会自动让位,
// 且 SafeArea 内部会 removePadding,嵌套不会重复叠加。
body: MediaQuery(
data: mq.copyWith(
padding: mq.padding.copyWith(
bottom:
mq.padding.bottom + (keyboardOpen ? 0 : kBottomNavDock),
),
// 悬浮条 - 可拖动的悬浮按钮
ValueListenableBuilder<bool>(
valueListenable: FloatBarSettingService.settingNotifier,
builder: (context, isEnabled, child) {
return Visibility(
visible: isEnabled,
child: const FloatBarWidget(),
);
},
),
],
),
child: Stack(
children: [
PageView(
controller: _pageController,
// 🔥 启用左右滑动切换 Tab
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(),
);
},
),
],
),
),
bottomNavigationBar: SafeArea(
top: false,
@@ -178,138 +215,147 @@ class _MainWrapperState extends State<MainWrapper> {
child: LayoutBuilder(
builder: (context, constraints) {
final itemCount = enabledItems.length;
// Tab 较少时收缩整体宽度并居中,Tab 多时铺满可用宽度
const double preferredTabWidth = 84;
const double barPaddingH = 6;
final double maxBarWidth = constraints.maxWidth;
final double barWidth =
itemCount * preferredTabWidth < maxBarWidth
? itemCount * preferredTabWidth
: maxBarWidth;
// 3 个及以上 Tab 直接铺满可用宽度:每格自然等分(3 个时约 108/格),
// 不会像固定 84/格 那样缩成一小段胶囊;
// 只有 2 个 Tab(如个人角色:设备 + 我的)才收窄居中,避免太空旷
final double barWidth = itemCount >= 3
? maxBarWidth
: (itemCount * 116 < maxBarWidth
? itemCount * 116
: maxBarWidth);
final double tabWidth =
(barWidth - barPaddingH * 2) / itemCount;
// 选中高亮:包裹「图标 + 文字」的紧凑胶囊 chip
const double indicatorH = 46;
// 上限放到 68:3 个 Tab 时每格约 108,胶囊跟着变宽才不显巴掌小;
// 仍保留 tabWidth - 8 的下限,多 Tab 时不会溢出格子
final double indicatorW =
tabWidth - 8 < 54 ? tabWidth - 8 : 54.0;
tabWidth - 8 < 68 ? tabWidth - 8 : 68.0;
// 用 Align + heightFactor 只水平居中,高度贴合内容;
// 切勿用 Center:它在底部栏有界高度约束下会撑满全屏,把 body 挤没
return Align(
alignment: Alignment.center,
heightFactor: 1.0,
// 底栏不填底、不投外阴影,只留一圈淡蓝细边:
// 能看出它自己是个独立的小胶囊,但不会变成一个「盒子」
child: Container(
width: barWidth,
padding: const EdgeInsets.symmetric(
horizontal: barPaddingH,
vertical: 2,
),
decoration: BoxDecoration(
color: context.appColors.cardBackground,
borderRadius: BorderRadius.circular(30),
border: Border.all(
color: context.appColors.divider,
width: 1,
),
boxShadow: [
BoxShadow(
color: context.appColors.cardShadow,
blurRadius: 12,
offset: const Offset(0, 4),
color: context.appColors.primary.withValues(
alpha: 0.18,
),
],
),
),
child: SizedBox(
height: 56,
child: Stack(
children: [
// 蓝色胶囊 chip:纯数学定位,居中包裹图标 + 文字
AnimatedPositioned(
duration: const Duration(milliseconds: 280),
curve: Curves.easeOutCubic,
left: _currentIndex * tabWidth +
(tabWidth - indicatorW) / 2,
top: (56 - indicatorH) / 2,
width: indicatorW,
height: indicatorH,
child: Container(
decoration: BoxDecoration(
color: context.appColors.primary.withOpacity(
0.12,
),
borderRadius: BorderRadius.circular(
indicatorH / 2,
),
),
),
),
// Tab 项
Row(
children:
enabledItems.asMap().entries.map((entry) {
final index = entry.key;
final item = entry.value;
final isSelected = _currentIndex == index;
return Expanded(
child: InkWell(
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: barPaddingH,
vertical: 2,
),
child: SizedBox(
height: 56,
child: Stack(
children: [
// 蓝色胶囊 chip:纯数学定位,居中包裹图标 + 文字
AnimatedPositioned(
duration: const Duration(milliseconds: 280),
curve: Curves.easeOutCubic,
left: _currentIndex * tabWidth +
(tabWidth - indicatorW) / 2,
top: (56 - indicatorH) / 2,
width: indicatorW,
height: indicatorH,
child: Container(
decoration: BoxDecoration(
color: context.appColors.primary
.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(
indicatorH / 2,
),
onTap: () => _onTabChanged(index),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
AnimatedScale(
scale: isSelected ? 1.1 : 1.0,
duration: const Duration(
milliseconds: 200,
),
curve: Curves.easeOutBack,
child: Icon(
_navIcon(item.icon, isSelected),
size: 22,
color: isSelected
? context.appColors.primary
: context
.appColors.textTertiary,
),
),
const SizedBox(height: 2),
AnimatedDefaultTextStyle(
duration: const Duration(
milliseconds: 200,
),
style: TextStyle(
fontSize: 11,
height: 1.0,
color: isSelected
? context.appColors.primary
: context
.appColors.textTertiary,
fontWeight: isSelected
? FontWeight.w600
: FontWeight.w400,
),
child: Text(
// 按当前语言取 Tab 名:en 用 nameEn,其余用 name
// 通过 Localizations.localeOf 注册依赖,语言切换时底部导航随之重建
Localizations.localeOf(
context,
).languageCode ==
'en'
? item.nameEn
: item.name,
),
),
],
),
// 只给选中胶囊一层轻投影,让它自己浮起来
boxShadow: [
BoxShadow(
color: context.appColors.primary
.withValues(alpha: 0.18),
blurRadius: 12,
offset: const Offset(0, 4),
),
],
),
);
}).toList(),
),
],
),
),
// Tab 项
Row(
children:
enabledItems.asMap().entries.map((entry) {
final index = entry.key;
final item = entry.value;
final isSelected = _currentIndex == index;
return Expanded(
child: InkWell(
borderRadius: BorderRadius.circular(
indicatorH / 2,
),
onTap: () => _onTabChanged(index),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
AnimatedScale(
scale: isSelected ? 1.1 : 1.0,
duration: const Duration(
milliseconds: 200,
),
curve: Curves.easeOutBack,
child: Icon(
_navIcon(item.icon, isSelected),
size: 22,
color: isSelected
? context.appColors.primary
: context
.appColors.textTertiary,
),
),
const SizedBox(height: 2),
AnimatedDefaultTextStyle(
duration: const Duration(
milliseconds: 200,
),
style: TextStyle(
fontSize: 11,
height: 1.0,
color: isSelected
? context.appColors.primary
: context
.appColors.textTertiary,
fontWeight: isSelected
? FontWeight.w600
: FontWeight.w400,
),
child: Text(
// 按当前语言取 Tab 名:en 用 nameEn,其余用 name
// 通过 Localizations.localeOf 注册依赖,语言切换时底部导航随之重建
Localizations.localeOf(
context,
).languageCode ==
'en'
? item.nameEn
: item.name,
),
),
],
),
),
);
}).toList(),
),
],
),
),
),
),