完成web和app权限交换

This commit is contained in:
2026-03-16 15:31:14 +08:00
parent 14df0bc041
commit c0bf6a7a41
5 changed files with 189 additions and 27 deletions

View File

@@ -26,6 +26,7 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
),
) {
_initPacketListener();
}
// 1. 初始化回包监听 (如 0x12 权限)
@@ -56,16 +57,52 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
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));
// 🔥 区分两种数据格式
final requestType = jsonMap['request'];
final platform = jsonMap['platform'];
final respondData = jsonMap['respond'];
print('>>> [RemoteControl] 📋 requestType=$requestType, platform=$platform');
// 情况 1: 响应格式 - {"respond":{"switchResult":true,"deviceId":"...","holder":"you"}}
if (respondData != null && respondData is Map) {
final switchResult = respondData['switchResult'];
print('>>> [RemoteControl] 📊 收到切换结果响应:switchResult = $switchResult');
if (!isClosed) {
if (switchResult == true) {
// 切换成功,当前 APP 失去控制权
emit(state.copyWith(hasPermission: true, showPermissionRequestDialog: false));
print('>>> [RemoteControl] ✅ 权限已切');
} else {
// 切换失败或拒绝,保持当前状态
emit(state.copyWith(showPermissionRequestDialog: false));
print('>>> [RemoteControl] ❌ 权限切换失败/被拒绝');
}
}
}
// 情况 2: 请求格式 - {"request":"switch_control","deviceId":"...","platform":"web",...}
else if (requestType == 'switch_control') {
// 🔥 关键判断:只有当是其他平台(web)请求时才弹窗
if (platform != null && platform.toString().toLowerCase() != 'app') {
print('>>> [RemoteControl] 🚨 $platform 端请求控制权,打开弹窗询问用户');
if (!isClosed) {
emit(state.copyWith(showPermissionRequestDialog: true));
}
} else {
print('>>> [RemoteControl] ℹ️ APP 自己的请求回显,忽略不弹窗');
}
}
// 情况 3: 异地登录通知 - {"request":"have_logged_in",...}
else if (requestType == 'have_logged_in') {
print('>>> [RemoteControl] ⚠️ 检测到异地登录,打开弹窗提示');
if (!isClosed) {
emit(state.copyWith(showPermissionRequestDialog: true));
}
}
else {
print('>>> [RemoteControl] ℹ️ 未知类型的 0x12 包,忽略');
}
} catch (e) {
print('>>> [RemoteControl] ❌ 解析失败:$e');
@@ -75,6 +112,7 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
print('>>> [RemoteControl] ✅ 0x12 监听器已建立完成');
}
// 2. 开启 100ms 控制循环 (在进入遥控页面或点击“开始”时调用)
void startControlLoop() {
_timer?.cancel();
@@ -153,7 +191,24 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
void updateEmergency(bool bool) {}
void respondPermission(bool bool) {}
void respondPermission(bool bool, String deviceId) {
emit(state.copyWith(showPermissionRequestDialog: false));
// 2. 发送响应到服务端
_repository.respondPermission(bool, deviceId);
// 3. 根据用户选择更新控制状态
if (bool) {
// 用户同意 → APP 失去控制权,Web 端获得控制权
emit(state.copyWith(hasPermission: false));
//路由到首页home
} else {
// 用户拒绝 → APP 继续保持控制权
emit(state.copyWith(hasPermission: true));
}
}
void requestControlPermissionS(String deviceName, String deviceId) async {
// 1. 关闭弹窗
@@ -193,5 +248,7 @@ class RemoteControlCubit extends Cubit<RemoteControlState> {
}

View File

@@ -5,6 +5,7 @@ import 'package:go_router/go_router.dart';
import 'package:maibu_satabot_v2/core/consts/tcp_consts.dart';
import '../../../../core/app/app_user_cubit.dart';
import '../../../../core/router/route_paths.dart';
import '../../../devices/presentation/bloc/devices_cubit.dart';
import '../bloc/remote_control_cubit.dart';
import '../bloc/remote_control_state.dart';
@@ -51,11 +52,12 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
final deviceState = context.watch<DevicesCubit>().state;
final currentDevice = deviceState.selectedDevice;
context.read<RemoteControlCubit>().requestControlPermissionS(currentDevice!.deviceName, "app");
///context.read<RemoteControlCubit>().requestControlPermissionS(currentDevice!.deviceName, "app");
if (currentDevice == null) {
return _buildOfflineScaffold();
}
context.read<RemoteControlCubit>().requestControlPermissionS(currentDevice!.deviceName, "app");
return Scaffold(
backgroundColor: Colors.black,
@@ -185,14 +187,27 @@ class _RemoteControlPageState extends State<RemoteControlPage> {
}
Widget _buildPermissionDialog(BuildContext context, RemoteControlState state) {
final deviceId = context.read<DevicesCubit>().state.selectedDevice?.deviceName ?? "";
return Container(
color: Colors.black54,
child: AlertDialog(
title: const Text("权限变更"),
content: Text("${state.permissionPlatform}端正请求控制权,同意释放吗?"),
// content: Text("${state.permissionPlatform}端正请求控制权,同意释放吗?"),
content: Text("web端正请求控制权,同意释放吗?"),
actions: [
TextButton(onPressed: () => context.read<RemoteControlCubit>().respondPermission(false), child: const Text("拒绝")),
TextButton(onPressed: () => context.read<RemoteControlCubit>().respondPermission(true), child: const Text("同意")),
TextButton(onPressed: () => context.read<RemoteControlCubit>().respondPermission(false,deviceId), child: const Text("拒绝")),
TextButton(
onPressed: () {
context.read<RemoteControlCubit>().respondPermission(true, deviceId);
// 🔥 用户同意,延迟跳转到首页
// Future.delayed(const Duration(milliseconds: 1000), () {
// if (context.mounted) {
// context.go(RoutePaths.home);
// }
// });
},
child: const Text("同意"),
),
],
),
);