USB 摄像头+远程遥控+中英的适配+topic的集成和状态的使用到相应页面
This commit is contained in:
@@ -2,17 +2,20 @@ import 'dart:typed_data';
|
||||
|
||||
import '../../../../core/protocol/machine_protocol_codec.dart';
|
||||
|
||||
/// 0x00 远程遥控指令数据模型
|
||||
///
|
||||
/// 协议变更(2026-10):左右轮速改为线速度/角速度(double)
|
||||
class LawnMoverProtocolModel {
|
||||
final int left;
|
||||
final int right;
|
||||
final double linear;
|
||||
final double angular;
|
||||
final int lift;
|
||||
final int mower;
|
||||
final int ignition;
|
||||
final int emergency;
|
||||
|
||||
LawnMoverProtocolModel({
|
||||
required this.left,
|
||||
required this.right,
|
||||
required this.linear,
|
||||
required this.angular,
|
||||
this.lift = 0,
|
||||
this.mower = 0,
|
||||
this.ignition = 0,
|
||||
@@ -20,8 +23,8 @@ class LawnMoverProtocolModel {
|
||||
});
|
||||
|
||||
Uint8List toBytes() => MachineProtocolCodec.encodeRemoteControlPayload(
|
||||
left: left,
|
||||
right: right,
|
||||
linear: linear,
|
||||
angular: angular,
|
||||
lift: lift,
|
||||
mower: mower,
|
||||
ignition: ignition,
|
||||
|
||||
@@ -35,26 +35,43 @@ class RemoteControlRepositoryImpl implements RemoteControlRepository {
|
||||
|
||||
@override
|
||||
void sendControlMachineCmd(MachineControlStatusEntity status) {
|
||||
// 1. 调用算法:将摇杆坐标 (x, y) 转换为左右轮电机转速
|
||||
// 1. 调用算法:将摇杆坐标 (x, y) 转换为线速度/角速度(物理量)
|
||||
final speeds = _diffSteer.calculate(status.originX, status.originY);
|
||||
_logger.logWithLevel(
|
||||
'⚙️ [电机速度] left: ${speeds['left']}, right: ${speeds['right']}',
|
||||
);
|
||||
final linear = speeds['linear']!;
|
||||
final angular = speeds['angular']!;
|
||||
|
||||
// 2. 调用 Codec:生成协议要求的 8 字节 Payload
|
||||
// 2. 调用 Codec:生成协议要求的 20 字节 Payload(线速度/角速度 double 直传)
|
||||
final payload = MachineProtocolCodec.encodeRemoteControlPayload(
|
||||
left: speeds['left']!,
|
||||
right: speeds['right']!,
|
||||
linear: linear,
|
||||
angular: angular,
|
||||
lift: status.chassisLift,
|
||||
mower: status.mowerSpeed,
|
||||
ignition: status.ignitionStatus,
|
||||
emergency: status.isEmergency ? 1 : 0,
|
||||
);
|
||||
|
||||
// 联调日志:三段式打印 ①滑块/摇杆原始数据 ②乘完系数的发送值 ③包装后的整帧字节(联调结束可移除)
|
||||
_logger.logWithLevel(
|
||||
'🔗 [联调-0x00] 遥控发送明细\n'
|
||||
'① 滑块/摇杆原始数据: x=${status.originX} y=${status.originY} '
|
||||
'lift=${status.chassisLift} mower=${status.mowerSpeed} '
|
||||
'ignition=${status.ignitionStatus} emergency=${status.isEmergency ? 1 : 0}\n'
|
||||
'② 乘后发送值: linear=${linear.toStringAsFixed(3)} m/s, angular=${angular.toStringAsFixed(3)} rad/s\n'
|
||||
'③ 包装后整帧(27字节): ab aa 00 | ${_hex(payload.sublist(0, 8))} | '
|
||||
'${_hex(payload.sublist(8, 16))} | ${_hex(payload.sublist(16, 20))} | 00 00 | aa ab\n'
|
||||
' 包头+cmd | linear@帧[3..10] | angular@帧[11..18] | '
|
||||
'lift,mower,ignition,emergency@帧[19..22] | CRC | 包尾',
|
||||
shouldLog: true,
|
||||
);
|
||||
|
||||
// 3. 调用 TcpClient 发送指令
|
||||
_tcpClient.sendRaw(MachineProtocolConstants.cmdRemoteControl, payload);
|
||||
}
|
||||
|
||||
/// 字节转十六进制字符串,供联调对包使用
|
||||
String _hex(List<int> bytes) =>
|
||||
bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join(' ');
|
||||
|
||||
@override
|
||||
Stream<RawPacket> get responseStream => _tcpClient.packetStream;
|
||||
|
||||
|
||||
62
lib/features/remote_control/data/reverse_camera_source.dart
Normal file
62
lib/features/remote_control/data/reverse_camera_source.dart
Normal file
@@ -0,0 +1,62 @@
|
||||
import 'dart:async';
|
||||
import 'dart:math' as math;
|
||||
|
||||
import '../domain/entities/reverse_camera_data.dart';
|
||||
|
||||
/// 倒车影像数据源抽象:UI/Cubit 只依赖这个流,不关心数据真假。
|
||||
abstract class ReverseCameraSource {
|
||||
Stream<ReverseCameraData> get dataStream;
|
||||
void start();
|
||||
Future<void> stop();
|
||||
}
|
||||
|
||||
/// Mock 源:嵌入式未就绪前,制造会“动起来”的假数据用于联调动画。
|
||||
///
|
||||
/// 将来接入真实数据时,只需在 Cubit 里把这里换成基于
|
||||
/// MQTT vehicleStream / TCP 0x02 回包解析的实现类,其余 UI / state 全不动。
|
||||
class MockReverseCameraSource implements ReverseCameraSource {
|
||||
final StreamController<ReverseCameraData> _controller =
|
||||
StreamController<ReverseCameraData>.broadcast();
|
||||
Timer? _timer;
|
||||
final math.Random _rnd = math.Random();
|
||||
int _tick = 0;
|
||||
|
||||
@override
|
||||
Stream<ReverseCameraData> get dataStream => _controller.stream;
|
||||
|
||||
@override
|
||||
void start() {
|
||||
stop();
|
||||
// ~15Hz 推送,动画足够顺滑;将来真数据 5~10Hz 也够用。
|
||||
_timer = Timer.periodic(const Duration(milliseconds: 66), (Timer t) {
|
||||
_tick++;
|
||||
// 转向角做正弦摆动(模拟倒车打方向),速度小幅抖动,距离缓慢变化便于测颜色刻度。
|
||||
final double sway = math.sin(_tick / 6.0) * 28.0; // -28° ~ +28°
|
||||
final double speed = 0.3 + _rnd.nextDouble() * 0.5; // 0.3 ~ 0.8 m/s
|
||||
final int dist = 40 + (_tick % 160); // 40 ~ 199cm,循环变化
|
||||
_controller.add(
|
||||
ReverseCameraData(
|
||||
gear: 2, // 假数据默认处于“倒车挡”,进页面即可看到动画
|
||||
steeringAngle: sway,
|
||||
speed: speed,
|
||||
rearDistanceCm: dist,
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> stop() async {
|
||||
_timer?.cancel();
|
||||
_timer = null;
|
||||
if (!_controller.isClosed) {
|
||||
_controller.add(const ReverseCameraData.idle());
|
||||
}
|
||||
}
|
||||
|
||||
/// 释放流控制器(Cubit close 时调用,避免资源泄漏)。
|
||||
Future<void> dispose() async {
|
||||
await stop();
|
||||
await _controller.close();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
/// 倒车影像数据契约:将来嵌入式实时回传的字段就映射到这里。
|
||||
///
|
||||
/// 嵌入式协议对齐清单(按这些语义推送即可):
|
||||
/// - gear:挡位。0=停车/空挡, 1=前进, 2=倒车。
|
||||
/// - steeringAngle:当前转向角,单位度,范围 -45(左)~+45(右),0=正后。
|
||||
/// - speed:当前实际速度,单位 m/s(>=0),预留给引导线流速等扩展动画。
|
||||
/// - rearDistanceCm:后部障碍物距离(厘米),null 表示无测距传感器。
|
||||
class ReverseCameraData extends Equatable {
|
||||
final int gear;
|
||||
final double steeringAngle;
|
||||
final double speed;
|
||||
final int? rearDistanceCm;
|
||||
|
||||
const ReverseCameraData({
|
||||
this.gear = 0,
|
||||
this.steeringAngle = 0,
|
||||
this.speed = 0,
|
||||
this.rearDistanceCm,
|
||||
});
|
||||
|
||||
/// 初始/待机态:不显示倒车引导线。
|
||||
const ReverseCameraData.idle()
|
||||
: gear = 0,
|
||||
steeringAngle = 0,
|
||||
speed = 0,
|
||||
rearDistanceCm = null;
|
||||
|
||||
/// 是否处于倒车挡(引导线显示的唯一开关)。
|
||||
bool get isReversing => gear == 2;
|
||||
|
||||
ReverseCameraData copyWith({
|
||||
int? gear,
|
||||
double? steeringAngle,
|
||||
double? speed,
|
||||
int? rearDistanceCm,
|
||||
}) {
|
||||
return ReverseCameraData(
|
||||
gear: gear ?? this.gear,
|
||||
steeringAngle: steeringAngle ?? this.steeringAngle,
|
||||
speed: speed ?? this.speed,
|
||||
rearDistanceCm: rearDistanceCm ?? this.rearDistanceCm,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => [gear, steeringAngle, speed, rearDistanceCm];
|
||||
}
|
||||
@@ -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) {
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:maibu_satabot_v2/features/devices/domain/entities/device_entity.
|
||||
import 'package:maibu_satabot_v2/features/remote_control/data/models/running_status_model.dart';
|
||||
|
||||
import '../../domain/entities/machine_control_status_entity.dart';
|
||||
import '../../domain/entities/reverse_camera_data.dart';
|
||||
|
||||
enum RemoteControlStatus { initial, controlling, error }
|
||||
|
||||
@@ -32,6 +33,9 @@ class RemoteControlState extends Equatable {
|
||||
final DeviceEntity? targetDevice;
|
||||
final bool hasReceivedStatusPush; // 是否收到过设备状态推送
|
||||
|
||||
// 🔥 倒车影像数据(来自 ReverseCameraSource:现为 Mock,嵌入式就绪后接真实回传)
|
||||
final ReverseCameraData reverseCamera;
|
||||
|
||||
// 🔥 状态更新类型标记 - 用于区分是设备状态更新还是弹窗状态更新
|
||||
final String? updateType;
|
||||
|
||||
@@ -59,6 +63,7 @@ class RemoteControlState extends Equatable {
|
||||
this.obstacleRecognitionFlag = true,
|
||||
this.targetDevice,
|
||||
this.updateType,
|
||||
this.reverseCamera = const ReverseCameraData.idle(),
|
||||
});
|
||||
|
||||
// 便利 UI 更新部分属性
|
||||
@@ -86,6 +91,7 @@ class RemoteControlState extends Equatable {
|
||||
bool? obstacleRecognitionFlag,
|
||||
DeviceEntity? targetDevice,
|
||||
String? updateType,
|
||||
ReverseCameraData? reverseCamera,
|
||||
}) {
|
||||
return RemoteControlState(
|
||||
status: status ?? this.status,
|
||||
@@ -113,6 +119,7 @@ class RemoteControlState extends Equatable {
|
||||
obstacleRecognitionFlag ?? this.obstacleRecognitionFlag,
|
||||
targetDevice: targetDevice ?? this.targetDevice,
|
||||
updateType: updateType, // 不使用 ??,因为我们想要 null 的时候就是 null
|
||||
reverseCamera: reverseCamera ?? this.reverseCamera,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -141,5 +148,6 @@ class RemoteControlState extends Equatable {
|
||||
obstacleRecognitionFlag,
|
||||
targetDevice,
|
||||
updateType,
|
||||
reverseCamera,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ import '../widgets/center_control_area.dart';
|
||||
import '../widgets/emergency_overlay.dart';
|
||||
import '../widgets/left_joystick_area.dart';
|
||||
import '../widgets/right_joystick_area.dart';
|
||||
import '../widgets/driving_guide_overlay.dart';
|
||||
import '../widgets/top_status_bar.dart';
|
||||
import '../widgets/webrtc/webrtc_local_player.dart';
|
||||
|
||||
@@ -95,7 +96,7 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
super.initState();
|
||||
// 🔥 进入安全模式:防止异地登录推送导致控制中断
|
||||
GetIt.I<AuthCubit>().enterSafeMode();
|
||||
|
||||
|
||||
// 1. 锁定横屏
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.landscapeLeft,
|
||||
@@ -107,6 +108,10 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
final remoteCubit = context.read<RemoteControlCubit>();
|
||||
|
||||
// 🔥 倒车影像:现阶段改用摇杆(滑块)数据驱动,不再启动 Mock 假数据源。
|
||||
// 恢复 Mock:取消下行注释即可(需与 cubit 里 _syncReverseCameraFromJoystick 的调用二选一)。
|
||||
// remoteCubit.startReverseCameraMock();
|
||||
|
||||
// debugPrint('🔍 [RemoteControl] initState - targetDevice: ${remoteCubit.state.targetDevice}');
|
||||
|
||||
// 🔥 检查 targetDevice 是否存在
|
||||
@@ -125,7 +130,7 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
void dispose() {
|
||||
// 🔥 离开安全模式:启动 90 秒倒计时
|
||||
GetIt.I<AuthCubit>().exitSafeMode();
|
||||
|
||||
|
||||
// 释放远程控制权限(type=2:退出远程遥控页面释放)
|
||||
final deviceId = _cubit.state.targetDevice?.deviceName;
|
||||
if (deviceId != null && deviceId.isNotEmpty) {
|
||||
@@ -141,6 +146,7 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
_cubit.stopControlLoop();
|
||||
_cubit.stopReverseCameraMock(); // 🔥 停止倒车影像 Mock,避免定时器空转
|
||||
// 🔥 重置权限状态,避免单例 hasPermission 残留导致下次进入不再查询接口
|
||||
_cubit.resetPermissionState();
|
||||
super.dispose();
|
||||
@@ -153,7 +159,9 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
final targetDevice = remoteCubit.state.targetDevice;
|
||||
|
||||
// 🔥 调试日志:检查设备状态
|
||||
debugPrint('🔍 [RemoteControlPage] build - targetDevice: ${targetDevice?.deviceName}');
|
||||
debugPrint(
|
||||
'🔍 [RemoteControlPage] build - targetDevice: ${targetDevice?.deviceName}',
|
||||
);
|
||||
|
||||
if (targetDevice == null) {
|
||||
debugPrint('❌ [RemoteControlPage] targetDevice 为空,显示离线页面');
|
||||
@@ -167,7 +175,9 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
final deviceName = targetDevice.deviceName;
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted && deviceName.isNotEmpty) {
|
||||
debugPrint('🔑 [RemoteControlPage] 进入页面,仅查询权限状态 - deviceName: $deviceName');
|
||||
debugPrint(
|
||||
'🔑 [RemoteControlPage] 进入页面,仅查询权限状态 - deviceName: $deviceName',
|
||||
);
|
||||
remoteCubit.requestControlPermissionS(
|
||||
deviceName,
|
||||
'app',
|
||||
@@ -186,6 +196,7 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
Positioned.fill(
|
||||
child: BlocBuilder<RemoteControlCubit, RemoteControlState>(
|
||||
// 只有当显示隐藏状态改变时才重构,内部的拖拽由组件自身 State 处理,不影响这里
|
||||
// 🔥 倒车引导线放在单独嵌套 BlocBuilder 里实时刷新,不带着整块视频重建
|
||||
buildWhen: (p, c) =>
|
||||
p.showLeftPip != c.showLeftPip ||
|
||||
p.showRightPip != c.showRightPip,
|
||||
@@ -219,17 +230,36 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
.controlEntity
|
||||
.originY;
|
||||
// debugPrint("${originY},originY");
|
||||
return WebRTCLocalPlayer(
|
||||
streamUrl: _videoStreamUrl,
|
||||
showLeftPip: state.showLeftPip,
|
||||
showRightPip: state.showRightPip,
|
||||
isFrontMain: originY >= 0,
|
||||
onDoubleTap: () {
|
||||
debugPrint('👆 [RemoteControlPage] 双击屏幕,切换前后视角');
|
||||
// 🔥 通过 TCP 发送切换视角指令
|
||||
// 这里需要调用 RemoteControlCubit 的方法来切换视角
|
||||
context.read<RemoteControlCubit>().toggleCameraView();
|
||||
},
|
||||
return Stack(
|
||||
children: [
|
||||
WebRTCLocalPlayer(
|
||||
streamUrl: _videoStreamUrl,
|
||||
showLeftPip: state.showLeftPip,
|
||||
showRightPip: state.showRightPip,
|
||||
isFrontMain: originY >= 0,
|
||||
onDoubleTap: () {
|
||||
debugPrint('👆 [RemoteControlPage] 双击屏幕,切换前后视角');
|
||||
// 🔥 通过 TCP 发送切换视角指令
|
||||
// 这里需要调用 RemoteControlCubit 的方法来切换视角
|
||||
context.read<RemoteControlCubit>().toggleCameraView();
|
||||
},
|
||||
),
|
||||
// 🔥 倒车影像引导线动画层:由摇杆(滑块)数据实时驱动。
|
||||
// 嵌套 BlocBuilder 监听完整 reverseCamera,转向/挡位一变就重绘,确保跟手。
|
||||
// IgnorePointer 不阻挡双击切视角等手势
|
||||
BlocBuilder<RemoteControlCubit, RemoteControlState>(
|
||||
buildWhen: (p, c) => p.reverseCamera != c.reverseCamera,
|
||||
builder: (context, rs) => rs.reverseCamera.isReversing
|
||||
? Positioned.fill(
|
||||
child: IgnorePointer(
|
||||
child: DrivingGuideOverlay(
|
||||
steering: rs.reverseCamera.steeringAngle,
|
||||
),
|
||||
),
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
@@ -540,5 +570,4 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
|
||||
}
|
||||
|
||||
/// 🔥 显示当前控制设备的弹窗 - 已移除:进入远程遥控页不再弹出设备确认弹窗
|
||||
|
||||
}
|
||||
|
||||
@@ -28,19 +28,23 @@ class _LeftJoystickAreaState extends State<LeftJoystickArea> {
|
||||
|
||||
/// 检查是否可以控制,不能则弹出提示
|
||||
bool _checkCanControl(BuildContext context) {
|
||||
final cubit = context.read<RemoteControlCubit>();
|
||||
if (!cubit.isStatusPushActive()) {
|
||||
if (!_hasShownNoPushDialog) {
|
||||
_hasShownNoPushDialog = true;
|
||||
_showNoStatusPushDialog(context);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
_hasShownNoPushDialog = false;
|
||||
// 🔥 临时关闭「未收到推送不能控制」门槛,便于机器未开时用 Mock 假数据联调倒车影像。
|
||||
// 联调完成后取消下面注释即可恢复。切勿删除本段逻辑。
|
||||
// final cubit = context.read<RemoteControlCubit>();
|
||||
// if (!cubit.isStatusPushActive()) {
|
||||
// if (!_hasShownNoPushDialog) {
|
||||
// _hasShownNoPushDialog = true;
|
||||
// _showNoStatusPushDialog(context);
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
// _hasShownNoPushDialog = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// 显示暂未收到推送的提示弹窗(小圆角)
|
||||
/// 🔥 门槛已临时注释,本方法暂未被调用:保留勿删,恢复门槛后即生效。
|
||||
// ignore: unused_element
|
||||
void _showNoStatusPushDialog(BuildContext context) {
|
||||
showDialog(
|
||||
context: context,
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
import 'dart:math' as math;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../domain/entities/reverse_camera_data.dart';
|
||||
|
||||
/// 倒车影像引导线动画层:叠在视频画面之上,仅倒车挡时显示。
|
||||
///
|
||||
/// 动画由两部分驱动:
|
||||
/// - 嵌入式回传数据([ReverseCameraData]):转向角 → 引导线绕底部顶点弯成圆弧,
|
||||
/// 距离 → 颜色刻度;
|
||||
/// - 本地 AnimationController:横向刻度线的流动虚线,营造“行进中”的动感。
|
||||
class ReverseGuideOverlay extends StatefulWidget {
|
||||
final ReverseCameraData data;
|
||||
|
||||
const ReverseGuideOverlay({super.key, required this.data});
|
||||
|
||||
@override
|
||||
State<ReverseGuideOverlay> createState() => _ReverseGuideOverlayState();
|
||||
}
|
||||
|
||||
class _ReverseGuideOverlayState extends State<ReverseGuideOverlay>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late final AnimationController _ticker;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_ticker = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(milliseconds: 1200),
|
||||
)..repeat();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_ticker.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (!widget.data.isReversing) return const SizedBox.shrink();
|
||||
return RepaintBoundary(
|
||||
child: AnimatedBuilder(
|
||||
animation: _ticker,
|
||||
builder: (BuildContext context, Widget? child) => CustomPaint(
|
||||
size: Size.infinite,
|
||||
painter: _GuidePainter(data: widget.data, dashPhase: _ticker.value),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _GuidePainter extends CustomPainter {
|
||||
final ReverseCameraData data;
|
||||
final double dashPhase;
|
||||
|
||||
_GuidePainter({required this.data, required this.dashPhase});
|
||||
|
||||
/// 近端(画面底部)纵向位置比例 = 引导线的固定顶点(锚在车尾)
|
||||
static const double _nearT = 0.98;
|
||||
|
||||
/// 远端(收束线)纵向位置比例
|
||||
static const double _farT = 0.45;
|
||||
|
||||
/// 满舵时的总转角(弧度):越大弯得越急,约 34°;嫌弯不够调大、嫌夸张调小。
|
||||
static const double _maxHeading = 0.6;
|
||||
|
||||
@override
|
||||
void paint(Canvas canvas, Size size) {
|
||||
final double w = size.width;
|
||||
final double h = size.height;
|
||||
|
||||
final double bottomY = h * _nearT;
|
||||
final double len = bottomY - h * _farT;
|
||||
|
||||
// 转向比例:-1 满左、+1 满右、0 直行;映射为有符号总转角(决定弯向与弯度)
|
||||
final double turn = (data.steeringAngle / 45.0).clamp(-1.0, 1.0);
|
||||
final double totalHeading = turn * _maxHeading;
|
||||
|
||||
const int steps = 40;
|
||||
final double ds = len / steps;
|
||||
|
||||
// 航向积分采样中心线:起点在底部正中、初始竖直向上,逐段累加航向 → 等曲率圆弧
|
||||
final List<Offset> pts = <Offset>[];
|
||||
final List<double> heads = <double>[];
|
||||
double x = w / 2;
|
||||
double y = bottomY;
|
||||
double th = 0;
|
||||
for (int i = 0; i <= steps; i++) {
|
||||
pts.add(Offset(x, y));
|
||||
heads.add(th);
|
||||
x += math.sin(th) * ds;
|
||||
y -= math.cos(th) * ds;
|
||||
th += totalHeading / steps;
|
||||
}
|
||||
|
||||
final double rootHalf = w * 0.16;
|
||||
final double farHalf = w * 0.30;
|
||||
final Color color = _colorByDistance(data.rearDistanceCm);
|
||||
|
||||
// 中心线沿法线各偏移半宽 = 左右导轨(近窄远宽,转弯时通道宽度守恒)
|
||||
Offset rail(int i, double sign) {
|
||||
final double f = i / steps;
|
||||
final double half = rootHalf + (farHalf - rootHalf) * f;
|
||||
final Offset normal = Offset(math.cos(heads[i]), math.sin(heads[i]));
|
||||
return pts[i] + normal * (half * sign);
|
||||
}
|
||||
|
||||
final Paint sidePaint = Paint()
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = math.max(3.0, w * 0.006)
|
||||
..strokeCap = StrokeCap.round
|
||||
..color = color
|
||||
..maskFilter = const MaskFilter.blur(BlurStyle.solid, 2);
|
||||
|
||||
for (final double sign in const <double>[-1.0, 1.0]) {
|
||||
final Offset p0 = rail(0, sign);
|
||||
final Path path = Path()..moveTo(p0.dx, p0.dy);
|
||||
for (int i = 1; i <= steps; i++) {
|
||||
final Offset r = rail(i, sign);
|
||||
path.lineTo(r.dx, r.dy);
|
||||
}
|
||||
canvas.drawPath(path, sidePaint);
|
||||
}
|
||||
|
||||
final Paint dashPaint = Paint()
|
||||
..style = PaintingStyle.stroke
|
||||
..strokeWidth = math.max(2.0, w * 0.004)
|
||||
..color = color.withValues(alpha: 0.9);
|
||||
|
||||
// 横向刻度线:沿法线连接左右导轨;每条错开相位,虚线像“往外流动”
|
||||
const List<double> stops = [0.0, 0.34, 0.63, 0.86];
|
||||
for (int k = 0; k < stops.length; k++) {
|
||||
final int i = (stops[k] * steps).round().clamp(0, steps);
|
||||
_drawDashedLine(
|
||||
canvas,
|
||||
rail(i, -1.0),
|
||||
rail(i, 1.0),
|
||||
dashPaint,
|
||||
(dashPhase + k * 0.25) % 1.0,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
void _drawDashedLine(
|
||||
Canvas canvas,
|
||||
Offset a,
|
||||
Offset b,
|
||||
Paint paint,
|
||||
double phase,
|
||||
) {
|
||||
final double len = (b - a).distance;
|
||||
if (len <= 0) return;
|
||||
const double dash = 18.0;
|
||||
const double gap = 14.0;
|
||||
final Offset dir = (b - a) / len;
|
||||
double pos = phase * (dash + gap);
|
||||
while (pos < len) {
|
||||
final double segEnd = math.min(pos + dash, len);
|
||||
canvas.drawLine(a + dir * pos, a + dir * segEnd, paint);
|
||||
pos += dash + gap;
|
||||
}
|
||||
}
|
||||
|
||||
Color _colorByDistance(int? cm) {
|
||||
if (cm == null) return const Color(0xFF35D07F); // 无测距默认绿
|
||||
if (cm < 80) return const Color(0xFFFF4D4D); // 红:危险
|
||||
if (cm < 150) return const Color(0xFFFFC61A); // 黄:警告
|
||||
return const Color(0xFF35D07F); // 绿:安全
|
||||
}
|
||||
|
||||
@override
|
||||
bool shouldRepaint(covariant _GuidePainter oldDelegate) =>
|
||||
oldDelegate.data.steeringAngle != data.steeringAngle ||
|
||||
oldDelegate.data.rearDistanceCm != data.rearDistanceCm ||
|
||||
oldDelegate.data.gear != data.gear ||
|
||||
oldDelegate.dashPhase != dashPhase;
|
||||
}
|
||||
@@ -27,19 +27,23 @@ class _RightJoystickAreaState extends State<RightJoystickArea> {
|
||||
|
||||
/// 检查是否可以控制,不能则弹出提示
|
||||
bool _checkCanControl(BuildContext context) {
|
||||
final cubit = context.read<RemoteControlCubit>();
|
||||
if (!cubit.isStatusPushActive()) {
|
||||
if (!_hasShownNoPushDialog) {
|
||||
_hasShownNoPushDialog = true;
|
||||
_showNoStatusPushDialog(context);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
_hasShownNoPushDialog = false;
|
||||
// 🔥 临时关闭「未收到推送不能控制」门槛,便于机器未开时用 Mock 假数据联调倒车影像。
|
||||
// 联调完成后取消下面注释即可恢复。切勿删除本段逻辑。
|
||||
// final cubit = context.read<RemoteControlCubit>();
|
||||
// if (!cubit.isStatusPushActive()) {
|
||||
// if (!_hasShownNoPushDialog) {
|
||||
// _hasShownNoPushDialog = true;
|
||||
// _showNoStatusPushDialog(context);
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
// _hasShownNoPushDialog = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// 显示暂未收到推送的提示弹窗(小圆角)
|
||||
/// 🔥 门槛已临时注释,本方法暂未被调用:保留勿删,恢复门槛后即生效。
|
||||
// ignore: unused_element
|
||||
void _showNoStatusPushDialog(BuildContext context) {
|
||||
showDialog(
|
||||
context: context,
|
||||
|
||||
Reference in New Issue
Block a user