USB 摄像头+远程遥控+中英的适配+topic的集成和状态的使用到相应页面
This commit is contained in:
@@ -22,7 +22,9 @@ import 'package:maibu_satabot_v2/features/remote_control/presentation/bloc/remot
|
||||
import '../../../../core/logging/i_logger_service.dart';
|
||||
import '../../../../core/network/net_message_dispatcher.dart';
|
||||
import '../../../devices/domain/entities/running_status_entity.dart';
|
||||
import '../../data/reverse_camera_source.dart';
|
||||
import '../../domain/entities/machine_control_status_entity.dart';
|
||||
import '../../domain/entities/reverse_camera_data.dart';
|
||||
import '../../domain/repositories/remote_control_repository.dart';
|
||||
import '../../domain/usecase/remote_control_usecase.dart';
|
||||
|
||||
@@ -51,6 +53,11 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
// 🔥 模拟数据推送定时器
|
||||
// Timer? _simulationTimer;
|
||||
|
||||
// 🔥 倒车影像数据源(现为 Mock;嵌入式就绪后,把 startReverseCameraMock 里的
|
||||
// MockReverseCameraSource 换成解析真实回包的 Mqtt/Tcp 源即可,UI 不用动)。
|
||||
ReverseCameraSource? _reverseCameraSource;
|
||||
StreamSubscription<ReverseCameraData>? _reverseCameraSub;
|
||||
|
||||
// 🔥 获取带时间戳的日志前缀
|
||||
String _getTimePrefix() {
|
||||
final now = DateTime.now();
|
||||
@@ -538,7 +545,7 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
});
|
||||
}
|
||||
|
||||
// 2. 开启 100ms 控制循环 (在进入遥控页面或点击“开始”时调用)
|
||||
// 2. 开启 200ms 控制循环 (在进入遥控页面或点击“开始”时调用)
|
||||
/* void startControlLoop() {
|
||||
_timer?.cancel();
|
||||
_timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
|
||||
@@ -562,13 +569,13 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
_timer?.cancel();
|
||||
final logPrefix = '⏰ [RemoteControl] [控制循环]';
|
||||
//debugPrint('$logPrefix =========================================');
|
||||
//debugPrint('$logPrefix 启动控制循环,间隔: 100ms');
|
||||
//debugPrint('$logPrefix 启动控制循环,间隔: 200ms');
|
||||
///debugPrint('$logPrefix =========================================');
|
||||
|
||||
// 🔥 启动模拟设备状态推送(用于测试)
|
||||
// startSimulation();
|
||||
|
||||
_timer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
|
||||
_timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
|
||||
if (isClosed) {
|
||||
// debugPrint('$logPrefix ❌ Cubit已关闭,取消定时器');
|
||||
timer.cancel();
|
||||
@@ -657,6 +664,9 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
final updatedEntity = state.controlEntity.copyWith(y: y);
|
||||
emit(state.copyWith(controlEntity: updatedEntity));
|
||||
// debugPrint('📝 [updateOriginY] state已更新- originY=$y');
|
||||
|
||||
// 🔥 倒车影像:用当前摇杆(左杆前后)实时驱动引导线
|
||||
_syncReverseCameraFromJoystick();
|
||||
}
|
||||
|
||||
void updateOriginX(int x) {
|
||||
@@ -669,6 +679,37 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
final updatedEntity = state.controlEntity.copyWith(x: x);
|
||||
emit(state.copyWith(controlEntity: updatedEntity));
|
||||
// debugPrint('📝 [updateOriginX] state已更新- originX=$x');
|
||||
|
||||
// 🔥 倒车影像:用当前摇杆(右杆转向)实时驱动引导线摆动
|
||||
_syncReverseCameraFromJoystick();
|
||||
}
|
||||
|
||||
/// 🔥 开发阶段:暂用本地摇杆数据合成倒车影像(不依赖嵌入式回传)。
|
||||
///
|
||||
/// 激活规则(摇杆输出范围 -100~100,上推为正=前进、下拉为负=倒车,右杆为左右转向):
|
||||
/// - 倒车(y<0) 或 正在转向(x≠0) → 显示引导线;纯前进直行或松手归零 → 自动收起。
|
||||
/// - originX(-100~100) → steeringAngle(-45°~45°),驱动引导线左右摆动。
|
||||
/// - 摇杆无测距传感器 → rearDistanceCm=null(颜色固定为绿)。
|
||||
/// 嵌入式就绪后,删除本方法及 updateOriginX/Y 里的调用,改回 startReverseCameraMock 接入真实数据源。
|
||||
void _syncReverseCameraFromJoystick() {
|
||||
if (isClosed) return;
|
||||
final int y = _currentOriginY;
|
||||
final int x = _currentOriginX;
|
||||
// 🔥 智能激活:倒车 或 正在转向 都显示引导线(解决“只动右杆不显示”)
|
||||
final bool guideActive = y < 0 || x != 0;
|
||||
final int gear = guideActive ? 2 : (y > 0 ? 1 : 0);
|
||||
final double steering = (x.clamp(-100, 100) / 100.0) * 45.0;
|
||||
final double speed = (y.abs().clamp(0, 100) / 100.0);
|
||||
emit(
|
||||
state.copyWith(
|
||||
reverseCamera: ReverseCameraData(
|
||||
gear: gear,
|
||||
steeringAngle: steering,
|
||||
speed: speed,
|
||||
rearDistanceCm: null,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// 🔥 安全方法:同时清零双轴,确保只发送一次完全停止指令
|
||||
@@ -690,6 +731,9 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
// 一次性更新双轴(即使无权限也要更新本地state)
|
||||
emit(state.copyWith(controlEntity: updatedEntity));
|
||||
|
||||
// 🔥 摇杆归零:同步倒车影像为非倒车态(引导线自动隐藏)
|
||||
_syncReverseCameraFromJoystick();
|
||||
|
||||
// 🔥 安全底线:停止指令必须无视权限强制发送!
|
||||
// debugPrint('🛑 [stopAllMovement] 双轴归零,发送停止指令- originX=0, originY=0');
|
||||
await _sendStopCommandRepeatedly(updatedEntity); // 等待所有指令发送完成
|
||||
@@ -781,14 +825,68 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
_timer?.cancel();
|
||||
_deviceStatusSub?.cancel(); // 🔥 取消订阅 DeviceStatusBloc
|
||||
_tcpStatusSub?.cancel(); // 🔥 取消订阅 TCP 0x02 门槛监听
|
||||
_reverseCameraSub?.cancel(); // 🔥 取消订阅倒车影像数据流
|
||||
_reverseCameraSource?.stop();
|
||||
return super.close();
|
||||
}
|
||||
|
||||
void updateChassisLift(int i) {}
|
||||
|
||||
void updateEmergency(bool bool) {
|
||||
// debugPrint('🚨 [急停] ${bool ? "触发急停!" : "解除急停"}');
|
||||
updateFunction(emergency: bool);
|
||||
/// 🔥 启动倒车影像数据流(开发期用 Mock 造假数据,机器未开也能联调动画)。
|
||||
/// 由遥控页 initState 调用;嵌入式就绪后只需替换这里传入的实现类。
|
||||
void startReverseCameraMock() {
|
||||
if (_reverseCameraSub != null) return; // 已启动,避免重复订阅
|
||||
final source = MockReverseCameraSource();
|
||||
_reverseCameraSource = source;
|
||||
_reverseCameraSub = source.dataStream.listen((ReverseCameraData data) {
|
||||
if (isClosed) return;
|
||||
emit(state.copyWith(reverseCamera: data));
|
||||
});
|
||||
source.start();
|
||||
debugPrint('🚗 [倒车影像] Mock 数据源已启动(嵌入式真数据接入前的联调用)');
|
||||
}
|
||||
|
||||
/// 🔥 停止倒车影像数据流(退出遥控页调用,避免定时器空转)。
|
||||
void stopReverseCameraMock() {
|
||||
_reverseCameraSub?.cancel();
|
||||
_reverseCameraSub = null;
|
||||
_reverseCameraSource?.stop();
|
||||
_reverseCameraSource = null;
|
||||
emit(state.copyWith(reverseCamera: const ReverseCameraData.idle()));
|
||||
debugPrint('🚗 [倒车影像] 数据源已停止');
|
||||
}
|
||||
|
||||
void updateEmergency(bool on) {
|
||||
// debugPrint('🚨 [急停] ${on ? "触发急停!" : "解除急停"}');
|
||||
// ① 先置状态:急停时让 200ms 控制循环下一 tick 立刻停发运动指令;
|
||||
// 解除时循环恢复正常发送。
|
||||
updateFunction(emergency: on);
|
||||
// ② 再绕过控制循环的 isEmergency 门控,直发带急停位的指令帧(双重保险):
|
||||
// - 按下:连发 emergency=1 + 全零,让设备明确收到「急停」,而不只靠「收不到指令」。
|
||||
// - 取消:连发 emergency=0 + 全零,让设备明确「解除急停、恢复正常」。
|
||||
_sendEmergencyFrames(emergency: on);
|
||||
}
|
||||
|
||||
/// 双重保险:绕过控制循环门控,直接连续补发若干帧带急停位的指令。
|
||||
///
|
||||
/// [emergency] true=显式急停(emergency 位=1),false=显式恢复正常(emergency 位=0)。
|
||||
/// 运动量一律全零,避免误带旧摇杆值;5ms 高频补发防丢包(安全路径,无视权限)。
|
||||
Future<void> _sendEmergencyFrames({required bool emergency}) async {
|
||||
final frame = MachineControlStatusEntity(
|
||||
originX: 0,
|
||||
originY: 0,
|
||||
chassisLift: 0,
|
||||
mowerSpeed: 0,
|
||||
ignitionStatus: 0,
|
||||
isEmergency: emergency,
|
||||
);
|
||||
for (int i = 0; i < 10; i++) {
|
||||
if (isClosed) return;
|
||||
_repository.sendControlMachineCmd(frame);
|
||||
if (i < 9) {
|
||||
await Future.delayed(const Duration(milliseconds: 5));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void respondPermission(bool agreed, String deviceId) {
|
||||
|
||||
Reference in New Issue
Block a user