USB 摄像头+远程遥控+中英的适配+topic的集成和状态的使用到相应页面
This commit is contained in:
@@ -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> {
|
||||
}
|
||||
|
||||
/// 🔥 显示当前控制设备的弹窗 - 已移除:进入远程遥控页不再弹出设备确认弹窗
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user