作业首页和机器状态的数据
This commit is contained in:
@@ -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'),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user