完成web和app权限交换-初步
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:ffi';
|
||||
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:maibu_satabot_v2/features/remote_control/data/models/running_status_model.dart';
|
||||
import 'package:maibu_satabot_v2/features/remote_control/presentation/bloc/remote_control_state.dart';
|
||||
|
||||
import '../../../../core/network/net_message_dispatcher.dart';
|
||||
import '../../domain/entities/machine_control_status_entity.dart';
|
||||
import '../../domain/repositories/remote_control_repository.dart';
|
||||
import '../../domain/usecase/remote_control_usecase.dart';
|
||||
@@ -12,8 +15,10 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
final RemoteControlRepository _repository;
|
||||
final RequestControlPermissionUseCase _requestControlPermissionUseCase;
|
||||
Timer? _timer;
|
||||
StreamSubscription? _kickOutSub; // 新增:用于管理监听生命周期
|
||||
final NetMessageDispatcher dispatcher;
|
||||
|
||||
RemoteControlCubit(this._repository, this._requestControlPermissionUseCase)
|
||||
RemoteControlCubit(this._repository, this._requestControlPermissionUseCase, this.dispatcher)
|
||||
: super(
|
||||
RemoteControlState(
|
||||
controlEntity: MachineControlStatusEntity(),
|
||||
@@ -24,13 +29,50 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
}
|
||||
|
||||
// 1. 初始化回包监听 (如 0x12 权限)
|
||||
// void _initPacketListener() {
|
||||
// _repository.responseStream.listen((packet) {
|
||||
// if (packet.command == 0x12) {
|
||||
// // 根据负载判断是否有权限,更新状态
|
||||
// emit(state.copyWith(hasPermission: true));
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
void _initPacketListener() {
|
||||
_repository.responseStream.listen((packet) {
|
||||
if (packet.command == 0x12) {
|
||||
// 根据负载判断是否有权限,更新状态
|
||||
emit(state.copyWith(hasPermission: true));
|
||||
print('>>> [RemoteControl] begin 初始化 0x12 监听器');
|
||||
_kickOutSub?.cancel(); // 防止重复监听
|
||||
|
||||
_kickOutSub = dispatcher.onCommand(0x12).listen((packet) {
|
||||
print('>>> [RemoteControl] 收到 0x12 原始包,payload 长度=${packet.payload.length}');
|
||||
|
||||
try {
|
||||
// 🔥 关键:手动去掉最后 2 个 CRC 字节
|
||||
String jsonString;
|
||||
if (packet.payload.length > 2) {
|
||||
jsonString = utf8.decode(packet.payload.sublist(0, packet.payload.length - 2));
|
||||
} else {
|
||||
jsonString = utf8.decode(packet.payload);
|
||||
}
|
||||
|
||||
print('>>> [RemoteControl] 去除 CRC 后的 JSON: $jsonString');
|
||||
|
||||
final jsonMap = jsonDecode(jsonString);
|
||||
final respond = jsonMap['request'] ?? '';
|
||||
print('>>> [RemoteControl] ✅ 响应结果:$respond');
|
||||
// 🔥 当 Web 端推送 switch_control 权限时,更新状态触发弹窗
|
||||
if (respond == 'switch_control') {
|
||||
print('>>> [RemoteControl] ✅ 获得控制权 (respond=switch_control),准备打开弹窗');
|
||||
emit(state.copyWith(hasPermission: true, showPermissionRequestDialog: true));
|
||||
} else if (respond == 'have_logged_in') {
|
||||
// 如果是异地登录,也显示弹窗提示
|
||||
print('>>> [RemoteControl] ⚠️ 检测到异地登录');
|
||||
emit(state.copyWith(showPermissionRequestDialog: true));
|
||||
}
|
||||
} catch (e) {
|
||||
print('>>> [RemoteControl] ❌ 解析失败:$e');
|
||||
}
|
||||
});
|
||||
|
||||
print('>>> [RemoteControl] ✅ 0x12 监听器已建立完成');
|
||||
}
|
||||
|
||||
// 2. 开启 100ms 控制循环 (在进入遥控页面或点击“开始”时调用)
|
||||
@@ -134,8 +176,15 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
|
||||
},
|
||||
(success) {
|
||||
emit(state.copyWith(hasPermission: true));
|
||||
print('✅ c:$success');
|
||||
// 更新状态
|
||||
print('✅ [RemoteControl] 请求控制权限成功:$success');
|
||||
///处理result
|
||||
if(success){
|
||||
emit(state.copyWith(hasPermission: true));
|
||||
}else{
|
||||
emit(state.copyWith(hasPermission: false));
|
||||
}
|
||||
print('✅ c:$success');
|
||||
// 权限申请已发送,等待 0x12 回包更新状态
|
||||
},
|
||||
);
|
||||
@@ -143,4 +192,6 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user