完成修复登录缓慢问题-主要接口响应时间决定
完成切换设备机器状态的实时接受和UI实时刷新 完成优化tcp重连的体检,手动切换设备或自动断开后重连的区分
This commit is contained in:
@@ -164,9 +164,10 @@ Future<void> init() async {
|
||||
/// 5. 状态管理 (Cubit/Bloc)
|
||||
sl.registerLazySingleton(() => AppUserCubit()); // AuthCubit 依赖它,必须先注册
|
||||
sl.registerLazySingleton(() => GetDeviceLocationUseCase(sl()));
|
||||
sl.registerLazySingleton(() => DevicesCubit(sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl()));
|
||||
sl.registerLazySingleton(() => DevicesCubit(sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(), sl(),sl(),sl()));
|
||||
sl.registerFactory(() => RemoteControlCubit(sl()));
|
||||
/* // 工厂模式(留存,每次获取新实例)
|
||||
|
||||
sl.registerFactory(() => DeviceStatusBloc(sl<NetMessageDispatcher>()));
|
||||
*/
|
||||
//单例模式(全局共享一个实例)
|
||||
|
||||
@@ -33,11 +33,28 @@ class TcpClient {
|
||||
|
||||
String? _lastHost;
|
||||
int? _lastPort;
|
||||
bool isUserSwitch = false; // 用户是否切换设备
|
||||
bool _isSwitching = false;
|
||||
|
||||
final UserStorage _userStorage;
|
||||
|
||||
bool get isConnected => _socket != null;
|
||||
void disconnects({bool forSwitch = false}) {
|
||||
if (forSwitch) {
|
||||
_isSwitching = true;
|
||||
debugPrint('🚫 [TCP] 标记为切换断开,将禁止自动重连');
|
||||
}
|
||||
|
||||
// 🔥 关键:立即取消可能已经存在或即将触发的重连定时器
|
||||
_reconnectTimer?.cancel();
|
||||
_heartbeatTimer?.cancel();
|
||||
|
||||
if (_socket != null) {
|
||||
debugPrint('🔌 [TCP] 物理断开 Socket...');
|
||||
_socket!.destroy(); // 或者 .close()
|
||||
_socket = null;
|
||||
}
|
||||
}
|
||||
// 通过参数配置,不硬编码
|
||||
Future<void> connect({required String host, required int port}) async {
|
||||
debugPrint('🔌 [TCP] 开始连接:$host:$port'); // ✅ 必须看到这条
|
||||
@@ -89,19 +106,29 @@ class TcpClient {
|
||||
},
|
||||
onDone: (){
|
||||
// TODO: 断线重连
|
||||
debugPrint('onDone❌ [TCP] 连接已断开!');
|
||||
debugPrint('来到断线重连!');
|
||||
if (!_isSwitching) {
|
||||
debugPrint('onDone❌ [TCP] 连接已断开!');
|
||||
_handleDisconnect();
|
||||
}
|
||||
_isSwitching = false; // 重置标志,以免影响下次
|
||||
|
||||
},
|
||||
onError: (e) {
|
||||
debugPrint('❌ [TCP] 发生错误:$e');
|
||||
_handleDisconnect(); // 统一走重连逻辑,保护 Controller 不被关闭
|
||||
debugPrint('来到断线重连!error');
|
||||
if (!_isSwitching) {
|
||||
debugPrint('❌ [TCP] 发生错误:$e');
|
||||
_handleDisconnect();
|
||||
} // 统一走重连逻辑,保护 Controller 不被关闭
|
||||
_isSwitching = false; // 重置标志,以免影响下次
|
||||
|
||||
},
|
||||
);
|
||||
} catch (e) {
|
||||
rethrow; // 向上抛出连接异常
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
void _handleDisconnect() {
|
||||
stopHeartbeat();
|
||||
|
||||
@@ -113,6 +140,7 @@ class TcpClient {
|
||||
|
||||
// ✅ 新增:调度重连
|
||||
Future<void> _scheduleReconnect() async {
|
||||
if (isUserSwitch) return;
|
||||
if (_reconnectTimer != null) return;
|
||||
|
||||
debugPrint('⏳ 调度重连:Host=${_lastHost}, Port=${_lastPort}'); // ✅ 检查 Host/Port 是否为空
|
||||
@@ -128,6 +156,25 @@ class TcpClient {
|
||||
});
|
||||
await _sendAuthPacket();
|
||||
}
|
||||
|
||||
|
||||
// ✅ 新增:调度重连
|
||||
Future<void> _scheduleReconnectBySwitch(devname) async {
|
||||
|
||||
|
||||
debugPrint('⏳ 被动调度重连:Host=${_lastHost}, Port=${_lastPort}'); // ✅ 检查 Host/Port 是否为空
|
||||
if (_lastHost == null || _lastPort == null) {
|
||||
debugPrint('❌ 无法重连:Host 或 Port 为空!');
|
||||
return;
|
||||
}
|
||||
|
||||
_reconnectTimer = Timer(const Duration(seconds: 5), () {
|
||||
_reconnectTimer = null;
|
||||
debugPrint('⏰ 被动-定时器触发,开始执行重连...');
|
||||
connectBySwitch(host: _lastHost!, port: _lastPort!, deviceName: devname);
|
||||
});
|
||||
await _sendAuthPacketBySwitch(devname);
|
||||
}
|
||||
/// 发送数据
|
||||
void send(Map<String, dynamic> data) {
|
||||
if (_socket == null) throw Exception("Socket not connected");
|
||||
@@ -182,16 +229,42 @@ class TcpClient {
|
||||
}
|
||||
|
||||
|
||||
// void disconnect() {
|
||||
// stopHeartbeat(); // 先停心跳
|
||||
// _socket?.destroy();
|
||||
// _socket = null;
|
||||
// // 2. 🔥 关键:取消重连定时器!防止断开后自动触发旧逻辑重连回第一个设备
|
||||
// _reconnectTimer?.cancel();
|
||||
// _reconnectTimer = null;
|
||||
// // _controller.close();
|
||||
// debugPrint("TCP Disconnected");
|
||||
//
|
||||
// }
|
||||
void disconnect() {
|
||||
stopHeartbeat(); // 先停心跳
|
||||
_socket?.destroy();
|
||||
_socket = null;
|
||||
_controller.close();
|
||||
debugPrint("TCP Disconnected");
|
||||
debugPrint('🛑 [TCP] 主动断开连接...');
|
||||
|
||||
// 1. 停止心跳
|
||||
stopHeartbeat();
|
||||
|
||||
// 2. 🔥 关键:取消重连定时器!防止断开后自动触发旧逻辑重连回第一个设备
|
||||
_reconnectTimer?.cancel();
|
||||
_reconnectTimer = null;
|
||||
|
||||
// 3. 销毁 Socket
|
||||
if (_socket != null) {
|
||||
_socket!.destroy();
|
||||
_socket = null;
|
||||
debugPrint('✅ [TCP] Socket 已物理销毁');
|
||||
}
|
||||
|
||||
// ❌ 绝对不要关闭 _controller!否则数据流断裂,重连后收不到数据
|
||||
// _controller.close();
|
||||
|
||||
debugPrint('✅ [TCP] 连接已断开,等待手动重连');
|
||||
}
|
||||
|
||||
void sendPathPoint(RoutePlanSendEntity routePlanSendEntity) {
|
||||
|
||||
void sendPathPoint(RoutePlanSendEntity routePlanSendEntity) {
|
||||
if (_socket == null) return;
|
||||
final payload = routePlanSendEntity.toBytes();
|
||||
final packet = sendRaw(0x01, payload); // 第1种的测试 声明指令结构和类型0x01 为命令类型
|
||||
@@ -270,7 +343,7 @@ class TcpClient {
|
||||
final DeviceEntity targetDevice = devices.first;
|
||||
debugPrint('📱 [AuthTcp] 准备切换至默认设备:${targetDevice.deviceName}');
|
||||
|
||||
// 切换设备 (同样,如果 switchDeviceUseCase 也返回 Either,也需要 fold 处理)
|
||||
// 切换设备
|
||||
final switchResult = await switchDeviceUseCase.deviceRepository.switchDevice("app",targetDevice.deviceName);
|
||||
|
||||
await switchResult.fold(
|
||||
@@ -295,4 +368,132 @@ class TcpClient {
|
||||
if (_socket == null) return;
|
||||
_socket!.add(bytes);
|
||||
}
|
||||
|
||||
Future<void> connectBySwitch({required String host, required int port, required String deviceName}) async {
|
||||
isUserSwitch=true;
|
||||
debugPrint('🔌被动 [TCP] 开始连接:$host:$port'); // ✅ 必须看到这条
|
||||
_lastHost = host;
|
||||
_lastPort = port;
|
||||
|
||||
if (_socket != null) {
|
||||
_socket!.destroy();
|
||||
_socket = null;
|
||||
}
|
||||
|
||||
try {
|
||||
_socket = await Socket.connect(
|
||||
host,
|
||||
port,
|
||||
timeout: const Duration(seconds: 5),
|
||||
);
|
||||
debugPrint('✅ 被动[TCP] 连接成功!'); // ✅ 必须看到这条
|
||||
|
||||
_socket!.listen((data) {
|
||||
debugPrint('📥 被动[TCP] 收到原始数据:${data.length} 字节, 内容:$data');
|
||||
// var packets = _decoder.decode(data);
|
||||
// debugPrint('📦 [TCP] 解码成功,包数量:${packets.length}');
|
||||
//for (var packet in packets) {
|
||||
// // 🔥若收到服务端心跳(cmd == 0xFF),立即回复一个心跳包
|
||||
// if (packet.command == 0xFF) {
|
||||
// debugPrint('收到服务端心跳,自动回复...');
|
||||
// sendHeartbeat(); // 回复 AB AA FF AA AB
|
||||
// }
|
||||
// }
|
||||
// _controller.add(packet);
|
||||
// }
|
||||
try {
|
||||
var packets = _decoder.decode(data);
|
||||
debugPrint('📦 被动[TCP] 解码成功,包数量:${packets.length}');
|
||||
for (var packet in packets) {
|
||||
if (!_controller.isClosed) {
|
||||
_controller.add(packet);
|
||||
debugPrint('➡️被动 [TCP] 已分发 CMD: 0x${packet.command.toRadixString(16)}');
|
||||
}
|
||||
if (packet.command == 0xFF) {
|
||||
debugPrint('收到服务端心跳,自动回复...');
|
||||
sendHeartbeat(); // 回复 AB AA FF AA AB
|
||||
}
|
||||
if (packet.command == 0x03) {
|
||||
debugPrint('⚠️ 收到认证响应:${packet.payload}');
|
||||
// 解析 payload 看是否有错误信息
|
||||
}
|
||||
|
||||
}
|
||||
} catch (e, stackTrace) {
|
||||
debugPrint('❌ 被动[TCP] 解码数据时发生异常:$e\n$stackTrace'); // 🔥 捕获解码异常
|
||||
}
|
||||
},
|
||||
onDone: (){
|
||||
// TODO: 断线重连
|
||||
debugPrint('onDone❌ 被动[TCP] 连接已断开!');
|
||||
_handleDisconnectBySwitch(deviceName);
|
||||
},
|
||||
onError: (e) {
|
||||
debugPrint('❌ 被动[TCP] 发生错误:$e');
|
||||
_handleDisconnectBySwitch(deviceName); // 统一走重连逻辑,保护 Controller 不被关闭
|
||||
},
|
||||
);
|
||||
// 开始认证tcp
|
||||
await _sendAuthPacketBySwitch(deviceName);
|
||||
} catch (e) {
|
||||
rethrow; // 向上抛出连接异常
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _sendAuthPacketBySwitch(String deviceName) async {
|
||||
if (_socket == null) return;
|
||||
String? username= "";
|
||||
String? token= "";
|
||||
final user = await _userStorage.getUser();
|
||||
deviceName= deviceName;
|
||||
debugPrint('tcp被动切换认证:$user');
|
||||
if (user == null || user.token == null) {
|
||||
debugPrint('❌ 被动[TCP] 认证失败:用户未登录或 Token 为空,无法发送认证包');
|
||||
disconnect();
|
||||
return; // 直接返回,不要发送无效包
|
||||
}
|
||||
username = user.username;
|
||||
token = user.token;
|
||||
final authString = '$username:app:$token';
|
||||
debugPrint('🔑被动[TCP] 认证字符串:$authString');
|
||||
final authBytes = utf8.encode(authString);
|
||||
|
||||
// 构造包结构:Head(2) + Cmd(1) + Payload(N) + CRC(2) + Foot(2)
|
||||
// 总长度 = 3 + N + 4
|
||||
final builder = BytesBuilder()
|
||||
..addByte(0xAB)
|
||||
..addByte(0xAA)
|
||||
..addByte(0x03) // 认证指令
|
||||
..add(authBytes);
|
||||
|
||||
// 添加 CRC (这里简单用 0x00 0x00 占位,如果协议严格校验需计算真实 CRC)
|
||||
// Android 代码中是 packet[tailStart] = 0x00; packet[tailStart+1] = 0x00;
|
||||
builder.addByte(0x00);
|
||||
builder.addByte(0x00);
|
||||
|
||||
builder.addByte(0xAA);
|
||||
builder.addByte(0xAB);
|
||||
|
||||
_socket!.add(builder.takeBytes());
|
||||
debugPrint('🔑 被动[TCP] 已发送认证包 (0x03): $authString');
|
||||
|
||||
try {
|
||||
// 1. 获取 Either 结果
|
||||
await switchDeviceUseCase.deviceRepository.switchDevice("app",deviceName);
|
||||
} catch (e) {
|
||||
debugPrint('❌ 被动[AuthTcp] 设备订阅流程异常:$e');
|
||||
rethrow;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void _handleDisconnectBySwitch( String deviceName) {
|
||||
stopHeartbeat();
|
||||
|
||||
_socket = null;
|
||||
// 注意:这里不要关闭 _controller!否则监听者会丢失数据流
|
||||
// _controller?.close();
|
||||
_scheduleReconnectBySwitch(deviceName);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user