优化+摄像头+扫码绑定
This commit is contained in:
@@ -8,7 +8,7 @@ abstract class BindDeviceDatasource {
|
||||
Future<void> bindDevice({
|
||||
required List<String> deviceIds,
|
||||
required int orgId,
|
||||
required int siteId,
|
||||
required int userId,
|
||||
int? siteId,
|
||||
int? userId,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -105,11 +105,13 @@ class DeviceRemoteDataSourceImpl implements DeviceRemoteDataSource {
|
||||
}
|
||||
|
||||
DeviceDataModel _parseDeviceFromJson(Map<String, dynamic> json) {
|
||||
// 在线状态:使用 onlineStatus 字段(1=在线, 0=离线)
|
||||
final onlineStatus = json['onlineStatus'] ?? 0;
|
||||
return DeviceDataModel(
|
||||
deviceId: json['deviceId']?.toString() ?? '',
|
||||
name: json['deviceName'] ?? json['name'] ?? '',
|
||||
type: json['deviceTypeName'] ?? json['type'] ?? '未知设备',
|
||||
status: _getStatusText(json['status'] ?? 0),
|
||||
status: onlineStatus == 1 ? '在线' : '离线',
|
||||
power: (json['power'] as num?)?.toDouble() ?? 0,
|
||||
todayEnergy: (json['todayEnergy'] as num?)?.toDouble() ?? 0,
|
||||
temperature: (json['temperature'] as num?)?.toDouble(),
|
||||
|
||||
@@ -127,18 +127,17 @@ class BindDeviceDatasourceImpl implements BindDeviceDatasource {
|
||||
Future<void> bindDevice({
|
||||
required List<String> deviceIds,
|
||||
required int orgId,
|
||||
required int siteId,
|
||||
required int userId,
|
||||
int? siteId,
|
||||
int? userId,
|
||||
}) async {
|
||||
final token = await _getToken();
|
||||
final Map<String, dynamic> body = {'deviceIds': deviceIds, 'orgId': orgId};
|
||||
if (siteId != null) body['siteId'] = siteId;
|
||||
if (userId != null) body['userId'] = userId;
|
||||
|
||||
final response = await _dio.post(
|
||||
HttpApiConsts.bindDevice,
|
||||
data: {
|
||||
'deviceIds': deviceIds,
|
||||
'orgId': orgId,
|
||||
'siteId': siteId,
|
||||
'userId': userId,
|
||||
},
|
||||
data: body,
|
||||
options: Options(
|
||||
headers: {
|
||||
'Authorization': token != null ? 'Bearer $token' : '',
|
||||
|
||||
@@ -4,7 +4,9 @@ class RobotDataModel {
|
||||
final String id;
|
||||
final String? alias; // 设备别名
|
||||
final String type;
|
||||
final String status;
|
||||
final String status; // '在线' / '离线',基于 onlineStatus 字段
|
||||
final bool isOnline; // 在线状态,基于接口 onlineStatus 字段
|
||||
final int statusCode; // 接口原始 status 状态码
|
||||
final double battery;
|
||||
final String task;
|
||||
|
||||
@@ -14,6 +16,8 @@ class RobotDataModel {
|
||||
this.alias,
|
||||
required this.type,
|
||||
required this.status,
|
||||
this.isOnline = false,
|
||||
this.statusCode = 0,
|
||||
required this.battery,
|
||||
required this.task,
|
||||
});
|
||||
@@ -25,12 +29,21 @@ class RobotDataModel {
|
||||
(json['capacity_percent'] as num?)?.toDouble() ??
|
||||
100.0;
|
||||
|
||||
// 在线状态:优先使用 onlineStatus 字段(1=在线, 0=离线)
|
||||
final onlineStatusValue = json['onlineStatus'] ?? 0;
|
||||
final isOnline = onlineStatusValue == 1;
|
||||
|
||||
// 设备状态码(原始 status 字段)
|
||||
final statusCode = json['status'] ?? 0;
|
||||
|
||||
return RobotDataModel(
|
||||
name: json['deviceName'] ?? json['name'] ?? '',
|
||||
id: json['deviceId']?.toString() ?? json['id']?.toString() ?? '',
|
||||
alias: json['deviceAlias'] as String?, // 获取别名字段
|
||||
type: _convertType(json['deviceTypeName'] ?? json['type'] ?? '未知类型'),
|
||||
status: _getStatusText(json['status'] ?? 0),
|
||||
status: isOnline ? '在线' : '离线',
|
||||
isOnline: isOnline,
|
||||
statusCode: statusCode is int ? statusCode : 0,
|
||||
battery: batteryValue,
|
||||
task: json['task'] ?? json['currentTask'] ?? '待机中',
|
||||
);
|
||||
@@ -44,25 +57,13 @@ class RobotDataModel {
|
||||
'alias': alias,
|
||||
'type': type,
|
||||
'status': status,
|
||||
'isOnline': isOnline,
|
||||
'statusCode': statusCode,
|
||||
'battery': battery,
|
||||
'task': task,
|
||||
};
|
||||
}
|
||||
|
||||
/// 状态码转换
|
||||
static String _getStatusText(int status) {
|
||||
switch (status) {
|
||||
case 1:
|
||||
return '在线';
|
||||
case 2:
|
||||
return '离线';
|
||||
case 3:
|
||||
return '异常';
|
||||
default:
|
||||
return '未知';
|
||||
}
|
||||
}
|
||||
|
||||
static String _convertType(String type) {
|
||||
if (type.contains('巡检')) {
|
||||
return 'inspection';
|
||||
|
||||
@@ -62,8 +62,8 @@ class BindDeviceRepositoryImpl implements BindDeviceRepository {
|
||||
Future<Either<Failure, void>> bindDevice({
|
||||
required List<String> deviceIds,
|
||||
required int orgId,
|
||||
required int siteId,
|
||||
required int userId,
|
||||
int? siteId,
|
||||
int? userId,
|
||||
}) async {
|
||||
try {
|
||||
await _datasource.bindDevice(
|
||||
|
||||
Reference in New Issue
Block a user