Refactor device_info_model.dart and devices_api.dart

This commit is contained in:
mohammad
2025-04-28 15:59:10 +03:00
parent bde418e52a
commit 6a27f863c3
2 changed files with 10 additions and 8 deletions

View File

@ -77,7 +77,7 @@ class DeviceInfoModel {
uuid: json['uuid'], uuid: json['uuid'],
productUuid: json['productUuid'], productUuid: json['productUuid'],
productType: json['productType'], productType: json['productType'],
permissionType: json['permissionType'], permissionType: json['permissionType'] ?? '',
macAddress: json['macAddress'], macAddress: json['macAddress'],
subspace: Subspace.fromJson(json['subspace']), subspace: Subspace.fromJson(json['subspace']),
); );

View File

@ -102,7 +102,8 @@ class DevicesAPI {
static Future<Map<String, dynamic>> getPowerClampStatus( static Future<Map<String, dynamic>> getPowerClampStatus(
String deviceId) async { String deviceId) async {
final response = await _httpService.get( final response = await _httpService.get(
path: ApiEndpoints.deviceFunctionsStatus.replaceAll('{deviceUuid}', deviceId), path: ApiEndpoints.deviceFunctionsStatus
.replaceAll('{deviceUuid}', deviceId),
showServerMessage: false, showServerMessage: false,
expectedResponseModel: (json) { expectedResponseModel: (json) {
return json; return json;
@ -144,7 +145,7 @@ class DevicesAPI {
path: ApiEndpoints.deviceScene.replaceAll('{deviceUuid}', deviceId), path: ApiEndpoints.deviceScene.replaceAll('{deviceUuid}', deviceId),
showServerMessage: false, showServerMessage: false,
expectedResponseModel: (json) { expectedResponseModel: (json) {
return json; return json['data'];
}); });
return response; return response;
} }
@ -593,10 +594,11 @@ class DevicesAPI {
} }
final result = <DeviceModel>[]; final result = <DeviceModel>[];
for (final device in data) { for (final device in data) {
final mappedDevice = DeviceModel.fromJson(device); final mappedDevice = DeviceModel.fromJson(device);
if (mappedDevice.productType?.name != DeviceType.FlushMountedSensor.name) { if (mappedDevice.productType?.name !=
result.add(mappedDevice); DeviceType.FlushMountedSensor.name) {
} result.add(mappedDevice);
}
} }
return result; return result;
}, },