作业首页和机器状态的数据

This commit is contained in:
2026-11-06 08:41:44 +08:00
parent d882db7995
commit 85c83ec143
41 changed files with 3702 additions and 656 deletions

View File

@@ -6,12 +6,15 @@ import 'package:flutter/foundation.dart';
@immutable
class PvTelemetry {
const PvTelemetry({
this.deviceName = '光伏巡检机器人',
// 设备名占位留空:实际名称由页面注入(见 PvControlPage._resolveTelemetry),
// 避免写死中文在英文环境下露出来
this.deviceName = '',
this.serialNumber = 'PV-RB-001',
this.isOnline = true,
this.battery,
this.isAutoDriving = true,
this.taskStatus = '巡检任务进行中',
// 默认留空:具体文案由 UI 层按当前语言兜底(见 PvInfoColumn)
this.taskStatus = '',
this.speed = 0.3,
this.mileage,
this.networkNormal = true,

View File

@@ -1,4 +1,6 @@
import 'dart:async';
import 'package:maibu_satabot_v2/features/device_control_mode/domain/entities/device_control_mode.dart';
import 'package:maibu_satabot_v2/features/device_control_mode/presentation/widgets/control_mode_entry_gate.dart';
import 'dart:io';
import 'dart:ui' as ui;
@@ -21,6 +23,7 @@ import 'package:maibu_satabot_v2/features/remote_control/presentation/bloc/remot
import 'package:maibu_satabot_v2/features/v2/local_camera/presentation/cubit/local_camera_cubit.dart';
import 'package:maibu_satabot_v2/features/v2/usb_camera/data/uvc_camera_service.dart';
import 'package:maibu_satabot_v2/features/v2/usb_camera/presentation/cubit/usb_camera_cubit.dart';
import 'package:maibu_satabot_v2/features/v2/device_list/domain/usecases/search_device_usecase.dart';
import '../models/pv_telemetry.dart';
import '../channel/pv_robot_command_channel.dart';
@@ -48,6 +51,7 @@ class PvControlPage extends StatefulWidget {
required this.deviceId,
this.deviceName,
this.initialMode = PvViewMode.normal,
this.initialShowJoysticks = true,
});
final String deviceId;
@@ -57,6 +61,11 @@ class PvControlPage extends StatefulWidget {
/// [PvViewMode.manualControl],进页直接是手动控制 HUD(不再经过大屏)。
final PvViewMode initialMode;
/// 进页时是否显示全屏 HUD 的两侧方向摇杆(默认显示)。
/// 从「进入实时视频」那条链路(先看画面再转遥控)进来时传 false,
/// 摇杆默认收起,用户在设置里需要时再手动打开。
final bool initialShowJoysticks;
@override
State<PvControlPage> createState() => _PvControlPageState();
}
@@ -75,6 +84,15 @@ class _PvControlPageState extends State<PvControlPage> {
/// 控制态是否已激活:进入「手动控制」才 activate,退出 / 页面销毁 deactivate。
bool _controlActive = false;
/// deactivate 是否正在进行中(内部含 await 归零全停 + HTTP 释放,约 0.5~1s)。
/// 🔥 这段时间里若用户立刻重新点「手动控制」,不能马上 activate:
/// 尾部那次 stopControlLoop() 会把刚起来的循环又关掉,HUD 就变成
/// “摇杆推了没反应”。故延后到 deactivate 收尾再起循环。
bool _deactivating = false;
/// deactivate 期间收到过重新进入控制态的请求。
bool _restartAfterDeactivate = false;
/// 急停开关态:HUD 急停钮每点一次翻转,经通道下发 updateEmergency。
bool _emergencyOn = false;
@@ -107,12 +125,32 @@ class _PvControlPageState extends State<PvControlPage> {
/// 模拟开关(真实推送未接入前在设置面板手动触发)。
bool _simObstacle = false;
bool _simReverse = false;
/// 「倒车影像」:控制手动控制主画面中间那组导向路径 + 黄色/绿色车道线
/// (带流动箭头)的显隐,同时决定左下后视卡是否叠倒车引导线。
/// 默认开启 = 保持原有视觉;关掉后画面回到干净视频。
bool _simReverse = true;
/// 是否显示手动控制 HUD 的左右两个方向摇杆(设置面板可关掉):
/// 关掉后摇杆与回中按钮一起隐藏,底部操作条自动向两侧展开。
/// 初始值由入口决定([PvControlPage.initialShowJoysticks])。
late bool _showJoysticks = widget.initialShowJoysticks;
/// 当前控制设备名:优先用页面入参(就是入口点选的那台,带别名),
/// 缺失时回退 RemoteControlCubit 的 targetDevice,都没有则显示占位。
String _resolveDeviceName(RemoteControlState? remote) {
final passed = (widget.deviceName ?? '').trim();
if (passed.isNotEmpty) return passed;
final target = (remote?.targetDevice?.deviceName ?? '').trim();
return target.isNotEmpty
? target
: AppLocalizations.of(context).translate('pv_control.no_device');
}
/// 实际下发的遥测:真实字段来自全局 [DeviceStatusBloc] 的 host 实时数据
/// (电量/巡检里程/设备温度),未收到时置 null 由 UI 显示"未知";
/// 开启「模拟障碍物信息」相当于收到机器告警推送,叠加 obstacleAlert。
PvTelemetry _resolveTelemetry(DeviceStatusState dsState) {
PvTelemetry _resolveTelemetry(DeviceStatusState dsState, String deviceName) {
double? battery;
double? mileage;
double? temp;
@@ -135,6 +173,8 @@ class _PvControlPageState extends State<PvControlPage> {
}
}
return _telemetry.copyWith(
// 设备名用真实选中的设备,不再用 PvTelemetry 里写死的占位名
deviceName: deviceName,
obstacleAlert: _simObstacle,
battery: battery,
mileage: mileage,
@@ -155,8 +195,7 @@ class _PvControlPageState extends State<PvControlPage> {
sl<AuthCubit>().enterSafeMode();
// 监听「权限交接」:其它端请求控制权时弹确认框,整页生命周期常驻。
_initPermissionHandoverListener();
// 进页面即建立控制会话:查询权限 + 启动控制循环(等价远程遥控页进页行为)。
WidgetsBinding.instance.addPostFrameCallback((_) => _startControl());
// 控制会话由模式确认完成后的回调建立。
}
/// 本页的视频、地图、遥测都是围绕 `deviceId` 这一台设备,所以进页时确保
@@ -219,12 +258,51 @@ class _PvControlPageState extends State<PvControlPage> {
void _onManualControl() {
setState(() => _mode = PvViewMode.manualControl);
// 🔥 折叠会退出控制态(见 _onCollapseManual),重新进 HUD 必须重新进入:
// _startControl 有 _controlActive 幂等保护,首次进页(initState)重复调也不会起两份循环。
_startControl();
}
void _onCollapseManual() {
// 🔥 折叠 = 退出控制态,不只是一次归零:大屏上没有摇杆,却留着
// activate() 起着的 200ms 循环与控制权,既持续向设备发零速帧、又挤占
// 同一条 TCP 上的业务指令;而 HUD 被卸载那一瞬,摇杆的 onPanEnd /
// Listener.onPointerUp 三重兜底会随 State 一起消失,若另一只手仍按着
// 摇杆,轴值就残留在非零 —— 大屏上没东西可归零,相当于“一直走”。
// deactivate() 内部顺序已是:解除急停 → await 归零+全停 → 停循环 → 释放权限。
// 不弹 toast:折叠是常规视图切换,不是“退出遥控”,每次弹释放提示很噪。
_stopControl(notify: false);
setState(() => _mode = PvViewMode.normal);
}
/// 一键寻车:视频区 person_search 按钮,直连后端 searchDevice 接口。
///
/// deviceId 用 widget.deviceId(即设备编码 deviceName,MC700- 开头),
/// 不是 getSiteList 的数字主键;下发结果以胶囊 Toast 反馈。
Future<void> _onLocate() async {
final code = widget.deviceId.trim();
final tr = AppLocalizations.of(context);
if (code.isEmpty) {
CapsuleToast.show(
tr.translate('device_list_v2.fr_toast_start_failed'),
showCheck: false,
);
return;
}
final result = await sl<SearchDeviceUseCase>().execute(deviceCode: code);
if (!mounted) return;
result.fold(
(failure) => CapsuleToast.show(
failure.message.isEmpty
? tr.translate('device_list_v2.fr_toast_start_failed')
: failure.message,
showCheck: false,
),
(_) =>
CapsuleToast.show(tr.translate('device_list_v2.fr_toast_start_sent')),
);
}
void _onPauseTask() {
CapsuleToast.show(
AppLocalizations.of(context).translate('pv_control.toast_paused'),
@@ -248,10 +326,17 @@ class _PvControlPageState extends State<PvControlPage> {
/// 进入控制态:查询权限 + 启动控制循环(与远程遥控页生命周期一致)。
void _startControl() {
if (_controlActive) return;
if (_cubit.state.targetDevice == null) {
if (_cubit.state.targetDevice?.deviceName != widget.deviceId) {
debugPrint('❌ [PV遥控] targetDevice 为空,跳过控制循环与权限查询');
return;
}
// 🔥 上一轮折叠的 deactivate 还在收尾:先记需求,等它结束后再起循环,
// 否则会被它尾部的 stopControlLoop() 把新循环一并关掉。
if (_deactivating) {
_restartAfterDeactivate = true;
debugPrint('⚠️ [PV遥控] 退出控制态尚未完成,推迟进入控制态');
return;
}
_controlActive = true;
// deactivate 会清除急停态,重新进入从“未急停”开始,与通道保持同步。
_emergencyOn = false;
@@ -259,13 +344,25 @@ class _PvControlPageState extends State<PvControlPage> {
}
/// 退出控制态:归零、停循环、释放权限(通道内部完成,不阻塞 UI)。
void _stopControl() {
///
/// [notify] 是否弹“释放控制权”结果提示:退页(dispose)需要,
/// HUD 折叠回大屏属常规视图切换,不打扰。
void _stopControl({bool notify = true}) {
if (!_controlActive) return;
_controlActive = false;
_deactivating = true;
_restartAfterDeactivate = false;
// dispose 不能 await,fire-and-forget;拿到释放结果后弹与远程遥控页一致的提示
//(CapsuleToast 走根 Overlay,页面销毁瞬间也能显示);无设备未发起释放则不弹。
_channel.deactivate().then((released) {
if (released == null || !mounted) return;
// 🔥 收尾:先解除“正在退出”标记,若期间用户已重新进入 HUD 就补起一次控制态。
_deactivating = false;
if (_restartAfterDeactivate) {
_restartAfterDeactivate = false;
// 页面已销毁(退页与折叠竞态)时绝不能再起循环:那会留下一个无主的控制循环。
if (mounted) _startControl();
}
if (released == null || !mounted || !notify) return;
final tr = AppLocalizations.of(context);
CapsuleToast.show(
released
@@ -321,11 +418,10 @@ class _PvControlPageState extends State<PvControlPage> {
final requestingPlatform =
state.requestingPlatform ??
tr.translate('pv_control.perm_unknown_platform');
final dialogContent =
tr
.translate('pv_control.perm_request_body')
.replaceAll('{platform}', requestingPlatform)
.replaceAll('{deviceId}', requestingDeviceId);
final dialogContent = tr
.translate('pv_control.perm_request_body')
.replaceAll('{platform}', requestingPlatform)
.replaceAll('{deviceId}', requestingDeviceId);
final cubit = _cubit;
return showDialog<void>(
context: context,
@@ -451,6 +547,8 @@ class _PvControlPageState extends State<PvControlPage> {
backgroundColor: Colors.transparent,
// 面板内部自带 maxHeight + 滚动,这里放开模态默认高度限制
isScrollControlled: true,
// 横屏底部有手势条 / 虚拟键:避开安全区,否则最后一行会被压住
useSafeArea: true,
// 薄遮罩:能看见底下视频与告警/倒车效果的变化
barrierColor: Colors.black.withValues(alpha: 0.35),
builder: (_) {
@@ -470,10 +568,16 @@ class _PvControlPageState extends State<PvControlPage> {
videoFit: _videoFit,
simObstacle: _simObstacle,
simReverse: _simReverse,
showJoysticks: _showJoysticks,
onVideoSourceChanged: (v) => update(() => _videoSource = v),
onVideoFitChanged: (v) => update(() => _videoFit = v),
onSimObstacleChanged: (v) => update(() => _simObstacle = v),
onSimReverseChanged: (v) => update(() => _simReverse = v),
// 倒车影像:不靠面板回传的 value 取反(面板是独立 Route,
// value 可能是上一帧的旧值,会导致点了“关”实际又传回 true),
// 直接按页面当前状态取反,保证每次点击一定翻转。
onSimReverseChanged: (_) =>
update(() => _simReverse = !_simReverse),
onShowJoysticksChanged: (v) => update(() => _showJoysticks = v),
);
},
);
@@ -498,7 +602,9 @@ class _PvControlPageState extends State<PvControlPage> {
if (!mounted) return;
if (path != null) {
CapsuleToast.show(
AppLocalizations.of(context).translate('pv_control.toast_screenshot_saved'),
AppLocalizations.of(
context,
).translate('pv_control.toast_screenshot_saved'),
);
}
// 截图后弹出预览
@@ -567,7 +673,16 @@ class _PvControlPageState extends State<PvControlPage> {
}
@override
Widget build(BuildContext context) {
Widget build(BuildContext context) => ControlModeEntryGate(
key: ValueKey('remote-mode/${widget.deviceId}'),
deviceId: widget.deviceId,
deviceName: widget.deviceName,
target: ControlModeTarget.remote,
onReady: _startControl,
child: _buildPage(context),
);
Widget _buildPage(BuildContext context) {
return Scaffold(
backgroundColor: PvColors.bgDeepest,
body: DecoratedBox(
@@ -578,23 +693,33 @@ class _PvControlPageState extends State<PvControlPage> {
left: false,
right: false,
child: _wrapVideoProvider(
BlocBuilder<DeviceStatusBloc, DeviceStatusState>(
builder: (context, dsState) {
final telemetry = _resolveTelemetry(dsState);
return _mode == PvViewMode.manualControl
? PvManualControlView(
streamUrl: _streamUrl,
telemetry: telemetry,
onCollapse: _onCollapseManual,
onEmergencyStop: _onEmergencyStop,
videoSource: _videoSource,
videoFit: _videoFit,
simReverse: _simReverse,
deviceSn: widget.deviceId,
onSettings: _openSettings,
channel: _channel,
)
: _buildNormalLayout(telemetry);
StreamBuilder<RemoteControlState>(
initialData: _cubit.state,
stream: _cubit.stream,
builder: (context, remoteSnap) {
// 当前选中的设备名(顶栏 / 信息卡 / HUD 同源)
final deviceName = _resolveDeviceName(remoteSnap.data);
return BlocBuilder<DeviceStatusBloc, DeviceStatusState>(
builder: (context, dsState) {
final telemetry = _resolveTelemetry(dsState, deviceName);
return _mode == PvViewMode.manualControl
? PvManualControlView(
streamUrl: _streamUrl,
telemetry: telemetry,
onCollapse: _onCollapseManual,
onEmergencyStop: _onEmergencyStop,
videoSource: _videoSource,
videoFit: _videoFit,
simReverse: _simReverse,
showJoysticks: _showJoysticks,
deviceSn: widget.deviceId,
deviceName: deviceName,
onSettings: _openSettings,
channel: _channel,
)
: _buildNormalLayout(telemetry, deviceName);
},
);
},
),
),
@@ -603,7 +728,7 @@ class _PvControlPageState extends State<PvControlPage> {
);
}
Widget _buildNormalLayout(PvTelemetry telemetry) {
Widget _buildNormalLayout(PvTelemetry telemetry, String deviceName) {
// ===== 三行高度比例:顶部导航 : 第一行(视频+右列) : 第二行(控制栏) =====
// 三行高度比例:顶部导航 : 第一行 : 第二行。Expanded 的 flex 只能是整数,
// 这里写成 2 : 14 : 6(即 1 : 7 : 3)。第二行比 2.5 份再多一点,
@@ -618,6 +743,7 @@ class _PvControlPageState extends State<PvControlPage> {
Expanded(
flex: navFlex,
child: _PvTopNav(
deviceName: deviceName,
onBack: () => Navigator.of(context).pop(),
onSettings: _openSettings,
),
@@ -646,6 +772,7 @@ class _PvControlPageState extends State<PvControlPage> {
telemetry: telemetry,
onScreenshot: _onScreenshot,
onFullscreen: _onManualControl,
onLocate: _onLocate,
videoSource: _videoSource,
videoFit: _videoFit,
),
@@ -687,7 +814,14 @@ class _PvControlPageState extends State<PvControlPage> {
/// 顶部导航栏:左侧返回、中间标题/副标题、右侧设置与更多
class _PvTopNav extends StatelessWidget {
const _PvTopNav({required this.onBack, required this.onSettings});
const _PvTopNav({
required this.deviceName,
required this.onBack,
required this.onSettings,
});
/// 当前选中的设备名(副标题位置展示)
final String deviceName;
final VoidCallback onBack;
final VoidCallback onSettings;
@@ -719,9 +853,10 @@ class _PvTopNav extends StatelessWidget {
style: PvType.navTitle,
),
Text(
AppLocalizations.of(
context,
).translate('pv_control.pv_robot_remote_control'),
// 当前控制的是哪台设备(原先这里是写死的“光伏电站机器人远程遥控”)
deviceName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: PvType.navSubtitle,
),
],
@@ -779,12 +914,9 @@ class _ScreenshotPreviewDialog extends StatelessWidget {
if (path != null) ...[
const SizedBox(height: 10),
Text(
AppLocalizations.of(
context,
).translate('pv_control.screenshot_saved_path').replaceAll(
'{path}',
path!,
),
AppLocalizations.of(context)
.translate('pv_control.screenshot_saved_path')
.replaceAll('{path}', path!),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: PvType.label,
@@ -797,9 +929,7 @@ class _ScreenshotPreviewDialog extends StatelessWidget {
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(
AppLocalizations.of(
context,
).translate('pv_control.close'),
AppLocalizations.of(context).translate('pv_control.close'),
),
),
],

View File

@@ -253,7 +253,12 @@ class _DriveModeCard extends StatelessWidget {
),
const SizedBox(height: 1),
Text(
telemetry.taskStatus,
// 遥测未带任务状态时,UI 层用当前语言兜底
telemetry.taskStatus.isEmpty
? AppLocalizations.of(
context,
).translate('pv_control.task_patrol_running')
: telemetry.taskStatus,
style: const TextStyle(
color: PvColors.textSecondary,
fontSize: 10,

View File

@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:maibu_satabot_v2/components/capsule_toast.dart';
import 'package:maibu_satabot_v2/components/control_mode_text.dart';
import 'package:maibu_satabot_v2/core/di/injection.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/remote_control/domain/entities/reverse_camera_data.dart';
@@ -64,7 +65,9 @@ class PvManualControlView extends StatefulWidget {
this.videoSource = PvVideoSource.webrtc,
this.videoFit = PvVideoFit.contain,
this.simReverse = false,
this.showJoysticks = true,
this.deviceSn = '',
this.deviceName = '',
this.onSettings,
this.channel,
});
@@ -81,12 +84,20 @@ class PvManualControlView extends StatefulWidget {
/// 视频展示方式(设置面板可改):contain 完整显示 / cover 等比铺满(裁边)。
final PvVideoFit videoFit;
/// 倒车影像模拟开关(设置面板控制):开启后左栏后视卡叠加倒车引导线。
/// 「倒车影像」开关(设置面板控制):控制**主画面中间那组外黄内绿的车道线
/// 与流动导向箭头**([_buildArOverlay])的显隐,不控制左下角后视卡。
final bool simReverse;
/// 是否显示左右两个方向摇杆(设置面板控制):关闭后摇杆与回中按钮一起隐藏,
/// 底部操作条自动向两侧摊开,把画面完整让给视频。
final bool showJoysticks;
/// 设备 SN:HUD 地图按它过滤后端推送的规划路线(订阅切换由页面层负责)。
final String deviceSn;
/// 当前选中的设备名(顶栏展示,看清控制的是哪台设备)
final String deviceName;
/// 顶栏「设置」按钮回调(弹出设置面板)。
final VoidCallback? onSettings;
@@ -163,6 +174,13 @@ class _PvManualControlViewState extends State<PvManualControlView>
Offset? _leftPipPos;
Offset? _rightPipPos;
/// 上一次真正下发出去的双轴值:与旧版摇杆的 `_lastSentY` / `_lastX` 同一意图,
/// 值没变化就不重发。摇杆每移动一个 pointer 事件就回调一次,不去重会让
/// updateOriginX/Y 里的 emit 高频重建整棵 HUD(本页挂的是 StreamBuilder,
/// 没有旧版 BlocBuilder buildWhen 那层隔离,只能从源头少发)。
int _lastDriveY = 0;
int _lastDriveX = 0;
/// 折叠动画时长与曲线(两侧共用,保证节奏一致)。
static const Duration _foldDur = Duration(milliseconds: 280);
static const Curve _foldCurve = Curves.easeInOutCubic;
@@ -195,6 +213,20 @@ class _PvManualControlViewState extends State<PvManualControlView>
return '${two(n.hour)}:${two(n.minute)}:${two(n.second)}';
}
/// 摇杆被关掉的那一帧立刻停车:隐藏只是不画了,手指原来的按压/下发的
/// 方向指令不会自动停,必须显式发一次全停(同时把倒车引导线回正)。
@override
void didUpdateWidget(covariant PvManualControlView oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.showJoysticks && !widget.showJoysticks) {
// 归零后清掉去重基准:否则下次推到同一个值会被当成“没变化”吞掉。
_lastDriveY = 0;
_lastDriveX = 0;
unawaited(widget.channel?.stopAllMovement());
_steerDeg.value = 0;
}
}
/// 定位质量枚举→文案(与设备监控弹窗/蓝牙协议同一套 fix_status 语义)。
static String _qualText(int? q) => switch (q) {
null => 'pv_control.unknown',
@@ -209,12 +241,11 @@ class _PvManualControlViewState extends State<PvManualControlView>
_ => 'pv_control.unknown',
};
/// 控制模式→文案(与“设备数据监控” _getControlModeKey 同口径:3=远程,其余=本地)。
/// 控制模式→文案 key(统一走 lib/components/control_mode_text.dart)。
/// 此处原本已经能分辨「空 = 未知」,但数据层把「没给」的默认值写成了 '0',
/// 于是它永远拿不到空串;现在 0~4 按协议展开,非协议值一律未知。
static String _controlModeText(String? mode) {
if (mode == null || mode.isEmpty) return 'pv_control.unknown';
return int.tryParse(mode.trim()) == 3
? 'pv_control.mode_remote'
: 'pv_control.mode_local';
return controlModeKey(mode) ?? 'pv_control.unknown';
}
@override
@@ -317,15 +348,18 @@ class _PvManualControlViewState extends State<PvManualControlView>
fit: StackFit.expand,
children: [
// 导向路径 + 车道线(箭头随 _flow 递进流动;整条脊柱随右摇杆转向弯曲)
ValueListenableBuilder<double>(
valueListenable: _steerDeg,
builder: (context, deg, _) => AnimatedBuilder(
animation: _flow,
builder: (context, _) => CustomPaint(
painter: _PvArPainter(progress: _flow.value, steering: deg),
// 由设置面板「倒车影像」开关控制:关掉后主画面中间这组黄色/绿色
// 引导线与流动箭头一起隐藏,画面回到干净的视频。
if (widget.simReverse)
ValueListenableBuilder<double>(
valueListenable: _steerDeg,
builder: (context, deg, _) => AnimatedBuilder(
animation: _flow,
builder: (context, _) => CustomPaint(
painter: _PvArPainter(progress: _flow.value, steering: deg),
),
),
),
),
// 障碍物告警成套效果:收到机器推送(或设置面板模拟开启)时,
// 屏幕泛红呼吸 + 障碍框×2 + 预警横幅**同时**出现,同一 obstacleAlert 驱动。
if (widget.telemetry.obstacleAlert) ...[
@@ -560,6 +594,22 @@ class _PvManualControlViewState extends State<PvManualControlView>
18,
).copyWith(color: PvHudColors.textPrimary),
),
if (widget.deviceName.isNotEmpty) ...[
SizedBox(width: d(8)),
// 当前控制设备名:只展示不参与操作,过长省略不挤占其他胶囊
ConstrainedBox(
constraints: BoxConstraints(maxWidth: d(160)),
child: Text(
widget.deviceName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: s(
PvHudType.value,
12,
).copyWith(color: PvHudColors.textSecondary),
),
),
],
SizedBox(width: d(8)),
_onlineBadge(),
SizedBox(width: d(8)),
@@ -1094,29 +1144,29 @@ class _PvManualControlViewState extends State<PvManualControlView>
}
/// 左下后视图卡:标题与全屏按钮都浮在画面之上;高度由左栏列表项给定。
///
/// 注意:设置面板里的「倒车影像」开关**不控制这张卡**,它管的是主画面中间
/// 那组黄/绿车道线与流动箭头(见 [_buildArOverlay])。后视卡保持稳定的
/// 后视形态常驻,避免一次点击同时改两处、看起来像“开关失灵”。
Widget _rearCard() {
final tr = AppLocalizations.of(context);
return PvRearViewCard(
scale: _sc,
// 倒车影像:设置面板开启后叠加引导线;弯曲实时跟右摇杆转向。
// 后视引导线弯曲实时跟右摇杆转向。
// 未来接入下位机后,ReverseCameraData 的 gear/steeringAngle/
// rearDistanceCm 全部改成读回传数据即可,本组件不改。
title: widget.simReverse
? tr.translate('pv_control.reverse_camera')
: tr.translate('pv_control.rear_view'),
overlay: widget.simReverse
? ValueListenableBuilder<double>(
valueListenable: _steerDeg,
builder: (context, deg, _) => ReverseGuideOverlay(
data: ReverseCameraData(
gear: 2,
steeringAngle: deg,
speed: 0.4,
rearDistanceCm: 120,
),
),
)
: null,
title: tr.translate('pv_control.reverse_camera'),
overlay: ValueListenableBuilder<double>(
valueListenable: _steerDeg,
builder: (context, deg, _) => ReverseGuideOverlay(
data: ReverseCameraData(
gear: 2,
steeringAngle: deg,
speed: 0.4,
rearDistanceCm: 120,
),
),
),
);
}
@@ -1617,6 +1667,8 @@ class _PvManualControlViewState extends State<PvManualControlView>
}
Widget _buildJoysticks(double w, double h) {
// 设置里关掉「遥控摇杆」:整块(含回中按钮)不渲染,画面全留给视频
if (!widget.showJoysticks) return const SizedBox.shrink();
final radius = _joyRadius(w, h);
final size = radius * 2;
// 折叠时摇杆向外侧滑动,展开时向内收,避免与两侧面板挤压
@@ -1633,8 +1685,16 @@ class _PvManualControlViewState extends State<PvManualControlView>
radius: radius,
axisHint: AxisHint.forwardBackward,
skin: _joystickSkin(),
onValueChanged: (v) => widget.channel?.sendDriveY(v.y.toInt()),
onPanEnd: () async => widget.channel?.stopAllMovement(),
onValueChanged: (v) {
final int y = v.y.toInt();
if (y == _lastDriveY) return;
_lastDriveY = y;
widget.channel?.sendDriveY(y);
},
onPanEnd: () async {
_lastDriveY = 0;
await widget.channel?.stopAllMovement();
},
),
),
AnimatedPositioned(
@@ -1648,11 +1708,14 @@ class _PvManualControlViewState extends State<PvManualControlView>
skin: _joystickSkin(),
onValueChanged: (v) {
final int x = v.x.toInt().abs() < 1 ? 0 : v.x.toInt();
if (x == _lastDriveX) return;
_lastDriveX = x;
widget.channel?.sendDriveX(x);
// 右摇杆(-100~100) → 转向角(-45°~45°),驱动引导线左右弯曲
_steerDeg.value = (x * 0.45).clamp(-45.0, 45.0);
},
onPanEnd: () async {
_lastDriveX = 0;
_steerDeg.value = 0; // 松手回正,引导线恢复直线
await widget.channel?.stopAllMovement();
},
@@ -1665,7 +1728,12 @@ class _PvManualControlViewState extends State<PvManualControlView>
left: leftJL + size + d(6),
bottom: d(64),
child: GestureDetector(
onTap: () => widget.channel?.stopAllMovement(),
onTap: () {
// 回中同样要清掉去重基准:不然摇杆球停在原处再推相同值会被吞掉。
_lastDriveY = 0;
_lastDriveX = 0;
widget.channel?.stopAllMovement();
},
child: Container(
width: d(40),
height: d(40),
@@ -1689,13 +1757,15 @@ class _PvManualControlViewState extends State<PvManualControlView>
final size = radius * 2;
final leftJL = _leftCollapsed ? d(24) : w * 0.22;
final rightJR = _rightCollapsed ? d(24) : w * 0.16;
// 摇杆隐藏后不再需要给两侧让位:底部条直接向两侧摊开,重心回到屏幕中心
final showJoy = widget.showJoysticks;
return AnimatedPositioned(
duration: _foldDur,
curve: _foldCurve,
bottom: d(14),
// 在两个摇杆内侧之间动态居中:折叠腾出空间后自动放宽、回正
left: leftJL + size + d(8),
right: rightJR + size + d(8),
left: showJoy ? leftJL + size + d(8) : d(12),
right: showJoy ? rightJR + size + d(8) : d(12),
child: Center(
// 窄屏(手机横屏)两摇杆之间的空间不够时整体等比缩小,不让四个按钮溢出
child: FittedBox(

View File

@@ -9,12 +9,13 @@ import '../theme/pv_hud_theme.dart';
/// 页面设置面板(底部弹出,遮罩半透明可透视下方视频,边调边看效果)。
///
/// 纯展示 + 回调:所有设置状态由 PvControlPage 持有。当前四项:
/// 纯展示 + 回调:所有设置状态由 PvControlPage 持有。当前五项:
/// - 视频源:以太网 RTSP / HDMI(USB 采集卡) / WebRTC,切换即重建对应链路 cubit;
/// - 视频展示:完整显示(不裁画面、可能留黑边)/ 铺满屏幕(无黑边、裁掉边缘);
/// - 模拟障碍物信息:真实推送未接入前手动触发,开启 = 相当于收到机器告警推送,
/// 预警横幅 + AR 障碍框 + 屏幕四周泛红**同时**显示;
/// - 倒车影像:开启后左栏后视卡叠加倒车引导线效果(模拟倒车挡)。
/// - 倒车影像:开启后左栏后视卡叠加倒车引导线效果(模拟倒车挡);
/// - 遥控摇杆(仅手动控制 HUD 显示):关闭后隐藏左右两个方向摇杆与回中按钮。
///
/// 皮肤两套(由 [light] 选择):普通态大屏沿用原深蓝面板;手动控制全屏视图
/// (HUD)用近白玻璃卡,与其上的顶栏 / 侧栏 / 底部条保持同一视觉体系。
@@ -25,10 +26,12 @@ class PvSettingsSheet extends StatelessWidget {
required this.videoFit,
required this.simObstacle,
required this.simReverse,
required this.showJoysticks,
required this.onVideoSourceChanged,
required this.onVideoFitChanged,
required this.onSimObstacleChanged,
required this.onSimReverseChanged,
required this.onShowJoysticksChanged,
this.light = false,
});
@@ -36,10 +39,15 @@ class PvSettingsSheet extends StatelessWidget {
final PvVideoFit videoFit;
final bool simObstacle;
final bool simReverse;
/// 是否显示左右两个方向摇杆(仅手动控制 HUD 有摇杆,设置面板可关掉)。
final bool showJoysticks;
final ValueChanged<PvVideoSource> onVideoSourceChanged;
final ValueChanged<PvVideoFit> onVideoFitChanged;
final ValueChanged<bool> onSimObstacleChanged;
final ValueChanged<bool> onSimReverseChanged;
final ValueChanged<bool> onShowJoysticksChanged;
/// 是否套用 HUD 浅色玻璃皮肤(默认 false = 普通态大屏的深色皮肤,与改造前一致)。
final bool light;
@@ -65,14 +73,16 @@ class PvSettingsSheet extends StatelessWidget {
final skin = _skin;
// 横屏可用高度有限:最大高度限幅 + 可滚动防底部裁切;
// 视频源行用 Wrap,窄屏 / 大字体下药丸自动换行不溢出。
final maxH = MediaQuery.sizeOf(context).height * 0.72;
// 限幅放宽到 0.86:多一行开关后旧值会把最后一行压到手势条下面。
final maxH = MediaQuery.sizeOf(context).height * 0.86;
return ConstrainedBox(
constraints: BoxConstraints(maxHeight: maxH),
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.fromLTRB(18, 0, 18, 12),
// 底部留白加大:面板整体往上抬,不贴着屏幕底边
padding: const EdgeInsets.fromLTRB(16, 0, 16, 18),
child: Container(
padding: const EdgeInsets.fromLTRB(14, 4, 10, 8),
padding: const EdgeInsets.fromLTRB(12, 2, 8, 6),
decoration: BoxDecoration(
color: skin.panel,
borderRadius: BorderRadius.circular(16),
@@ -83,11 +93,11 @@ class PvSettingsSheet extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// 标题行 + 关闭
// 标题行 + 关闭(比原尺寸小一号,给下面的开关行腾高度)
Row(
children: [
Icon(Icons.settings_outlined, color: skin.accent, size: 18),
const SizedBox(width: 8),
Icon(Icons.settings_outlined, color: skin.accent, size: 16),
const SizedBox(width: 6),
Text(
tr.translate('pv_control.nav_settings'),
style: PvType.cardTitle.copyWith(
@@ -99,19 +109,19 @@ class PvSettingsSheet extends StatelessWidget {
icon: Icon(
Icons.close,
color: skin.textSecondary,
size: 20,
size: 18,
),
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints:
const BoxConstraints(minWidth: 32, minHeight: 32),
const BoxConstraints(minWidth: 28, minHeight: 28),
onPressed: () => Navigator.of(context).pop(),
),
],
),
// 视频源(Wrap:空间不够自动换第二行)
Wrap(
spacing: 8,
spacing: 6,
runSpacing: 2,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
@@ -128,9 +138,9 @@ class PvSettingsSheet extends StatelessWidget {
],
),
// 视频展示(适配方式)+ 一句取舍说明
const SizedBox(height: 6),
const SizedBox(height: 4),
Wrap(
spacing: 8,
spacing: 6,
runSpacing: 2,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
@@ -152,7 +162,7 @@ class PvSettingsSheet extends StatelessWidget {
),
],
),
const SizedBox(height: 4),
const SizedBox(height: 2),
_switchTile(
icon: Icons.warning_amber_rounded,
iconColor: simObstacle ? skin.danger : skin.textTertiary,
@@ -169,6 +179,17 @@ class PvSettingsSheet extends StatelessWidget {
value: simReverse,
onChanged: onSimReverseChanged,
),
// 摇杆开关:新版远程遥控的设置面板里始终可见。
// 大屏页本身没有摇杆,这个开关预设的是「全屏手动控制」里的显示与否,
// 进 HUD 后立即生效(淡出淡入不需要重启页面)。
_switchTile(
icon: Icons.gamepad_outlined,
iconColor: showJoysticks ? skin.accent : skin.textTertiary,
title: tr.translate('pv_control.set_show_joysticks'),
subtitle: tr.translate('pv_control.set_show_joysticks_sub'),
value: showJoysticks,
onChanged: onShowJoysticksChanged,
),
],
),
),
@@ -190,10 +211,10 @@ class PvSettingsSheet extends StatelessWidget {
behavior: HitTestBehavior.opaque,
child: AnimatedContainer(
duration: const Duration(milliseconds: 180),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
decoration: BoxDecoration(
color: selected ? skin.accentSoft : skin.inner,
borderRadius: BorderRadius.circular(20),
borderRadius: BorderRadius.circular(16),
border: Border.all(
color: selected ? skin.accent : skin.border,
),
@@ -222,11 +243,11 @@ class PvSettingsSheet extends StatelessWidget {
return InkWell(
onTap: () => onChanged(!value),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
padding: const EdgeInsets.symmetric(vertical: 2),
child: Row(
children: [
Icon(icon, size: 20, color: iconColor),
const SizedBox(width: 10),
Icon(icon, size: 18, color: iconColor),
const SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -245,11 +266,13 @@ class PvSettingsSheet extends StatelessWidget {
],
),
),
// Switch 自身禁用手势,统一走整行 onTap,避免两套状态
// Switch 自身禁用手势,统一走整行 onTap,避免两套状态;
// shrinkWrap 去掉默认 48dp 点按区,视觉上跟着整体缩一号
IgnorePointer(
child: Switch(
value: value,
onChanged: (_) {},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
activeThumbColor: skin.switchActiveThumb,
activeTrackColor: skin.switchActiveTrack,
inactiveThumbColor: skin.switchInactiveThumb,

View File

@@ -1,6 +1,7 @@
import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/remote_control/presentation/widgets/webrtc/webrtc_local_player.dart';
import '../models/pv_telemetry.dart';
@@ -64,14 +65,14 @@ class PvVideoArea extends StatelessWidget {
),
// ② 顶部左侧:实时视频 + 分辨率/帧率
Positioned(left: 14, top: 12, child: _buildTopLeftBadge()),
Positioned(left: 14, top: 12, child: _buildTopLeftBadge(context)),
// ③ 顶部中间:障碍物预警
if (telemetry.obstacleAlert)
Positioned(left: 0, right: 0, top: 10, child: _buildObstacleBanner()),
// ④ 顶部右侧:网络状态
Positioned(right: 14, top: 12, child: _buildNetworkBadge()),
Positioned(right: 14, top: 12, child: _buildNetworkBadge(context)),
// ⑤ 右侧工具按钮列
if (showSideTools)
@@ -112,7 +113,7 @@ class PvVideoArea extends StatelessWidget {
return _VideoPlaceholder();
}
Widget _buildTopLeftBadge() {
Widget _buildTopLeftBadge(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -120,9 +121,11 @@ class PvVideoArea extends StatelessWidget {
children: [
const Icon(Icons.circle, size: 8, color: PvColors.danger),
const SizedBox(width: 5),
const Text(
'实时视频',
style: TextStyle(
Text(
AppLocalizations.of(
context,
).translate('pv_control.realtime_video'),
style: const TextStyle(
color: PvColors.textPrimary,
fontSize: 12,
fontWeight: FontWeight.w700,
@@ -146,8 +149,9 @@ class PvVideoArea extends StatelessWidget {
Widget _buildObstacleBanner() => const _ObstacleBannerPill();
Widget _buildNetworkBadge() {
Widget _buildNetworkBadge(BuildContext context) {
final ok = telemetry.networkNormal;
final l10n = AppLocalizations.of(context);
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration(
@@ -163,7 +167,9 @@ class PvVideoArea extends StatelessWidget {
Icon(Icons.wifi, size: 14, color: ok ? PvColors.online : PvColors.warning),
const SizedBox(width: 4),
Text(
ok ? '网络良好' : '网络异常',
ok
? l10n.translate('pv_control.network_good')
: l10n.translate('pv_control.network_bad'),
style: TextStyle(
fontSize: 10,
fontWeight: FontWeight.w600,
@@ -202,13 +208,18 @@ class _VideoPlaceholder extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
color: Colors.black87,
child: const Center(
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.videocam_off, size: 48, color: Colors.white38),
SizedBox(height: 8),
Text('视频未加载', style: TextStyle(color: Colors.white54, fontSize: 12)),
const Icon(Icons.videocam_off, size: 48, color: Colors.white38),
const SizedBox(height: 8),
Text(
AppLocalizations.of(
context,
).translate('pv_control.video_not_loaded'),
style: const TextStyle(color: Colors.white54, fontSize: 12),
),
],
),
),
@@ -276,9 +287,11 @@ class _ObstacleBannerPillState extends State<_ObstacleBannerPill>
const SizedBox(width: 7),
const Icon(Icons.warning_rounded, color: Colors.white, size: 16),
const SizedBox(width: 5),
const Text(
'障碍物预警',
style: TextStyle(
Text(
AppLocalizations.of(
context,
).translate('pv_control.obstacle_alert'),
style: const TextStyle(
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w800,

View File

@@ -6,16 +6,19 @@ import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart';
import 'package:maibu_satabot_v2/core/di/injection.dart';
import 'package:maibu_satabot_v2/core/logging/work_trace_diagnostics.dart';
import 'package:maibu_satabot_v2/core/network/mqtt/domain/entities/route_status_entity.dart';
import 'package:maibu_satabot_v2/core/network/mqtt/domain/repositories/mower_realtime_repository.dart';
import 'package:maibu_satabot_v2/features/devices/presentation/bloc/device_status_bloc.dart';
import 'package:maibu_satabot_v2/features/devices/presentation/bloc/device_status_state.dart';
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/HeadingPointer.dart';
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/geoserver_suzhou_layer.dart';
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/app_base_map_layer.dart';
import 'package:maibu_satabot_v2/features/v2/site/presentation/cubit/site_cubit.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import '../theme/pv_colors.dart';
import '../models/work_trace_recorder.dart';
/// HUD 作业地图:与「路径规划」同源、同图层、同样式的**只读**实时地图。
///
@@ -50,11 +53,22 @@ class PvWorkMap extends StatefulWidget {
this.draftCompleted = false,
this.draftObstacle = false,
this.draftCrosshair = false,
this.returnPoints = const <LatLng>[],
this.followDevice = true,
this.recenterSignal = 0,
this.clearTraceSignal = 0,
this.onCenterChanged,
this.onDevicePosition,
this.recordLocationTrace = true,
this.workTrace,
this.taskTrace,
this.expectedTaskId,
this.traceDiagnosticsEnabled = false,
this.showDevice = true,
this.extraMapLayers = const <Widget>[],
this.focusPoints = const <LatLng>[],
this.focusSignal = 0,
this.focusPadding = const EdgeInsets.all(40),
});
/// 设备 SN:用于过滤路线推送(deviceId 不匹配的消息直接丢弃)。
@@ -115,6 +129,12 @@ class PvWorkMap extends StatefulWidget {
/// 是否准星打点模式:画「中心 → 末点」蓝色连线、距离文字、草稿多边形。
final bool draftCrosshair;
// ===== 一键返航图层(独立于圈地草稿层,默认空=不绘制)=====
/// 一键返航点:紫色虚线串联 + 紫色编号徽标(首点显示「H」)。
/// 与作业区橙色打点、禁行区红色框配色区分,互不影响。
final List<LatLng> returnPoints;
/// 是否让地图随设备位置自动居中。区域编辑时传 false:
/// 否则每次定位推送都会把地图挪走,正在打的位置就跑了。
final bool followDevice;
@@ -133,18 +153,107 @@ class PvWorkMap extends StatefulWidget {
/// 设备实时位置变化(无效/清空时回调 null),供「设备位置打点」取当前坐标。
final ValueChanged<LatLng?>? onDevicePosition;
/// 普通地图的定位轨迹;作业中心的组合轨迹由 taskTrace 独立控制。
final bool recordLocationTrace;
final List<LatLng>? workTrace;
final WorkTraceInput? taskTrace;
final String? expectedTaskId;
final bool traceDiagnosticsEnabled;
final bool showDevice;
/// 业务页面提供独立叠加层,共享地图无需依赖具体分区业务。
final List<Widget> extraMapLayers;
final List<LatLng> focusPoints;
final int focusSignal;
final EdgeInsets focusPadding;
@override
State<PvWorkMap> createState() => _PvWorkMapState();
}
class _PvWorkMapState extends State<PvWorkMap> {
final _traceDiagnostics = WorkTraceDiagnostics();
final _taskTraceRecorder = WorkTraceRecorder();
Object? _lastTraceRender;
List<LatLng> get _visibleTracePoints => widget.taskTrace != null
? _taskTraceRecorder.points
: widget.workTrace ?? _trace;
void _synchronizeTaskTrace() {
final input = widget.taskTrace;
if (input == null) {
_taskTraceRecorder.reset();
return;
}
_taskTraceRecorder.synchronize(deviceId: widget.deviceSn, input: input);
if (_pos != null) _taskTraceRecorder.addPosition(_pos!);
}
void _logTraceRender(List<LatLng> points) {
if (!widget.traceDiagnosticsEnabled) return;
final signature = (
widget.deviceSn,
widget.expectedTaskId,
widget.recordLocationTrace,
widget.workTrace != null,
widget.taskTrace?.recording,
widget.taskTrace?.visible,
widget.taskTrace?.completedPoints.length,
points.length,
points.isEmpty ? null : points.last,
widget.previewRoute.length,
_routeTaskId,
_route.length,
_ready,
);
if (_lastTraceRender == signature) return;
_lastTraceRender = signature;
_traceDiagnostics.log(
'地图画线',
{
'deviceId': widget.deviceSn,
'taskId': widget.expectedTaskId,
'source': widget.taskTrace != null
? (_taskTraceRecorder.hasCompletedPoints ? '到达点+实时定位' : '开始后定位轨迹')
: widget.workTrace != null
? '任务completedPoints'
: '定位累计轨迹',
'taskTraceRecording': widget.taskTrace?.recording,
'taskTraceVisible': widget.taskTrace?.visible,
'completedPoints': widget.taskTrace?.completedPoints.length,
'recordLocationTrace': widget.recordLocationTrace,
'mapReady': _ready,
'mapCenter': !_ready
? null
: {
'lat': _map.camera.center.latitude,
'lng': _map.camera.center.longitude,
},
'mapZoom': !_ready ? null : _map.camera.zoom,
'points': points.length,
'previewRoutePoints': widget.previewRoute.length,
'realtimeRoutePoints': _route.length,
'greenPolyline': points.length >= 2,
'lastPoint': points.isEmpty
? null
: {'lat': points.last.latitude, 'lng': points.last.longitude},
'reason': points.isEmpty
? '没有轨迹点'
: points.length == 1
? '只有一个点,需至少两个点才能画线'
: '满足绿色Polyline绘制条件',
},
sampleKey:
'map/${widget.deviceSn}/${widget.expectedTaskId}/${points.length < 2 ? points.length : "2+"}/$_ready',
);
}
// ===== 与路径规划一致的常量 =====
static const _esriUrl =
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}';
static const _centerZoom = 18.0; // 路径规划回中/跟随都用 18 级
static const _previewZoom = 21.0; // 与路径规划选中路线后的定位级别一致
static const _maxTrace = 600; // 绿线最多保留的点数(约 5 分钟推送)
static const _minTraceStep = 0.3; // 米:小于此间距的点丢弃(抖动过滤)
static const _returnColor = Color(0xFF7B61FF); // 返航点配色(紫)
final MapController _map = MapController();
final Distance _dist = const Distance();
@@ -167,6 +276,7 @@ class _PvWorkMapState extends State<PvWorkMap> {
@override
void initState() {
super.initState();
_synchronizeTaskTrace();
// 图层范围仓库:与路径规划同一套用法(动态刷新 + 变更通知,失败自动回退内置兜底)
StationLayerRepo.instance.addListener(_onStationLayersUpdated);
StationLayerRepo.instance.refresh();
@@ -208,14 +318,32 @@ class _PvWorkMapState extends State<PvWorkMap> {
// 页面点了「刷新」:已走轨迹作废(同路径规划 traceManager.reset())
if (oldWidget.clearTraceSignal != widget.clearTraceSignal) {
_trace.clear();
_taskTraceRecorder.reset();
}
_synchronizeTaskTrace();
if (oldWidget.focusSignal != widget.focusSignal) _fitFocusGeometry();
}
/// 预览的全部几何(轨迹 + 边界框):视野与定位都以它为准
List<LatLng> get _previewPoints => <LatLng>[
...widget.previewOuter,
...widget.previewRoute,
];
...widget.previewOuter,
...widget.previewRoute,
];
void _fitFocusGeometry() {
if (widget.focusPoints.isEmpty) return;
_follow = false;
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted || !_ready || widget.focusPoints.isEmpty) return;
_map.fitCamera(
CameraFit.bounds(
bounds: LatLngBounds.fromPoints(widget.focusPoints),
padding: widget.focusPadding,
maxZoom: _previewZoom,
),
);
});
}
/// 把视野移到预览几何中心。刻意不用 CameraFit:
/// 只要 center + 固定 zoom,跟 flutter_map 版本差异无关。
@@ -254,6 +382,11 @@ class _PvWorkMapState extends State<PvWorkMap> {
/// 多一道过滤反而会因为 payload 字段格式不同把运行中的路线丢掉。
void _onRouteMessage(RouteStatusEntity msg) {
if (msg.data.isEmpty || !mounted) return;
if (widget.expectedTaskId != null &&
msg.taskId > 0 &&
'${msg.taskId}' != widget.expectedTaskId) {
return;
}
setState(() {
// 新任务 = 上一段的行走轨迹作废(路径规划选中任务时同样会 reset 轨迹)
if (msg.taskId != _routeTaskId) {
@@ -266,12 +399,47 @@ class _PvWorkMapState extends State<PvWorkMap> {
/// 定位推送来了:攒轨迹 + 按需把机器移到正中间
void _onLocation(DeviceStatusUpdated state) {
if (!widget.showDevice) return;
final p = _validLatLng(state.status.latitude, state.status.longitude);
if (p == null) return; // 无效坐标不画点、不追(与路径规划一致)
if (widget.traceDiagnosticsEnabled) {
_traceDiagnostics.log(
'定位收到',
{
'deviceId': widget.deviceSn,
'taskId': widget.expectedTaskId,
'lat': state.status.latitude,
'lng': state.status.longitude,
'valid': p != null,
'recordLocationTrace': widget.recordLocationTrace,
'displayPoints': _visibleTracePoints.length,
'taskTraceRecording': widget.taskTrace?.recording,
'note': widget.taskTrace != null
? (widget.taskTrace!.recording
? '按作业轨迹规则接入实时车位'
: '任务未开始、暂停或结束,定位不追加到轨迹')
: widget.recordLocationTrace
? '定位可累计本地轨迹'
: '定位只更新车标;本页绿色轨迹需要任务arrive到达点',
},
sampleKey: 'location/${widget.deviceSn}/${widget.expectedTaskId}',
interval: const Duration(seconds: 5),
);
}
if (p == null) {
if (widget.onDevicePosition != null) {
_pos = null;
widget.onDevicePosition?.call(null);
}
return;
}
if (p == _pos) return;
_pos = p;
widget.onDevicePosition?.call(p);
_appendTrace(p);
if (widget.taskTrace != null) {
_taskTraceRecorder.addPosition(p);
} else if (widget.recordLocationTrace) {
_appendTrace(p);
}
if (_follow && widget.followDevice) _scheduleMove(p);
}
@@ -328,11 +496,11 @@ class _PvWorkMapState extends State<PvWorkMap> {
}
/// 中心到末点的距离文本(与路径规划同一套显示:1 公里内用米)
String _distanceText(LatLng a, LatLng b) {
String _distanceText(LatLng a, LatLng b, AppLocalizations l10n) {
final d = _dist(a, b);
return d < 1000
? '${d.toStringAsFixed(1)} 米'
: '${(d / 1000).toStringAsFixed(2)} 千米';
? '${d.toStringAsFixed(1)} ${l10n.translate('pv_control.unit_m')}'
: '${(d / 1000).toStringAsFixed(2)} ${l10n.translate('pv_control.unit_km')}';
}
/// 进场中心:优先当前选中场站高清图层中心,无有效场站兜底到苏州地块(同路径规划)
@@ -351,15 +519,27 @@ class _PvWorkMapState extends State<PvWorkMap> {
@override
Widget build(BuildContext context) {
return BlocListener<DeviceStatusBloc, DeviceStatusState>(
listenWhen: (prev, cur) => cur is DeviceStatusUpdated,
listener: (context, state) => _onLocation(state as DeviceStatusUpdated),
listenWhen: (prev, cur) =>
cur is DeviceStatusUpdated || widget.onDevicePosition != null,
listener: (context, state) {
if (state is DeviceStatusUpdated) {
_onLocation(state);
} else {
_pos = null;
widget.onDevicePosition?.call(null);
}
},
child: BlocBuilder<DeviceStatusBloc, DeviceStatusState>(
buildWhen: (prev, cur) => cur is DeviceStatusUpdated,
builder: (context, state) {
final status = state is DeviceStatusUpdated ? state.status : null;
final status = widget.showDevice && state is DeviceStatusUpdated
? state.status
: null;
final marker = status == null
? null
: _validLatLng(status.latitude, status.longitude);
final tracePoints = _visibleTracePoints;
_logTraceRender(tracePoints);
return Stack(
fit: StackFit.expand,
children: [
@@ -378,26 +558,34 @@ class _PvWorkMapState extends State<PvWorkMap> {
),
onMapReady: () {
_ready = true;
_fitPreviewRoute();
if (widget.onDevicePosition != null && widget.showDevice) {
final current = context.read<DeviceStatusBloc>().state;
if (current is DeviceStatusUpdated) _onLocation(current);
}
if (widget.focusPoints.isNotEmpty) {
_fitFocusGeometry();
} else {
_fitPreviewRoute();
}
// 进场先把当前中心告诉页面:准星还没动过时也能取到中心
widget.onCenterChanged?.call(LatLng(_map.camera.center.latitude,
_map.camera.center.longitude));
widget.onCenterChanged?.call(
LatLng(
_map.camera.center.latitude,
_map.camera.center.longitude,
),
);
},
onPositionChanged: _notifyCenter,
onMapEvent: _onMapEvent,
onTap: (_, _) {}, // 空实现:地图本身不响应点击
),
children: [
/// ESRI World Imagery(WGS84,全球高清卫星图,无需坐标转换)
TileLayer(
urlTemplate: _esriUrl,
userAgentPackageName: 'com.example.app',
minZoom: 0,
maxZoom: 19,
),
/// 底图:中文=ESRI,非中文=Google(不可达自动回退 ESRI)
const AppBaseMapLayer(maxZoom: 22),
/// 场站无人机高清影像:滑到哪个场站区域(zoom>=16)就叠哪个
if (_showStation) ..._stationLayers,
...widget.extraMapLayers,
/// ① 作业区域边界框(与路径规划同一套画法):
/// 覆盖模式 = 灰色半透明多边形;自定义模式 = 绿色边界线。
@@ -465,9 +653,7 @@ class _PvWorkMapState extends State<PvWorkMap> {
PolylineLayer(
key: const ValueKey('pv_draft_points'),
polylines: [
for (var i = 0;
i < widget.draftPoints.length - 1;
i++)
for (var i = 0; i < widget.draftPoints.length - 1; i++)
Polyline(
points: [
widget.draftPoints[i],
@@ -522,6 +708,7 @@ class _PvWorkMapState extends State<PvWorkMap> {
_distanceText(
widget.draftCenter!,
widget.draftPoints.last,
AppLocalizations.of(context),
),
textAlign: TextAlign.center,
style: const TextStyle(
@@ -574,9 +761,11 @@ class _PvWorkMapState extends State<PvWorkMap> {
PolylineLayer(
key: const ValueKey('pv_draft_hole_points'),
polylines: [
for (var i = 0;
i < widget.draftHolePoints.length - 1;
i++)
for (
var i = 0;
i < widget.draftHolePoints.length - 1;
i++
)
Polyline(
points: [
widget.draftHolePoints[i],
@@ -599,13 +788,13 @@ class _PvWorkMapState extends State<PvWorkMap> {
],
),
/// 已走轨迹(绿色实线,本地按定位推送累积)
if (_trace.length >= 2)
/// 已走轨迹(作业模式由到达点与实时车位组合)。
if (tracePoints.length >= 2)
PolylineLayer(
key: const ValueKey('pv_trace'),
polylines: [
Polyline(
points: List.of(_trace),
points: List.of(tracePoints),
color: const Color(0xFF00B42A),
strokeWidth: 4,
),
@@ -629,18 +818,22 @@ class _PvWorkMapState extends State<PvWorkMap> {
),
],
),
/// 禁行区打点编号(已完成:红底「组号-点号」;绘制中:橙底「点号」)
if (widget.draftObstacle)
MarkerLayer(
key: const ValueKey('pv_draft_hole_markers'),
markers: [
for (var holeIndex = 0;
holeIndex < widget.draftHoles.length;
holeIndex++)
for (var pointIndex = 0;
pointIndex <
widget.draftHoles[holeIndex].length;
pointIndex++)
for (
var holeIndex = 0;
holeIndex < widget.draftHoles.length;
holeIndex++
)
for (
var pointIndex = 0;
pointIndex < widget.draftHoles[holeIndex].length;
pointIndex++
)
Marker(
point: widget.draftHoles[holeIndex][pointIndex],
width: 80,
@@ -651,9 +844,11 @@ class _PvWorkMapState extends State<PvWorkMap> {
8,
),
),
for (var pointIndex = 0;
pointIndex < widget.draftHolePoints.length;
pointIndex++)
for (
var pointIndex = 0;
pointIndex < widget.draftHolePoints.length;
pointIndex++
)
Marker(
point: widget.draftHolePoints[pointIndex],
width: 80,
@@ -685,6 +880,53 @@ class _PvWorkMapState extends State<PvWorkMap> {
),
],
),
/// ===== 一键返航点:紫色虚线串联(末点连到准星)=====
if (widget.returnPoints.isNotEmpty)
PolylineLayer(
key: const ValueKey('pv_return_points'),
polylines: [
for (var i = 0; i < widget.returnPoints.length - 1; i++)
Polyline(
points: [
widget.returnPoints[i],
widget.returnPoints[i + 1],
],
color: _returnColor.withValues(alpha: 0.85),
strokeWidth: 2,
isDotted: true,
),
if (widget.draftCrosshair && widget.draftCenter != null)
Polyline(
points: [
widget.returnPoints.last,
widget.draftCenter!,
],
color: _returnColor.withValues(alpha: 0.5),
strokeWidth: 1.5,
isDotted: true,
),
],
),
/// 返航点编号:首点「H」,其余序号
if (widget.returnPoints.isNotEmpty)
MarkerLayer(
key: const ValueKey('pv_return_point_markers'),
markers: [
for (var i = 0; i < widget.returnPoints.length; i++)
Marker(
point: widget.returnPoints[i],
width: 80,
height: 40,
child: _draftBadge(
i == 0 ? 'H' : '${i + 1}',
_returnColor,
10,
),
),
],
),
],
),
// 还没收到定位推送时的提示(此时图面停在场站中心,机器不出现)