优化ai userid和markdown

This commit is contained in:
mmc
2026-03-17 10:54:33 +08:00
parent 14df0bc041
commit f952756f40
6 changed files with 215 additions and 227 deletions

View File

@@ -2,6 +2,8 @@ import 'package:dio/dio.dart';
import 'package:flutter/widgets.dart';
import 'package:get_it/get_it.dart';
import 'package:maibu_satabot_v2/core/consts/http_api_consts.dart';
import 'package:maibu_satabot_v2/core/di/injection.dart';
import 'package:maibu_satabot_v2/features/auth/presentation/bloc/auth_cubit.dart';
import 'package:maibu_satabot_v2/features/devices/data/datasources/device_http_datasource.dart';
import 'package:maibu_satabot_v2/features/devices/domain/entities/device_entity.dart';
@@ -28,41 +30,22 @@ class DeviceHttpDatasourceImpl implements DeviceHttpDatasource {
Future<int> bindDevice(String deviceId, String deviceAlias) async {
final logger = GetIt.I<ILoggerService>() as SentryLoggerImpl;
logger.logWithLevel('用户点击bindDevice方法开始触发', level: 'INFO');
logger.logWithLevel('用户点击bindDevice方法API 请求开始', level: 'INFO', data: {'url': 'https://serviceri.satabot.com/iot/device/bindDevice'});
var response = await dio.post(HttpApiConsts.bindDevice, data: {'deviceId': deviceId, 'deviceAlias': deviceAlias});
logger.logWithLevel(
'用户点击bindDevice方法API 请求开始',
level: 'INFO',
data: {'url': 'https://serviceri.satabot.com/iot/device/bindDevice'}
);
var response = await dio.post(
HttpApiConsts.bindDevice,
data: {'deviceId': deviceId, 'deviceAlias': deviceAlias},
);
logger.logWithLevel(
'请求详细参数',
level: 'DEBUG',
data: {
'url': 'https://serviceri.satabot.com/iot/device/bindDevice',
'deviceId': deviceId,
'deviceAlias': deviceAlias
}
'请求详细参数',
level: 'DEBUG',
data: {'url': 'https://serviceri.satabot.com/iot/device/bindDevice', 'deviceId': deviceId, 'deviceAlias': deviceAlias},
);
if (response.statusCode != 200) {
logger.logWithLevel(
'API 响应失败',
level: 'ERROR',
data: {'statusCode': response.statusCode, 'data': response.data}
);
logger.logWithLevel('API 响应失败', level: 'ERROR', data: {'statusCode': response.statusCode, 'data': response.data});
throw Exception('网络请求失败:${response.statusCode}');
}
final responseData = response.data;
if (responseData['code'] != 200 || responseData['data'] != true) {
logger.logWithLevel(
'API 响应失败',
level: 'ERROR',
data: {'statusCode': response.statusCode, 'data': response.data}
);
logger.logWithLevel('API 响应失败', level: 'ERROR', data: {'statusCode': response.statusCode, 'data': response.data});
throw Exception(responseData['msg'] ?? '业务异常');
}
@@ -85,12 +68,14 @@ class DeviceHttpDatasourceImpl implements DeviceHttpDatasource {
),
);
if (response.statusCode != 200) {
await sl<AuthCubit>().logout();
throw Exception('网络请求失败:${response.statusCode}');
}
final responseData = response.data;
if (responseData['code'] != 200) {
await sl<AuthCubit>().logout();
throw Exception(responseData['msg'] ?? '业务异常');
}
@@ -111,11 +96,7 @@ class DeviceHttpDatasourceImpl implements DeviceHttpDatasource {
final token = await _getToken();
print('用户点击switchDevice方法开始触发: $token');
logger.logWithLevel('用户点击switchDevice方法开始触发', level: 'DEBUG');
logger.logWithLevel(
'用户点击switchDevice方法API 请求开始',
level: 'INFO',
data: {'url': 'https://serviceri.satabot.com/iot/device/switchDevice'}
);
logger.logWithLevel('用户点击switchDevice方法API 请求开始', level: 'INFO', data: {'url': 'https://serviceri.satabot.com/iot/device/switchDevice'});
var response = await dio.post(
HttpApiConsts.switchDevice,
data: {'platform': platform, 'deviceId': deviceId},
@@ -127,35 +108,19 @@ class DeviceHttpDatasourceImpl implements DeviceHttpDatasource {
),
);
logger.logWithLevel(
'请求详细参数',
level: 'DEBUG',
data: {
'url': 'https://serviceri.satabot.com/iot/device/switchDevice',
'platform': platform,
'deviceId': deviceId
}
'请求详细参数',
level: 'DEBUG',
data: {'url': 'https://serviceri.satabot.com/iot/device/switchDevice', 'platform': platform, 'deviceId': deviceId},
);
if (response.statusCode != 200) {
logger.logWithLevel(
'API 请求失败',
level: 'ERROR',
data: {'statusCode': response.statusCode, 'data': response.data}
);
logger.logWithLevel('API 请求失败', level: 'ERROR', data: {'statusCode': response.statusCode, 'data': response.data});
throw Exception('网络请求失败:${response.statusCode}');
}
final responseData = response.data;
logger.logWithLevel(
'API 响应成功',
level: 'INFO',
data: {'statusCode': response.statusCode, 'data': response.data}
);
logger.logWithLevel('API 响应成功', level: 'INFO', data: {'statusCode': response.statusCode, 'data': response.data});
if (responseData['code'] != 200 || responseData['data'] != true) {
logger.logWithLevel(
'API 响应失败',
level: 'ERROR',
data: {'statusCode': response.statusCode, 'data': response.data}
);
logger.logWithLevel('API 响应失败', level: 'ERROR', data: {'statusCode': response.statusCode, 'data': response.data});
throw Exception(responseData['msg'] ?? '业务异常');
}
return 1;
@@ -201,14 +166,7 @@ class DeviceHttpDatasourceImpl implements DeviceHttpDatasource {
try {
// 发起 GET 请求
logger.logWithLevel('用户点击getDeviceLocation方法开始触发', level: 'INFO');
logger.logWithLevel(
'请求详细参数',
level: 'DEBUG',
data: {
'url': 'https://serviceri.satabot.com/iot/device/userDevice',
'tenantName': deviceame
}
);
logger.logWithLevel('请求详细参数', level: 'DEBUG', data: {'url': 'https://serviceri.satabot.com/iot/device/userDevice', 'tenantName': deviceame});
final response = await dio.get(
'https://serviceri.satabot.com/iot/device/userDevice',
queryParameters: {'tenantName': deviceame},
@@ -223,24 +181,12 @@ class DeviceHttpDatasourceImpl implements DeviceHttpDatasource {
// 检查响应状态码
if (response.statusCode == 200) {
final data = response.data;
logger.logWithLevel(
'API 响应接收',
level: 'DEBUG',
data: {'statusCode': response.statusCode, 'data': response.data}
);
logger.logWithLevel('API 响应接收', level: 'DEBUG', data: {'statusCode': response.statusCode, 'data': response.data});
if (data['code'] == 200) {
//return data['data']; // 返回设备数据
final locationData = data['data']; // 假设数据结构,测试时候如有不妥就修改结果的实例化
logger.logWithLevel(
'成功获取设备位置',
level: 'INFO',
data: {'lat': locationData['latitude'], 'lng': locationData['longitude']}
);
return DeviceLocationEntity(
deviceName: locationData['deviceName'],
latitude: locationData['latitude'],
longitude: locationData['longitude'],
);
logger.logWithLevel('成功获取设备位置', level: 'INFO', data: {'lat': locationData['latitude'], 'lng': locationData['longitude']});
return DeviceLocationEntity(deviceName: locationData['deviceName'], latitude: locationData['latitude'], longitude: locationData['longitude']);
} else {
logger.logWithLevel(data['msg'] ?? '业务异常', level: 'ERROR');
throw Exception(data['msg'] ?? '业务异常');

View File

@@ -13,15 +13,9 @@ class DeviceRepositoryImpl implements DeviceRepository {
DeviceRepositoryImpl(this._deviceHttpDatasource);
@override
Future<Either<DeviceFailure, int>> bindDevice(
String deviceId,
String deviceAlias,
) async {
Future<Either<DeviceFailure, int>> bindDevice(String deviceId, String deviceAlias) async {
try {
var result = await _deviceHttpDatasource.bindDevice(
deviceId,
deviceAlias,
);
var result = await _deviceHttpDatasource.bindDevice(deviceId, deviceAlias);
return Right(result);
} on DioException catch (e) {
final String serverMessage = e.response?.data['msg'] ?? "网络连接异常";
@@ -33,9 +27,7 @@ class DeviceRepositoryImpl implements DeviceRepository {
}
@override
Future<Either<DeviceFailure, List<DeviceEntity>>> getUserDevice(
String username,
) async {
Future<Either<DeviceFailure, List<DeviceEntity>>> getUserDevice(String username) async {
try {
var result = await _deviceHttpDatasource.getUserDevices(username);
return Right(result);
@@ -61,6 +53,7 @@ class DeviceRepositoryImpl implements DeviceRepository {
return Left(DeviceFailure(cleanMessage));
}
}
@override
Future<Either<DeviceFailure, int>> updateDeviceName(String deviceId, String deviceName) async {
try {
@@ -76,10 +69,7 @@ class DeviceRepositoryImpl implements DeviceRepository {
}
@override
Future<Either<DeviceFailure, int>> switchDevice(
String platform,
String deviceId,
) async {
Future<Either<DeviceFailure, int>> switchDevice(String platform, String deviceId) async {
try {
var result = await _deviceHttpDatasource.switchDevice(platform, deviceId);
return Right(result);
@@ -91,9 +81,10 @@ class DeviceRepositoryImpl implements DeviceRepository {
return Left(DeviceFailure(cleanMessage));
}
}
// TODO: implement switchDevice 实现获取设备的列表
// TODO: implement switchDevice 实现获取设备的列表
@override
Future<Either<DeviceFailure, DeviceLocationEntity>>getDeviceLocation(String username) async {
Future<Either<DeviceFailure, DeviceLocationEntity>> getDeviceLocation(String username) async {
// TODO: implement getDeviceLocation
var result = await _deviceHttpDatasource.getDeviceLocation(username);
return Right(result);

View File

@@ -57,8 +57,9 @@ class DevicesCubit extends Cubit<DevicesState> {
this._generatePathUseCase,
this._routePlanningUseCase,
this._bindDeviceUseCase,
this._deviceStatusBloc,
this._tcpClient, this._pathPlanningService,
this._deviceStatusBloc,
this._tcpClient,
this._pathPlanningService,
) : super(const DevicesState());
Future<void> unbindDevice(String deviceId, String deviceName) async {
@@ -174,7 +175,6 @@ class DevicesCubit extends Cubit<DevicesState> {
isLoading: false,
),
);
});
} catch (e) {
emit(state.copyWith(isLoading: false, errorMessage: e.toString()));
@@ -207,55 +207,51 @@ class DevicesCubit extends Cubit<DevicesState> {
result.fold(
// 失败处理
(l) {
(l) {
emit(state.copyWith(isLoading: false, errorMessage: l.message));
selectDevice(device);
},
// 成功处理:改为 async 函数块
(r) async {
(r) async {
// 3. 最后更新 UI 状态
try {
// 🔥 关键修复 1:先强制断开旧连接!
// 这一步会销毁旧 Socket,清除旧 Listener,防止旧数据继续推送
if (_tcpClient.isConnected) {
debugPrint('🛑 检测到已连接,先断开旧 TCP 连接...');
_tcpClient.disconnects(forSwitch: true);
// 稍微等待一下,确保底层 Socket 资源释放 (可选,但推荐)
// await Future.delayed(const Duration(milliseconds: 100));
}
try {
// 🔥 关键修复 1:先强制断开旧连接!
// 这一步会销毁旧 Socket,清除旧 Listener,防止旧数据继续推送
if (_tcpClient.isConnected) {
debugPrint('🛑 检测到已连接,先断开旧 TCP 连接...');
_tcpClient.disconnects(forSwitch: true);
// 稍微等待一下,确保底层 Socket 资源释放 (可选,但推荐)
// await Future.delayed(const Duration(milliseconds: 100));
}
// 🔥 关键修复 2:发起新连接
// connect 方法内部会自动调用 _sendAuthPacket -> 获取设备列表 -> 自动订阅当前选中的设备
debugPrint('🔌 开始重新新连接 TCP,将自动订阅新设备:${device.deviceName}');
await _tcpClient.connectBySwitch(host: TCPConsts.TCP_IP, port: TCPConsts.TCP_PORT, deviceName: device.deviceName);
// 🔥 关键修复 3:重置设备状态 Bloc,清除旧设备图表数据
_deviceStatusBloc.add(DeviceStatusReset());
// 🔥 关键修复 2:发起新连接
// connect 方法内部会自动调用 _sendAuthPacket -> 获取设备列表 -> 自动订阅当前选中的设备
debugPrint('🔌 开始重新新连接 TCP,将自动订阅新设备:${device.deviceName}');
await _tcpClient.connectBySwitch(host: TCPConsts.TCP_IP, port: TCPConsts.TCP_PORT, deviceName: device.deviceName);
// 🔥 关键修复 3:重置设备状态 Bloc,清除旧设备图表数据
_deviceStatusBloc.add(DeviceStatusReset());
debugPrint('✅ 新设备切换流程完成');
} catch (e) {
debugPrint('⚠️ 设备切换成功,但 TCP 重连或状态重置失败:$e');
// 即使 TCP 失败,也更新 UI 选中状态,让用户知道切换了,只是没数据
}
debugPrint('✅ 新设备切换流程完成');
} catch (e) {
debugPrint('⚠️ 设备切换成功,但 TCP 重连或状态重置失败:$e');
// 即使 TCP 失败,也更新 UI 选中状态,让用户知道切换了,只是没数据
}
emit(state.copyWith(isLoading: false, selectedDevice: device));
emit(state.copyWith(isLoading: false, selectedDevice: device));
},
);
}
/// 绑定设备
Future<void> bindDevice(String deviceId, String deviceAlias) async {
emit(state.copyWith(isLoading: true, errorMessage: ''));
try {
final params = BindDeviceParams(deviceId, deviceAlias);
final result = await _bindDeviceUseCase.call(params);
result.fold(
// 失败处理
(failure) {
emit(state.copyWith(
isLoading: false,
errorMessage: failure.message ?? '绑定设备失败',
));
(failure) {
emit(state.copyWith(isLoading: false, errorMessage: failure.message ?? '绑定设备失败'));
// 抛出异常,携带后端返回的错误消息(如“设备不存在”)
throw Exception(failure.message ?? '绑定设备失败');
},
@@ -363,7 +359,7 @@ class DevicesCubit extends Cubit<DevicesState> {
// 开始路径规划
emit(state.copyWith(isLoading: true));
//传入全局的Service 中路径规划队列
Queue<DeviceAddPathPointModel> queue = _pathPlanningService.getQueue() ;
Queue<DeviceAddPathPointModel> queue = _pathPlanningService.getQueue();
print('📦 从 Service 获取的队列长度:${queue.length}');
final result = await _routePlanningUseCase.startRoutePlanning(queue);
result.fold(
@@ -372,7 +368,6 @@ class DevicesCubit extends Cubit<DevicesState> {
);
}
// 暂停
Future<void> pauseRoutePlanning() async {
emit(state.copyWith(isLoading: true));
@@ -409,6 +404,7 @@ class DevicesCubit extends Cubit<DevicesState> {
void resetWorkStatus() {
emit(state.copyWith(isFinshWork: false));
}
void setArrivedLocation(double latitude, double longitude) {
emit(state.copyWith(arriLatitude: latitude, arriLongitude: longitude));
print('✅ [DevicesCubit] 监听更新已完成到达位置:Lat=$latitude, Lng=$longitude');