重整多余的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

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
// import 'package:maibu_satabot_v2/components/app_logo.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
import '../../../../../core/di/injection.dart';
@@ -40,6 +41,7 @@ import 'bind_device_page_v2.dart';
import 'no_device_page_v2.dart';
import 'package:maibu_satabot_v2/components/capsule_toast.dart';
import '../widgets/device_card_v2.dart';
import '../widgets/overview_device_telemetry.dart';
import '../widgets/rename_device_dialog.dart';
import 'package:maibu_satabot_v2/features/pv_control/presentation/widgets/pv_work_map.dart';
import '../../data/models/robot_data_model.dart';
@@ -57,7 +59,9 @@ import 'package:get_it/get_it.dart';
/// 卡片点击跳转、蓝牙连接流程等逻辑与旧页逐行一致,仅替换视觉层;
/// 旧页保留可随时回退(main_wrapper 切回 DeviceStatusPage 即可)。
class DeviceStatusPageV2 extends StatelessWidget {
const DeviceStatusPageV2({super.key});
const DeviceStatusPageV2({super.key, this.isActive = true});
final bool isActive;
@override
Widget build(BuildContext context) {
@@ -74,14 +78,16 @@ class DeviceStatusPageV2 extends StatelessWidget {
// 设备改名:UI 只调 Cubit,不直接依赖 UseCase/DataSource
BlocProvider(create: (_) => sl<RenameDeviceCubit>()),
],
child: const DeviceStatusViewV2(),
child: DeviceStatusViewV2(isActive: isActive),
);
}
}
/// 设备状态视图 V2
class DeviceStatusViewV2 extends StatefulWidget {
const DeviceStatusViewV2({super.key});
const DeviceStatusViewV2({super.key, this.isActive = true});
final bool isActive;
@override
State<DeviceStatusViewV2> createState() => _DeviceStatusViewV2State();
@@ -89,6 +95,8 @@ class DeviceStatusViewV2 extends StatefulWidget {
class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
final _searchController = TextEditingController();
final _v2SearchController = TextEditingController();
final _v2SearchFocus = FocusNode();
/// 🔥 监听电站切换:只要电站发生变化,就根据当前选中的标签栏自动刷新对应接口
StreamSubscription<SiteState>? _siteSub;
@@ -138,6 +146,8 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
void dispose() {
_siteSub?.cancel();
_searchController.dispose();
_v2SearchController.dispose();
_v2SearchFocus.dispose();
super.dispose();
}
@@ -462,7 +472,7 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
final offlineCount = items
.where((e) => e.status == DeviceV2Status.offline)
.length;
final visible = switch (_statusFilter) {
final statusMatches = switch (_statusFilter) {
'online' =>
items.where((e) => e.status != DeviceV2Status.offline).toList(),
'working' =>
@@ -471,6 +481,10 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
items.where((e) => e.status == DeviceV2Status.offline).toList(),
_ => items,
};
final query = _v2SearchController.text.trim().toLowerCase();
final visible = query.isEmpty
? statusMatches
: statusMatches.where((item) => item.matchesSearch(query)).toList();
// 集中概览模式:统计卡 + 设备分布地图 + 复用状态药丸 + 设备表格
if (_viewMode == 'overview') {
@@ -506,7 +520,7 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
// 搜索框 + 状态药丸用 SliverPersistentHeader 吸顶
child: RefreshIndicator(
color: _v2Blue,
edgeOffset: _v2PinnedExtentCard,
edgeOffset: _v2PinnedFilterExtent,
onRefresh: () async {
// 与旧「全部」下拉刷新一致:统计 + 两个列表一起重拉
context.read<DeviceListBloc.DeviceStatusBloc>().add(
@@ -516,6 +530,8 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
},
child: CustomScrollView(
physics: const AlwaysScrollableScrollPhysics(),
keyboardDismissBehavior:
ScrollViewKeyboardDismissBehavior.onDrag,
slivers: [
SliverToBoxAdapter(
child: Column(
@@ -527,22 +543,11 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
],
),
),
SliverPersistentHeader(
pinned: true,
delegate: _V2PinnedHeaderDelegate(
extent: _v2PinnedExtentCard,
child: Column(
children: [
_buildV2SearchBox(),
_buildStatusPills(
items.length,
onlineCount,
workingCount,
offlineCount,
),
],
),
),
_buildV2Filters(
items.length,
onlineCount,
workingCount,
offlineCount,
),
if (stillLoading)
const SliverToBoxAdapter(
@@ -791,22 +796,19 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
}
}
// ===== V2 顶栏:logo + 铃铛/蓝色⊕(与无设备页同款) =====
// ===== V2 顶栏:添加设备按钮(与无设备页同款) =====
Widget _buildV2TopBar(BuildContext context) {
return Padding(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Image.asset(
'assets/images/me_left_logo.png',
height: 44,
fit: BoxFit.contain,
),
// const AppLogo(size: 44), // 暂时隐藏设备页左上角 Logo。
const Spacer(),
Row(
children: [
_buildV2TopIconButton(Icons.notifications_none, onTap: _v2Todo),
const SizedBox(width: 10),
// 上架版隐藏消息入口,接入真实通知后恢复。
// _buildV2TopIconButton(Icons.notifications_none, onTap: _v2Todo),
// const SizedBox(width: 10),
_buildV2TopIconButton(
Icons.add,
onTap: () => _showV2AddSheet(context),
@@ -1102,33 +1104,88 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
);
}
// ===== 搜索框:纯展示。后端设备列表缺对应字段,暂不接搜索 =====
Widget _buildV2Filters(int all, int online, int working, int offline) {
return SliverPersistentHeader(
pinned: true,
delegate: _V2PinnedHeaderDelegate(
extent: _v2PinnedFilterExtent,
child: Column(
children: [
_buildV2SearchBox(),
_buildStatusPills(all, online, working, offline),
],
),
),
);
}
Widget _buildV2SearchBox() {
final hint = AppLocalizations.of(
context,
).translate('device_list_v2.search_hint_full');
return Padding(
padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),
child: IgnorePointer(
child: Container(
height: 44,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(14),
border: Border.all(color: _v2Border),
),
child: Row(
children: [
const SizedBox(width: 14),
const Icon(Icons.search, size: 20, color: Color(0xFFC9CDD4)),
const SizedBox(width: 10),
Text(
AppLocalizations.of(
context,
).translate('device_list_v2.search_hint_full'),
style: const TextStyle(
fontSize: 14,
color: Color(0xFFB9C2CF),
child: TextFieldTapRegion(
child: GestureDetector(
onTap: _v2SearchFocus.requestFocus,
child: Container(
height: 44,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(14),
border: Border.all(color: _v2Border),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(width: 14),
const Icon(Icons.search, size: 20, color: Color(0xFFC9CDD4)),
const SizedBox(width: 10),
Expanded(
child: Stack(
alignment: Alignment.centerLeft,
children: [
Semantics(
label: hint,
child: TextField(
controller: _v2SearchController,
focusNode: _v2SearchFocus,
textInputAction: TextInputAction.search,
style: const TextStyle(fontSize: 14, color: _v2Navy),
cursorColor: _v2Blue,
onChanged: (_) => setState(() {}),
decoration: null,
),
),
if (_v2SearchController.text.isEmpty)
IgnorePointer(
child: ExcludeSemantics(
child: Text(
hint,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 14,
color: Color(0xFFB9C2CF),
),
),
),
),
],
),
),
),
],
if (_v2SearchController.text.isNotEmpty)
IconButton(
tooltip: MaterialLocalizations.of(
context,
).clearButtonTooltip,
icon: const Icon(Icons.close, size: 18, color: _v2Gray),
onPressed: () => setState(_v2SearchController.clear),
)
else
const SizedBox(width: 14),
],
),
),
),
),
@@ -1212,9 +1269,11 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
children: [
_buildOverviewAppBar(),
Expanded(
// 与卡片视图同口径:标题/视图切换随内容滚走,状态药丸吸顶
// 标题和视图切换随内容滚动,搜索和状态筛选吸顶。
child: CustomScrollView(
physics: const AlwaysScrollableScrollPhysics(),
keyboardDismissBehavior:
ScrollViewKeyboardDismissBehavior.onDrag,
slivers: [
SliverToBoxAdapter(
child: Column(
@@ -1224,17 +1283,11 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
],
),
),
SliverPersistentHeader(
pinned: true,
delegate: _V2PinnedHeaderDelegate(
extent: _v2PinnedExtentPills,
child: _buildStatusPills(
all,
onlineCount,
workingCount,
offlineCount,
),
),
_buildV2Filters(
all,
onlineCount,
workingCount,
offlineCount,
),
SliverToBoxAdapter(
child: Padding(
@@ -1328,7 +1381,7 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
);
}
/// 四张统计卡:设备总数 / 在线设备 / 作业中 / 告警离线
/// 四张统计卡:设备总数 / 在线设备 / 作业中 / 离线
Widget _buildStatCards(int all, int online, int working, int offline) {
final l10n = AppLocalizations.of(context);
final stats = [
@@ -1346,10 +1399,10 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
l10n.translate('device_list_v2.stat_working'),
),
(
Icons.warning_amber_rounded,
const Color(0xFFE5484D),
Icons.link_off,
const Color(0xFF6B7280),
offline,
l10n.translate('device_list_v2.stat_alarm_offline'),
l10n.translate('device_list_v2.offline'),
),
];
return Row(
@@ -1494,7 +1547,7 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
child: Text(
AppLocalizations.of(
context,
).translate('device_list_v2.th_location_task'),
).translate('device_detail_v2.stat_control_mode'),
style: const TextStyle(fontSize: 12, color: _v2Gray),
),
),
@@ -1567,31 +1620,7 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
),
),
Expanded(flex: 3, child: _buildOverviewBadge(e.status)),
Expanded(
flex: 2,
child: Text(
_buildOverviewBattery(e),
style: const TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: _v2Navy,
),
),
),
Expanded(
flex: 4,
child: Text(
e.robot != null
? '${DeviceV2Display.locationOf(e.snKey, AppLocalizations.of(context))} · ${e.robot!.task}'
: DeviceV2Display.locationOf(
e.snKey,
AppLocalizations.of(context),
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontSize: 11, color: _v2Gray),
),
),
Expanded(flex: 6, child: _buildOverviewTelemetry(e)),
const Icon(Icons.chevron_right, size: 18, color: Color(0xFFC9CDD4)),
],
),
@@ -1648,10 +1677,18 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
);
}
String _buildOverviewBattery(_V2DeviceItem e) {
final b = e.battery;
if (e.status == DeviceV2Status.offline || b == null) return '—';
return '$b%';
Widget _buildOverviewTelemetry(_V2DeviceItem e) {
final sn = e.robot?.name.trim();
final online = e.status != DeviceV2Status.offline;
final battery = e.battery;
return OverviewDeviceTelemetry(
deviceSn: widget.isActive && online && sn != null && sn.isNotEmpty
? sn
: null,
batteryFallback: e.robot != null
? '--'
: (battery == null ? '—' : '$battery%'),
);
}
/// 行内设备缩略图:蓝渐变底 + logo;离线置灰
@@ -3160,12 +3197,8 @@ class _DeviceStatusViewV2State extends State<DeviceStatusViewV2> {
}
}
/// V2 卡片列表的统一展示项:机器人 / 无人机机场二选一
/// 吸顶过滤栏高度:卡片视图 = 搜索框(56) + 状态药丸(42)
const double _v2PinnedExtentCard = 98;
/// 吸顶过滤栏高度:集中概览视图 = 状态药丸(42)
const double _v2PinnedExtentPills = 42;
/// 吸顶过滤栏高度 = 搜索框(56) + 状态药丸(42)
const double _v2PinnedFilterExtent = 98;
/// 吸顶过滤栏:滚动压过内容时平滑补上底色与阴影,避免卡片从下方穿帮
class _V2PinnedHeaderDelegate extends SliverPersistentHeaderDelegate {
@@ -3237,4 +3270,19 @@ class _V2DeviceItem {
final int? battery;
final RobotDataModel? robot;
final DroneStationEntity? station;
bool matchesSearch(String query) {
final fields = [
name,
modelText,
snKey,
robot?.name,
robot?.productName,
robot?.productModel,
station?.deviceSn,
];
return fields.whereType<String>().any(
(field) => field.toLowerCase().contains(query),
);
}
}

View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:get_it/get_it.dart';
// import 'package:maibu_satabot_v2/components/app_logo.dart';
import 'package:maibu_satabot_v2/components/capsule_toast.dart';
import 'package:maibu_satabot_v2/core/app/app_user_cubit.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
@@ -19,7 +20,7 @@ import 'qr_scanner_page_v2.dart';
/// DeviceStatusLoaded 且 devices 为空时,由 DeviceStatusView 整页切换到本页。
///
/// 说明:
/// - 顶栏按设计稿换新:SATA logo + 铃铛/⊕ 白底按钮;
/// - 顶栏右侧提供添加设备按钮;
/// - 右上角按钮下方小字「(场站名)」为切换场站入口,个人角色追加「个人账号」说明;
/// - 「添加机器人」与卡片蓝色 ⊕ 均弹出底部添加弹窗,内部各项保持原跳转;
/// - 「新手入门」三条二级内容未开发,统一 Toast 提示;
@@ -141,24 +142,20 @@ class NoDevicePageV2 extends StatelessWidget {
);
}
// ===== 顶栏:logo + 铃铛/⊕(设计稿新样式) =====
// ===== 顶栏:添加设备按钮 =====
Widget _buildTopBar(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Image.asset(
'assets/images/me_left_logo.png',
height: 44,
fit: BoxFit.contain,
),
// const AppLogo(size: 44), // 暂时隐藏设备页左上角 Logo。
const Spacer(),
Row(
children: [
_buildTopIconButton(
Icons.notifications_none,
onTap: () => _todoTap(context),
),
const SizedBox(width: 10),
// 设计稿:右上角 ⊕ 是蓝底白号主色按钮,与铃铛的白底按钮区分
// 上架版隐藏消息入口,接入真实通知后恢复。
// _buildTopIconButton(
// Icons.notifications_none,
// onTap: () => _todoTap(context),
// ),
// const SizedBox(width: 10),
_buildTopIconButton(
Icons.add,
onTap: () => _showAddSheet(context),

View File

@@ -24,7 +24,7 @@ class RobotFullInfoPageV2 extends StatelessWidget {
static const Color _cardBorder = Color(0xFFE5EDF7);
static const Color _green = Color(0xFF2FBF6B);
static const Color _greenBg = Color(0xFFE5F8EC);
static const Color _statBg = Color(0xFFEAF3FE);
// static const Color _statBg = Color(0xFFEAF3FE); // 运行与控制信息。
static const Color _divider = Color(0xFFF0F4FA);
static const String _robotImage = 'assets/images/robot_logo_login.png';
@@ -53,12 +53,22 @@ class RobotFullInfoPageV2 extends StatelessWidget {
.replaceFirst('%s', sn.substring(sn.length - 2));
}
/*
/// 电量:0 视为未上报
String get _batteryText {
final b = robot.battery;
if (b <= 0) return '--';
return '${b.round()}%';
}
*/
String get _deviceTypeText {
final types = {
robot.deviceTypeName?.trim() ?? '',
robot.deviceType?.trim() ?? '',
}..remove('');
return types.isEmpty ? '--' : types.join(' · ');
}
/// 运行模式:任务字段为“无/空”时按待机展示(返回空串表示待机)
String get _modeText {
@@ -108,12 +118,15 @@ class RobotFullInfoPageV2 extends StatelessWidget {
),
const SizedBox(height: 10),
_buildProfileCard(l10n),
// 上架版暂时隐藏运行与控制信息。
/*
const SizedBox(height: 18),
_buildSectionTitle(
l10n.translate('robot_full_info_v2.sec_runtime'),
),
const SizedBox(height: 10),
_buildRuntimeCard(l10n),
*/
const SizedBox(height: 14),
Center(
child: Text(
@@ -339,22 +352,27 @@ class RobotFullInfoPageV2 extends StatelessWidget {
),
_buildInfoRow(
l10n.translate('robot_full_info_v2.row_type'),
l10n.translate('robot_full_info_v2.val_type'),
_deviceTypeText,
),
_buildInfoRow(
l10n.translate('robot_full_info_v2.row_power'),
l10n.translate('robot_full_info_v2.val_power'),
isLast: true,
),
// 上架版暂时隐藏最近上报。
/*
_buildInfoRow(
l10n.translate('robot_full_info_v2.row_report'),
l10n.translate('robot_full_info_v2.val_report'),
isLast: true,
),
*/
],
),
);
}
/*
// ===== 运行与控制卡 =====
Widget _buildRuntimeCard(AppLocalizations l10n) {
return Container(
@@ -448,6 +466,7 @@ class RobotFullInfoPageV2 extends StatelessWidget {
),
);
}
*/
// ===== 通用信息行:左标签 / 右值 =====
Widget _buildInfoRow(