mirror of
https://github.com/SyncrowIOT/web.git
synced 2025-07-10 15:17:31 +00:00
Sp 1594 device location api integration (#216)
<!-- Thanks for contributing! Provide a description of your changes below and a general summary in the title Please look at the following checklist to ensure that your PR can be accepted quickly: --> ## Jira Ticket [SP-1594](https://syncrow.atlassian.net/browse/SP-1594) ## Description 1. Implemented `Bloc` and `Services` to integrate the device location into the side panel of the AQI Analytics module. 2. Fixed bugs in side panel caused by `Expanded` widgets. ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [x] ✨ New feature (non-breaking change which adds functionality) - [x] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [ ] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore [SP-1594]: https://syncrow.atlassian.net/browse/SP-1594?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
This commit is contained in:
@ -8,6 +8,8 @@ class AnalyticsDevice {
|
|||||||
this.isActive,
|
this.isActive,
|
||||||
this.productDevice,
|
this.productDevice,
|
||||||
this.spaceUuid,
|
this.spaceUuid,
|
||||||
|
this.latitude,
|
||||||
|
this.longitude,
|
||||||
});
|
});
|
||||||
|
|
||||||
final String uuid;
|
final String uuid;
|
||||||
@ -18,6 +20,8 @@ class AnalyticsDevice {
|
|||||||
final bool? isActive;
|
final bool? isActive;
|
||||||
final ProductDevice? productDevice;
|
final ProductDevice? productDevice;
|
||||||
final String? spaceUuid;
|
final String? spaceUuid;
|
||||||
|
final double? latitude;
|
||||||
|
final double? longitude;
|
||||||
|
|
||||||
factory AnalyticsDevice.fromJson(Map<String, dynamic> json) {
|
factory AnalyticsDevice.fromJson(Map<String, dynamic> json) {
|
||||||
return AnalyticsDevice(
|
return AnalyticsDevice(
|
||||||
@ -35,6 +39,8 @@ class AnalyticsDevice {
|
|||||||
? ProductDevice.fromJson(json['productDevice'] as Map<String, dynamic>)
|
? ProductDevice.fromJson(json['productDevice'] as Map<String, dynamic>)
|
||||||
: null,
|
: null,
|
||||||
spaceUuid: json['spaceUuid'] as String?,
|
spaceUuid: json['spaceUuid'] as String?,
|
||||||
|
latitude: json['lat'] != null ? double.parse(json['lat'] as String) : null,
|
||||||
|
longitude: json['lon'] != null ? double.parse(json['lon'] as String) : null,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
55
lib/pages/analytics/models/device_location_info.dart
Normal file
55
lib/pages/analytics/models/device_location_info.dart
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
|
||||||
|
class DeviceLocationInfo extends Equatable {
|
||||||
|
const DeviceLocationInfo({
|
||||||
|
this.airQuality,
|
||||||
|
this.humidity,
|
||||||
|
this.city,
|
||||||
|
this.country,
|
||||||
|
this.address,
|
||||||
|
this.temperature,
|
||||||
|
});
|
||||||
|
|
||||||
|
final double? airQuality;
|
||||||
|
final double? humidity;
|
||||||
|
final String? city;
|
||||||
|
final String? country;
|
||||||
|
final String? address;
|
||||||
|
final double? temperature;
|
||||||
|
|
||||||
|
factory DeviceLocationInfo.fromJson(Map<String, dynamic> json) {
|
||||||
|
return DeviceLocationInfo(
|
||||||
|
airQuality: json['aqi'] as double?,
|
||||||
|
humidity: json['humidity'] as double?,
|
||||||
|
temperature: json['temperature'] as double?,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
DeviceLocationInfo copyWith({
|
||||||
|
double? airQuality,
|
||||||
|
double? humidity,
|
||||||
|
String? city,
|
||||||
|
String? country,
|
||||||
|
String? address,
|
||||||
|
double? temperature,
|
||||||
|
}) {
|
||||||
|
return DeviceLocationInfo(
|
||||||
|
airQuality: airQuality ?? this.airQuality,
|
||||||
|
humidity: humidity ?? this.humidity,
|
||||||
|
city: city ?? this.city,
|
||||||
|
country: country ?? this.country,
|
||||||
|
address: address ?? this.address,
|
||||||
|
temperature: temperature ?? this.temperature,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [
|
||||||
|
airQuality,
|
||||||
|
humidity,
|
||||||
|
city,
|
||||||
|
country,
|
||||||
|
address,
|
||||||
|
temperature,
|
||||||
|
];
|
||||||
|
}
|
@ -0,0 +1,50 @@
|
|||||||
|
import 'package:bloc/bloc.dart';
|
||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/models/device_location_info.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/params/get_device_location_data_param.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/services/device_location/device_location_service.dart';
|
||||||
|
|
||||||
|
part 'device_location_event.dart';
|
||||||
|
part 'device_location_state.dart';
|
||||||
|
|
||||||
|
class DeviceLocationBloc extends Bloc<DeviceLocationEvent, DeviceLocationState> {
|
||||||
|
DeviceLocationBloc(
|
||||||
|
this._deviceLocationService,
|
||||||
|
) : super(const DeviceLocationState()) {
|
||||||
|
on<LoadDeviceLocationEvent>(_onLoadDeviceLocation);
|
||||||
|
on<ClearDeviceLocationEvent>(_onClearDeviceLocation);
|
||||||
|
}
|
||||||
|
|
||||||
|
final DeviceLocationService _deviceLocationService;
|
||||||
|
|
||||||
|
Future<void> _onLoadDeviceLocation(
|
||||||
|
LoadDeviceLocationEvent event,
|
||||||
|
Emitter<DeviceLocationState> emit,
|
||||||
|
) async {
|
||||||
|
emit(const DeviceLocationState(status: DeviceLocationStatus.loading));
|
||||||
|
|
||||||
|
try {
|
||||||
|
final locationInfo = await _deviceLocationService.get(event.param);
|
||||||
|
emit(
|
||||||
|
DeviceLocationState(
|
||||||
|
status: DeviceLocationStatus.success,
|
||||||
|
locationInfo: locationInfo,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
emit(
|
||||||
|
DeviceLocationState(
|
||||||
|
status: DeviceLocationStatus.failure,
|
||||||
|
errorMessage: e.toString(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onClearDeviceLocation(
|
||||||
|
ClearDeviceLocationEvent event,
|
||||||
|
Emitter<DeviceLocationState> emit,
|
||||||
|
) {
|
||||||
|
emit(const DeviceLocationState());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,21 @@
|
|||||||
|
part of 'device_location_bloc.dart';
|
||||||
|
|
||||||
|
sealed class DeviceLocationEvent extends Equatable {
|
||||||
|
const DeviceLocationEvent();
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [];
|
||||||
|
}
|
||||||
|
|
||||||
|
final class LoadDeviceLocationEvent extends DeviceLocationEvent {
|
||||||
|
const LoadDeviceLocationEvent(this.param);
|
||||||
|
|
||||||
|
final GetDeviceLocationDataParam param;
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [param];
|
||||||
|
}
|
||||||
|
|
||||||
|
final class ClearDeviceLocationEvent extends DeviceLocationEvent {
|
||||||
|
const ClearDeviceLocationEvent();
|
||||||
|
}
|
@ -0,0 +1,18 @@
|
|||||||
|
part of 'device_location_bloc.dart';
|
||||||
|
|
||||||
|
enum DeviceLocationStatus { initial, loading, success, failure }
|
||||||
|
|
||||||
|
final class DeviceLocationState extends Equatable {
|
||||||
|
const DeviceLocationState({
|
||||||
|
this.status = DeviceLocationStatus.initial,
|
||||||
|
this.locationInfo,
|
||||||
|
this.errorMessage,
|
||||||
|
});
|
||||||
|
|
||||||
|
final DeviceLocationStatus status;
|
||||||
|
final DeviceLocationInfo? locationInfo;
|
||||||
|
final String? errorMessage;
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [status, locationInfo, errorMessage];
|
||||||
|
}
|
@ -1,12 +1,14 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
|
import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/params/get_analytics_devices_param.dart';
|
import 'package:syncrow_web/pages/analytics/params/get_analytics_devices_param.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/params/get_device_location_data_param.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
|
import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
|
||||||
|
|
||||||
abstract final class FetchAirQualityDataHelper {
|
abstract final class FetchAirQualityDataHelper {
|
||||||
@ -48,6 +50,8 @@ abstract final class FetchAirQualityDataHelper {
|
|||||||
const ClearAirQualityDistribution(),
|
const ClearAirQualityDistribution(),
|
||||||
);
|
);
|
||||||
context.read<RangeOfAqiBloc>().add(const ClearRangeOfAqiEvent());
|
context.read<RangeOfAqiBloc>().add(const ClearRangeOfAqiEvent());
|
||||||
|
|
||||||
|
context.read<DeviceLocationBloc>().add(const ClearDeviceLocationEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
static void loadAnalyticsDevices(
|
static void loadAnalyticsDevices(
|
||||||
@ -61,12 +65,21 @@ abstract final class FetchAirQualityDataHelper {
|
|||||||
communityUuid: communityUuid,
|
communityUuid: communityUuid,
|
||||||
spaceUuid: spaceUuid,
|
spaceUuid: spaceUuid,
|
||||||
deviceTypes: ['AQI'],
|
deviceTypes: ['AQI'],
|
||||||
requestType: AnalyticsDeviceRequestType.energyManagement,
|
requestType: AnalyticsDeviceRequestType.occupancy,
|
||||||
),
|
),
|
||||||
onSuccess: (device) {
|
onSuccess: (device) {
|
||||||
context.read<RealtimeDeviceChangesBloc>()
|
context.read<RealtimeDeviceChangesBloc>()
|
||||||
..add(const RealtimeDeviceChangesClosed())
|
..add(const RealtimeDeviceChangesClosed())
|
||||||
..add(RealtimeDeviceChangesStarted(device.uuid));
|
..add(RealtimeDeviceChangesStarted(device.uuid));
|
||||||
|
|
||||||
|
context.read<DeviceLocationBloc>().add(
|
||||||
|
LoadDeviceLocationEvent(
|
||||||
|
GetDeviceLocationDataParam(
|
||||||
|
latitude: device.latitude ?? 0,
|
||||||
|
longitude: device.longitude ?? 0,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
@ -72,55 +72,54 @@ class AqiDeviceInfo extends StatelessWidget {
|
|||||||
return Container(
|
return Container(
|
||||||
decoration: secondarySection.copyWith(boxShadow: const []),
|
decoration: secondarySection.copyWith(boxShadow: const []),
|
||||||
padding: const EdgeInsetsDirectional.all(20),
|
padding: const EdgeInsetsDirectional.all(20),
|
||||||
child: Expanded(
|
child: Column(
|
||||||
child: Column(
|
spacing: 6,
|
||||||
spacing: 6,
|
mainAxisSize: MainAxisSize.max,
|
||||||
children: [
|
children: [
|
||||||
const AirQualityEndSideLiveIndicator(),
|
const AirQualityEndSideLiveIndicator(),
|
||||||
AirQualityEndSideGaugeAndInfo(
|
AirQualityEndSideGaugeAndInfo(
|
||||||
aqiLevel: status
|
aqiLevel: status
|
||||||
.firstWhere(
|
.firstWhere(
|
||||||
(e) => e.code == 'air_quality_index',
|
(e) => e.code == 'air_quality_index',
|
||||||
orElse: () => Status(code: 'air_quality_index', value: ''),
|
orElse: () => Status(code: 'air_quality_index', value: ''),
|
||||||
)
|
)
|
||||||
.value
|
.value
|
||||||
.toString(),
|
.toString(),
|
||||||
temperature: int.parse(tempValue),
|
temperature: int.parse(tempValue),
|
||||||
humidity: int.parse(humidityValue),
|
humidity: int.parse(humidityValue),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
AqiSubValueWidget(
|
AqiSubValueWidget(
|
||||||
range: (0, 999),
|
range: (0, 999),
|
||||||
label: AqiType.pm25.value,
|
label: AqiType.pm25.value,
|
||||||
value: pm25Value,
|
value: pm25Value,
|
||||||
unit: AqiType.pm25.unit,
|
unit: AqiType.pm25.unit,
|
||||||
),
|
),
|
||||||
AqiSubValueWidget(
|
AqiSubValueWidget(
|
||||||
range: (0, 999),
|
range: (0, 999),
|
||||||
label: AqiType.pm10.value,
|
label: AqiType.pm10.value,
|
||||||
value: pm10Value,
|
value: pm10Value,
|
||||||
unit: AqiType.pm10.unit,
|
unit: AqiType.pm10.unit,
|
||||||
),
|
),
|
||||||
AqiSubValueWidget(
|
AqiSubValueWidget(
|
||||||
range: (0, 5),
|
range: (0, 5),
|
||||||
label: AqiType.hcho.value,
|
label: AqiType.hcho.value,
|
||||||
value: ch2oValue,
|
value: ch2oValue,
|
||||||
unit: AqiType.hcho.unit,
|
unit: AqiType.hcho.unit,
|
||||||
),
|
),
|
||||||
AqiSubValueWidget(
|
AqiSubValueWidget(
|
||||||
range: (0, 999),
|
range: (0, 999),
|
||||||
label: AqiType.tvoc.value,
|
label: AqiType.tvoc.value,
|
||||||
value: tvocValue,
|
value: tvocValue,
|
||||||
unit: AqiType.tvoc.unit,
|
unit: AqiType.tvoc.unit,
|
||||||
),
|
),
|
||||||
AqiSubValueWidget(
|
AqiSubValueWidget(
|
||||||
range: (0, 5000),
|
range: (0, 5000),
|
||||||
label: AqiType.co2.value,
|
label: AqiType.co2.value,
|
||||||
value: co2Value,
|
value: co2Value,
|
||||||
unit: AqiType.co2.unit,
|
unit: AqiType.co2.unit,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
@ -6,7 +6,34 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
|
|||||||
import 'package:syncrow_web/utils/style.dart';
|
import 'package:syncrow_web/utils/style.dart';
|
||||||
|
|
||||||
class AqiLocation extends StatelessWidget {
|
class AqiLocation extends StatelessWidget {
|
||||||
const AqiLocation({super.key});
|
const AqiLocation({
|
||||||
|
required this.city,
|
||||||
|
required this.country,
|
||||||
|
required this.address,
|
||||||
|
super.key,
|
||||||
|
});
|
||||||
|
|
||||||
|
final String? city;
|
||||||
|
final String? country;
|
||||||
|
final String? address;
|
||||||
|
|
||||||
|
String _getFormattedLocation() {
|
||||||
|
if (city == null && country == null && address == null) {
|
||||||
|
return 'N/A';
|
||||||
|
}
|
||||||
|
|
||||||
|
final parts = <String>[];
|
||||||
|
|
||||||
|
if (city != null) parts.add(city!);
|
||||||
|
if (address != null) parts.add(address!);
|
||||||
|
final locationPart = parts.join(', ');
|
||||||
|
|
||||||
|
if (country != null) {
|
||||||
|
return locationPart.isEmpty ? country! : '$locationPart - $country';
|
||||||
|
}
|
||||||
|
|
||||||
|
return locationPart;
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
@ -24,7 +51,7 @@ class AqiLocation extends StatelessWidget {
|
|||||||
_buildLocationPin(),
|
_buildLocationPin(),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
'Business Bay, Dubai - UAE',
|
_getFormattedLocation(),
|
||||||
style: context.textTheme.bodySmall?.copyWith(
|
style: context.textTheme.bodySmall?.copyWith(
|
||||||
color: ColorsManager.textPrimaryColor,
|
color: ColorsManager.textPrimaryColor,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w400,
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_location.dart';
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_location.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_location_info_cell.dart';
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_location_info_cell.dart';
|
||||||
import 'package:syncrow_web/utils/constants/assets.dart';
|
import 'package:syncrow_web/utils/constants/assets.dart';
|
||||||
@ -9,37 +11,46 @@ class AqiLocationInfo extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return BlocBuilder<DeviceLocationBloc, DeviceLocationState>(
|
||||||
decoration: secondarySection.copyWith(boxShadow: const []),
|
builder: (context, state) {
|
||||||
padding: const EdgeInsetsDirectional.all(20),
|
final info = state.locationInfo;
|
||||||
child: const Column(
|
return Container(
|
||||||
spacing: 8,
|
decoration: secondarySection.copyWith(boxShadow: const []),
|
||||||
children: [
|
padding: const EdgeInsetsDirectional.all(20),
|
||||||
AqiLocation(),
|
child: Column(
|
||||||
Expanded(
|
spacing: 8,
|
||||||
child: Row(
|
children: [
|
||||||
spacing: 8,
|
AqiLocation(
|
||||||
children: [
|
city: info?.city,
|
||||||
AqiLocationInfoCell(
|
country: info?.country,
|
||||||
label: 'Temperature',
|
address: info?.address,
|
||||||
value: ' 25°',
|
),
|
||||||
svgPath: Assets.aqiTemperature,
|
Expanded(
|
||||||
|
child: Row(
|
||||||
|
spacing: 8,
|
||||||
|
children: [
|
||||||
|
AqiLocationInfoCell(
|
||||||
|
label: 'Temperature',
|
||||||
|
value: ' ${info?.temperature?.roundToDouble() ?? '--'}°',
|
||||||
|
svgPath: Assets.aqiTemperature,
|
||||||
|
),
|
||||||
|
AqiLocationInfoCell(
|
||||||
|
label: 'Humidity',
|
||||||
|
value: '${info?.humidity?.roundToDouble() ?? '--'}%',
|
||||||
|
svgPath: Assets.aqiHumidity,
|
||||||
|
),
|
||||||
|
AqiLocationInfoCell(
|
||||||
|
label: 'Air Quality',
|
||||||
|
value: ' ${info?.airQuality?.roundToDouble() ?? '--'}',
|
||||||
|
svgPath: Assets.aqiAirQuality,
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
AqiLocationInfoCell(
|
),
|
||||||
label: 'Humidity',
|
],
|
||||||
value: '25%',
|
|
||||||
svgPath: Assets.aqiHumidity,
|
|
||||||
),
|
|
||||||
AqiLocationInfoCell(
|
|
||||||
label: 'Air Quality',
|
|
||||||
value: ' 120',
|
|
||||||
svgPath: Assets.aqiAirQuality,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
],
|
);
|
||||||
),
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
|
import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
|
||||||
@ -18,6 +20,8 @@ import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/fa
|
|||||||
import 'package:syncrow_web/pages/analytics/services/analytics_devices/analytics_devices_service_delagate.dart';
|
import 'package:syncrow_web/pages/analytics/services/analytics_devices/analytics_devices_service_delagate.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_energy_management_analytics_devices_service.dart';
|
import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_energy_management_analytics_devices_service.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
|
import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/services/device_location/device_location_details_service_decorator.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/services/device_location/remote_device_location_service.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/remote_energy_consumption_by_phases_service.dart';
|
import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/remote_energy_consumption_by_phases_service.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/remote_energy_consumption_per_device_service.dart';
|
import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/remote_energy_consumption_per_device_service.dart';
|
||||||
import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
|
import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
|
||||||
@ -108,6 +112,18 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
|
|||||||
FakeAirQualityDistributionService(),
|
FakeAirQualityDistributionService(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
BlocProvider(
|
||||||
|
create: (context) => DeviceLocationBloc(
|
||||||
|
DeviceLocationDetailsServiceDecorator(
|
||||||
|
RemoteDeviceLocationService(_httpService),
|
||||||
|
Dio(
|
||||||
|
BaseOptions(
|
||||||
|
baseUrl: 'https://nominatim.openstreetmap.org/',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
child: const AnalyticsPageForm(),
|
child: const AnalyticsPageForm(),
|
||||||
);
|
);
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
class GetDeviceLocationDataParam {
|
||||||
|
const GetDeviceLocationDataParam({
|
||||||
|
required this.latitude,
|
||||||
|
required this.longitude,
|
||||||
|
});
|
||||||
|
|
||||||
|
final double latitude;
|
||||||
|
final double longitude;
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {'lat': latitude, 'lon': longitude};
|
||||||
|
}
|
@ -0,0 +1,40 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/models/device_location_info.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/params/get_device_location_data_param.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/services/device_location/device_location_service.dart';
|
||||||
|
|
||||||
|
class DeviceLocationDetailsServiceDecorator implements DeviceLocationService {
|
||||||
|
const DeviceLocationDetailsServiceDecorator(this._decoratee, this._dio);
|
||||||
|
|
||||||
|
final DeviceLocationService _decoratee;
|
||||||
|
final Dio _dio;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<DeviceLocationInfo> get(GetDeviceLocationDataParam param) async {
|
||||||
|
try {
|
||||||
|
final deviceLocationInfo = await _decoratee.get(param);
|
||||||
|
final response = await _dio.get<Map<String, dynamic>>(
|
||||||
|
'reverse',
|
||||||
|
queryParameters: {
|
||||||
|
'format': 'json',
|
||||||
|
'lat': param.latitude,
|
||||||
|
'lon': param.longitude,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
final data = response.data;
|
||||||
|
if (data != null) {
|
||||||
|
final addressData = data['address'] as Map<String, dynamic>;
|
||||||
|
return deviceLocationInfo.copyWith(
|
||||||
|
city: addressData['city'],
|
||||||
|
country: addressData['country_code'].toString().toUpperCase(),
|
||||||
|
address: addressData['state'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return deviceLocationInfo;
|
||||||
|
} catch (e) {
|
||||||
|
throw Exception('Failed to load device location info: ${e.toString()}');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,6 @@
|
|||||||
|
import 'package:syncrow_web/pages/analytics/models/device_location_info.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/params/get_device_location_data_param.dart';
|
||||||
|
|
||||||
|
abstract interface class DeviceLocationService {
|
||||||
|
Future<DeviceLocationInfo> get(GetDeviceLocationDataParam param);
|
||||||
|
}
|
@ -0,0 +1,37 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/models/device_location_info.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/params/get_device_location_data_param.dart';
|
||||||
|
import 'package:syncrow_web/pages/analytics/services/device_location/device_location_service.dart';
|
||||||
|
import 'package:syncrow_web/services/api/http_service.dart';
|
||||||
|
|
||||||
|
class RemoteDeviceLocationService implements DeviceLocationService {
|
||||||
|
const RemoteDeviceLocationService(this._httpService);
|
||||||
|
|
||||||
|
final HTTPService _httpService;
|
||||||
|
|
||||||
|
static const _defaultErrorMessage = 'Failed to load device location';
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<DeviceLocationInfo> get(GetDeviceLocationDataParam param) async {
|
||||||
|
try {
|
||||||
|
final response = await _httpService.get(
|
||||||
|
path: '/weather',
|
||||||
|
queryParameters: param.toJson(),
|
||||||
|
expectedResponseModel: (data) {
|
||||||
|
final response = data as Map<String, dynamic>;
|
||||||
|
final location = response['data'] as Map<String, dynamic>;
|
||||||
|
|
||||||
|
return DeviceLocationInfo.fromJson(location);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return response;
|
||||||
|
} on DioException catch (e) {
|
||||||
|
final message = e.response?.data as Map<String, dynamic>?;
|
||||||
|
final error = message?['error'] as Map<String, dynamic>?;
|
||||||
|
final errorMessage = error?['error'] as String? ?? '';
|
||||||
|
throw Exception(errorMessage);
|
||||||
|
} catch (e) {
|
||||||
|
throw Exception('$_defaultErrorMessage: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -61,6 +61,7 @@ dependencies:
|
|||||||
firebase_crashlytics: ^4.3.2
|
firebase_crashlytics: ^4.3.2
|
||||||
firebase_database: ^11.3.2
|
firebase_database: ^11.3.2
|
||||||
bloc: ^9.0.0
|
bloc: ^9.0.0
|
||||||
|
geocoding: ^4.0.0
|
||||||
gauge_indicator: ^0.4.3
|
gauge_indicator: ^0.4.3
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user