Apply correct business logic in AirQualityDataLoadingStrategy.

.vscode/launch.json

@@ -16,7 +16,6 @@
               "3000",
               "-t",
               "lib/main_dev.dart",
-              "--web-experimental-hot-reload",
             ],
        
             "flutterMode": "debug"
@@ -36,7 +35,6 @@
                 "3000",
                 "-t",
                 "lib/main_staging.dart",
-                "--web-experimental-hot-reload",
             ],
        
             "flutterMode": "debug"
@@ -56,7 +54,6 @@
               "3000",
               "-t",
               "lib/main.dart",
-              "--web-experimental-hot-reload",
             ],
        
             "flutterMode": "debug"

lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart

@@ -26,10 +26,10 @@ final class AirQualityDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     final spaceTreeBloc = context.read<SpaceTreeBloc>();
     final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
 
-    if (isSpaceSelected) {
-      clearData(context);
-      return;
-    }
+    final hasSelectedSpaces = spaceTreeBloc.state.selectedSpaces.isNotEmpty;
+    if (hasSelectedSpaces) clearData(context);
+
+    if (isSpaceSelected) return;
 
     spaceTreeBloc
       ..add(const SpaceTreeClearSelectionEvent())
@@ -42,18 +42,11 @@ final class AirQualityDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     );
   }
 
-  @override
-  void onChildSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel child,
-  ) {
-    return onSpaceSelected(context, community, child);
-  }
-
   @override
   void clearData(BuildContext context) {
-    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
+    context.read<SpaceTreeBloc>().add(
+          const AnalyticsClearAllSpaceTreeSelectionsEvent(),
+        );
     FetchAirQualityDataHelper.clearAllData(context);
   }
 }

lib/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart

@@ -13,10 +13,5 @@ abstract class AnalyticsDataLoadingStrategy {
     CommunityModel community,
     SpaceModel space,
   );
-  void onChildSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel child,
-  );
   void clearData(BuildContext context);
 }

lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart

@@ -14,24 +14,14 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     List<SpaceModel> spaces,
   ) {
-    context.read<SpaceTreeBloc>().add(
-          OnCommunitySelected(
-            community.uuid,
-            spaces,
-          ),
-        );
+    final spaceTreeBloc = context.read<SpaceTreeBloc>();
+    final isCommunitySelected =
+        spaceTreeBloc.state.selectedCommunities.contains(community.uuid);
 
-    final spaceTreeState = context.read<SpaceTreeBloc>().state;
-    if (spaceTreeState.selectedCommunities.contains(community.uuid)) {
+    if (isCommunitySelected) {
       clearData(context);
       return;
     }
-
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(
-      context,
-      communityId: community.uuid,
-      spaceId: spaces.isNotEmpty ? spaces.first.uuid ?? '' : '',
-    );
   }
 
   @override
@@ -40,21 +30,31 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     SpaceModel space,
   ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            space.uuid ?? '',
-            space.children,
-          ),
-        );
+    final spaceTreeBloc = context.read<SpaceTreeBloc>();
+    final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
+    final hasSelectedSpaces = spaceTreeBloc.state.selectedSpaces.isNotEmpty;
 
-    final spaceTreeState = context.read<SpaceTreeBloc>().state;
-    if (spaceTreeState.selectedCommunities.contains(community.uuid) ||
-        spaceTreeState.selectedSpaces.contains(space.uuid)) {
-      clearData(context);
+    if (isSpaceSelected) {
+      final firstSelectedSpace = spaceTreeBloc.state.selectedSpaces.first;
+      final isTheFirstSelectedSpace = firstSelectedSpace == space.uuid;
+      if (isTheFirstSelectedSpace) {
+        clearData(context);
+      }
       return;
     }
 
+    if (hasSelectedSpaces) {
+      clearData(context);
+    }
+
+    spaceTreeBloc.add(
+      OnSpaceSelected(
+        community,
+        space.uuid ?? '',
+        space.children,
+      ),
+    );
+
     FetchEnergyManagementDataHelper.loadEnergyManagementData(
       context,
       communityId: community.uuid,
@@ -62,18 +62,11 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     );
   }
 
-  @override
-  void onChildSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel child,
-  ) {
-    return onSpaceSelected(context, community, child);
-  }
-
   @override
   void clearData(BuildContext context) {
-    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
+    context.read<SpaceTreeBloc>().add(
+          const AnalyticsClearAllSpaceTreeSelectionsEvent(),
+        );
     FetchEnergyManagementDataHelper.clearAllData(context);
   }
 }

lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart

@@ -26,10 +26,10 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     final spaceTreeBloc = context.read<SpaceTreeBloc>();
     final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
 
-    if (isSpaceSelected) {
-      clearData(context);
-      return;
-    }
+    final hasSelectedSpaces = spaceTreeBloc.state.selectedSpaces.isNotEmpty;
+    if (hasSelectedSpaces) clearData(context);
+
+    if (isSpaceSelected) return;
 
     spaceTreeBloc
       ..add(const SpaceTreeClearSelectionEvent())
@@ -42,18 +42,11 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     );
   }
 
-  @override
-  void onChildSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel child,
-  ) {
-    return onSpaceSelected(context, community, child);
-  }
-
   @override
   void clearData(BuildContext context) {
-    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
+    context.read<SpaceTreeBloc>().add(
+          const AnalyticsClearAllSpaceTreeSelectionsEvent(),
+        );
     FetchOccupancyDataHelper.clearAllData(context);
   }
 }

lib/pages/analytics/modules/analytics/widgets/analytics_communities_sidebar.dart

@@ -21,7 +21,7 @@ class AnalyticsCommunitiesSidebar extends StatelessWidget {
           strategy.onSpaceSelected(context, community, space);
         },
         onSelectChildSpace: (community, child) {
-          strategy.onChildSpaceSelected(context, community, child);
+          strategy.onSpaceSelected(context, community, child);
         },
       ),
     );

lib/pages/device_managment/ac/bloc/ac_bloc.dart

@@ -1,27 +1,21 @@
 import 'dart:async';
-
+import 'package:dio/dio.dart';
 import 'package:firebase_database/firebase_database.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
 import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 class AcBloc extends Bloc<AcsEvent, AcsState> {
   late AcStatusModel deviceStatus;
   final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
+  Timer? _timer;
   Timer? _countdownTimer;
 
-  AcBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(AcsInitialState()) {
+  AcBloc({required this.deviceId}) : super(AcsInitialState()) {
     on<AcFetchDeviceStatusEvent>(_onFetchAcStatus);
     on<AcFetchBatchStatusEvent>(_onFetchAcBatchStatus);
     on<AcControlEvent>(_onAcControl);
@@ -40,14 +34,14 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   int scheduledMinutes = 0;
 
   FutureOr<void> _onFetchAcStatus(
-    AcFetchDeviceStatusEvent event,
-    Emitter<AcsState> emit,
-  ) async {
+      AcFetchDeviceStatusEvent event, Emitter<AcsState> emit) async {
     emit(AcsLoadingState());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
       if (deviceStatus.countdown1 != 0) {
+        // Convert API value to minutes
         final totalMinutes = deviceStatus.countdown1 * 6;
         scheduledHours = totalMinutes ~/ 60;
         scheduledMinutes = totalMinutes % 60;
@@ -68,24 +62,30 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     }
   }
 
-  void _listenToChanges(deviceId) {
+  _listenToChanges(deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) async {
         if (event.snapshot.value == null) return;
 
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 1));
+        }
         Map<dynamic, dynamic> usersMap =
             event.snapshot.value as Map<dynamic, dynamic>;
 
         List<Status> statusList = [];
 
         usersMap['status'].forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
         });
 
-        deviceStatus = AcStatusModel.fromJson(usersMap['productUuid'], statusList);
+        deviceStatus =
+            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
         if (!isClosed) {
           add(AcStatusUpdated(deviceStatus));
         }
@@ -93,44 +93,146 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     } catch (_) {}
   }
 
-  void _onAcStatusUpdated(
-    AcStatusUpdated event,
-    Emitter<AcsState> emit,
-  ) {
+  void _onAcStatusUpdated(AcStatusUpdated event, Emitter<AcsState> emit) {
     deviceStatus = event.deviceStatus;
     emit(ACStatusLoaded(status: deviceStatus));
   }
 
   FutureOr<void> _onAcControl(
-    AcControlEvent event,
-    Emitter<AcsState> emit,
-  ) async {
-    emit(AcsLoadingState());
-    _updateDeviceFunctionFromCode(event.code, event.value);
+      AcControlEvent event, Emitter<AcsState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
+    _updateLocalValue(event.code, event.value, emit);
+
     emit(ACStatusLoaded(status: deviceStatus));
 
-    try {
-      final success = await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
+    await _runDebounce(
+      isBatch: false,
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+    );
+  }
 
-      if (!success) {
-        emit(const AcsFailedState(error: 'Failed to control device'));
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required dynamic value,
+    required dynamic oldValue,
+    required Emitter<AcsState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
+    }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(const Duration(seconds: 1), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          _revertValueAndEmit(id, code, oldValue, emit);
+        }
+      } catch (e) {
+        if (e is DioException && e.response != null) {
+          debugPrint('Error response: ${e.response?.data}');
+        }
+        _revertValueAndEmit(id, code, oldValue, emit);
       }
-    } catch (e) {
-      emit(AcsFailedState(error: e.toString()));
+    });
+  }
+
+  void _revertValueAndEmit(
+      String deviceId, String code, dynamic oldValue, Emitter<AcsState> emit) {
+    _updateLocalValue(code, oldValue, emit);
+    emit(ACStatusLoaded(status: deviceStatus));
+  }
+
+  void _updateLocalValue(String code, dynamic value, Emitter<AcsState> emit) {
+    switch (code) {
+      case 'switch':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(acSwitch: value);
+        }
+        break;
+      case 'temp_set':
+        if (value is int) {
+          deviceStatus = deviceStatus.copyWith(tempSet: value);
+        }
+        break;
+      case 'mode':
+        if (value is String) {
+          deviceStatus = deviceStatus.copyWith(
+            modeString: value,
+          );
+        }
+        break;
+      case 'level':
+        if (value is String) {
+          deviceStatus = deviceStatus.copyWith(
+            fanSpeedsString: value,
+          );
+        }
+        break;
+      case 'child_lock':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(childLock: value);
+        }
+
+      case 'countdown_time':
+        if (value is int) {
+          deviceStatus = deviceStatus.copyWith(countdown1: value);
+        }
+        break;
+      default:
+        break;
+    }
+    emit(ACStatusLoaded(status: deviceStatus));
+  }
+
+  dynamic _getValueByCode(String code) {
+    switch (code) {
+      case 'switch':
+        return deviceStatus.acSwitch;
+      case 'temp_set':
+        return deviceStatus.tempSet;
+      case 'mode':
+        return deviceStatus.modeString;
+      case 'level':
+        return deviceStatus.fanSpeedsString;
+      case 'child_lock':
+        return deviceStatus.childLock;
+      case 'countdown_time':
+        return deviceStatus.countdown1;
+      default:
+        return null;
     }
   }
 
   FutureOr<void> _onFetchAcBatchStatus(
-    AcFetchBatchStatusEvent event,
-    Emitter<AcsState> emit,
-  ) async {
+      AcFetchBatchStatusEvent event, Emitter<AcsState> emit) async {
     emit(AcsLoadingState());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
-      deviceStatus = AcStatusModel.fromJson(event.devicesIds.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      deviceStatus =
+          AcStatusModel.fromJson(event.devicesIds.first, status.status);
       emit(ACStatusLoaded(status: deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
@@ -138,32 +240,25 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   }
 
   FutureOr<void> _onAcBatchControl(
-    AcBatchControlEvent event,
-    Emitter<AcsState> emit,
-  ) async {
-    emit(AcsLoadingState());
-    _updateDeviceFunctionFromCode(event.code, event.value);
+      AcBatchControlEvent event, Emitter<AcsState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
+    _updateLocalValue(event.code, event.value, emit);
+
     emit(ACStatusLoaded(status: deviceStatus));
 
-    try {
-      final success = await batchControlDevicesService.batchControlDevices(
-        uuids: event.devicesIds,
-        code: event.code,
-        value: event.value,
-      );
-
-      if (!success) {
-        emit(const AcsFailedState(error: 'Failed to control devices'));
-      }
-    } catch (e) {
-      emit(AcsFailedState(error: e.toString()));
-    }
+    await _runDebounce(
+      isBatch: true,
+      deviceId: event.devicesIds,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+    );
   }
 
-  Future<void> _onFactoryReset(
-    AcFactoryResetEvent event,
-    Emitter<AcsState> emit,
-  ) async {
+  FutureOr<void> _onFactoryReset(
+      AcFactoryResetEvent event, Emitter<AcsState> emit) async {
     emit(AcsLoadingState());
     try {
       final response = await DevicesManagementApi().factoryReset(
@@ -180,11 +275,9 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     }
   }
 
-  void _onClose(
-    OnClose event,
-    Emitter<AcsState> emit,
-  ) {
+  void _onClose(OnClose event, Emitter<AcsState> emit) {
     _countdownTimer?.cancel();
+    _timer?.cancel();
   }
 
   void _handleIncreaseTime(IncreaseTimeEvent event, Emitter<AcsState> emit) {
@@ -207,10 +300,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     ));
   }
 
-  void _handleDecreaseTime(
-    DecreaseTimeEvent event,
-    Emitter<AcsState> emit,
-  ) {
+  void _handleDecreaseTime(DecreaseTimeEvent event, Emitter<AcsState> emit) {
     if (state is! ACStatusLoaded) return;
     final currentState = state as ACStatusLoaded;
     int totalMinutes = (scheduledHours * 60) + scheduledMinutes;
@@ -225,9 +315,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   }
 
   Future<void> _handleToggleTimer(
-    ToggleScheduleEvent event,
-    Emitter<AcsState> emit,
-  ) async {
+      ToggleScheduleEvent event, Emitter<AcsState> emit) async {
     if (state is! ACStatusLoaded) return;
     final currentState = state as ACStatusLoaded;
 
@@ -243,44 +331,37 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
 
       try {
         final scaledValue = totalMinutes ~/ 6;
-        final success = await controlDeviceService.controlDevice(
-          deviceUuid: deviceId,
-          status: Status(code: 'countdown_time', value: scaledValue),
+        await _runDebounce(
+          isBatch: false,
+          deviceId: deviceId,
+          code: 'countdown_time',
+          value: scaledValue,
+          oldValue: scaledValue,
+          emit: emit,
         );
-
-        if (success) {
-          _startCountdownTimer(emit);
-          emit(currentState.copyWith(isTimerActive: timerActive));
-        } else {
-          timerActive = false;
-          emit(const AcsFailedState(error: 'Failed to set timer'));
-        }
+        _startCountdownTimer(emit);
+        emit(currentState.copyWith(isTimerActive: timerActive));
       } catch (e) {
         timerActive = false;
         emit(AcsFailedState(error: e.toString()));
       }
     } else {
-      try {
-        final success = await controlDeviceService.controlDevice(
-          deviceUuid: deviceId,
-          status: Status(code: 'countdown_time', value: 0),
-        );
-
-        if (success) {
-          _countdownTimer?.cancel();
-          scheduledHours = 0;
-          scheduledMinutes = 0;
-          emit(currentState.copyWith(
-            isTimerActive: timerActive,
-            scheduledHours: 0,
-            scheduledMinutes: 0,
-          ));
-        } else {
-          emit(const AcsFailedState(error: 'Failed to stop timer'));
-        }
-      } catch (e) {
-        emit(AcsFailedState(error: e.toString()));
-      }
+      await _runDebounce(
+        isBatch: false,
+        deviceId: deviceId,
+        code: 'countdown_time',
+        value: 0,
+        oldValue: 0,
+        emit: emit,
+      );
+      _countdownTimer?.cancel();
+      scheduledHours = 0;
+      scheduledMinutes = 0;
+      emit(currentState.copyWith(
+        isTimerActive: timerActive,
+        scheduledHours: 0,
+        scheduledMinutes: 0,
+      ));
     }
   }
 
@@ -304,10 +385,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     });
   }
 
-  void _handleUpdateTimer(
-    UpdateTimerEvent event,
-    Emitter<AcsState> emit,
-  ) {
+  void _handleUpdateTimer(UpdateTimerEvent event, Emitter<AcsState> emit) {
     if (state is ACStatusLoaded) {
       final currentState = state as ACStatusLoaded;
       emit(currentState.copyWith(
@@ -322,6 +400,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       ApiCountdownValueEvent event, Emitter<AcsState> emit) {
     if (state is ACStatusLoaded) {
       final totalMinutes = event.apiValue * 6;
+      final scheduledHours = totalMinutes ~/ 60;
       scheduledMinutes = totalMinutes % 60;
       _startCountdownTimer(
         emit,
@@ -330,43 +409,6 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     }
   }
 
-  void _updateDeviceFunctionFromCode(String code, dynamic value) {
-    switch (code) {
-      case 'switch':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(acSwitch: value);
-        }
-        break;
-      case 'temp_set':
-        if (value is int) {
-          deviceStatus = deviceStatus.copyWith(tempSet: value);
-        }
-        break;
-      case 'mode':
-        if (value is String) {
-          deviceStatus = deviceStatus.copyWith(modeString: value);
-        }
-        break;
-      case 'level':
-        if (value is String) {
-          deviceStatus = deviceStatus.copyWith(fanSpeedsString: value);
-        }
-        break;
-      case 'child_lock':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(childLock: value);
-        }
-        break;
-      case 'countdown_time':
-        if (value is int) {
-          deviceStatus = deviceStatus.copyWith(countdown1: value);
-        }
-        break;
-      default:
-        break;
-    }
-  }
-
   @override
   Future<void> close() {
     add(OnClose());

lib/pages/device_managment/ac/factories/ac_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-
-abstract final class AcBlocFactory {
-  const AcBlocFactory._();
-
-  static AcBloc create({
-    required String deviceId,
-  }) {
-    return AcBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/ac/view/ac_device_batch_control.dart

@@ -3,12 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
-import 'package:syncrow_web/pages/device_managment/ac/factories/ac_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/batch_ac_mode.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/batch_current_temp.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/batch_fan_speed.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
+// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -26,9 +26,8 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => AcBlocFactory.create(
-        deviceId: devicesIds.first,
-      )..add(AcFetchBatchStatusEvent(devicesIds)),
+      create: (context) =>
+          AcBloc(deviceId: devicesIds.first)..add(AcFetchBatchStatusEvent(devicesIds)),
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
           if (state is ACStatusLoaded) {

lib/pages/device_managment/ac/view/ac_device_control.dart

@@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
-import 'package:syncrow_web/pages/device_managment/ac/factories/ac_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/ac_mode.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/current_temp.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/fan_speed.dart';
@@ -25,9 +24,8 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
     final isMedium = isMediumScreenSize(context);
 
     return BlocProvider(
-      create: (context) => AcBlocFactory.create(
-        deviceId: device.uuid!,
-      )..add(AcFetchDeviceStatusEvent(device.uuid!)),
+      create: (context) => AcBloc(deviceId: device.uuid!)
+        ..add(AcFetchDeviceStatusEvent(device.uuid!)),
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
           final acBloc = BlocProvider.of<AcBloc>(context);

lib/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
@@ -5,21 +7,14 @@ import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_e
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_state.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/help_description.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
   final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
   late CeilingSensorModel deviceStatus;
+  Timer? _timer;
 
-  CeilingSensorBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(CeilingInitialState()) {
+  CeilingSensorBloc({required this.deviceId}) : super(CeilingInitialState()) {
     on<CeilingInitialEvent>(_fetchCeilingSensorStatus);
     on<CeilingFetchDeviceStatusEvent>(_fetchCeilingSensorBatchControl);
     on<CeilingChangeValueEvent>(_changeValue);
@@ -31,34 +26,35 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _fetchCeilingSensorStatus(
-    CeilingInitialEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) async {
+  void _fetchCeilingSensorStatus(
+      CeilingInitialEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingInitialState());
     try {
-      final response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      var response =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = CeilingSensorModel.fromJson(response.status);
       emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
       _listenToChanges(event.deviceId);
     } catch (e) {
       emit(CeilingFailedState(error: e.toString()));
+      return;
     }
   }
 
-  void _listenToChanges(String deviceId) {
+  _listenToChanges(deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        if (event.snapshot.value == null) return;
-
-        final usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-        final statusList = <Status>[];
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
 
+        List<Status> statusList = [];
         usersMap['status'].forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
         });
 
         deviceStatus = CeilingSensorModel.fromJson(statusList);
@@ -69,127 +65,149 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     } catch (_) {}
   }
 
-  void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<CeilingSensorState> emit,
-  ) {
+  void _onStatusUpdated(StatusUpdated event, Emitter<CeilingSensorState> emit) {
     deviceStatus = event.deviceStatus;
     emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
   }
 
-  Future<void> _changeValue(
-    CeilingChangeValueEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) async {
+  void _changeValue(
+      CeilingChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
-    _updateDeviceFunctionFromCode(event.code, event.value);
-    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
-
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (e) {
-      emit(CeilingFailedState(error: e.toString()));
+    if (event.code == 'sensitivity') {
+      deviceStatus.sensitivity = event.value;
+    } else if (event.code == 'none_body_time') {
+      deviceStatus.noBodyTime = event.value;
+    } else if (event.code == 'moving_max_dis') {
+      deviceStatus.maxDistance = event.value;
+    } else if (event.code == 'scene') {
+      deviceStatus.spaceType = getSpaceType(event.value);
     }
+    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
+    await _runDeBouncer(
+      deviceId: deviceId,
+      code: event.code,
+      value: event.value,
+      emit: emit,
+      isBatch: false,
+    );
   }
 
   Future<void> _onBatchControl(
-    CeilingBatchControlEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) async {
+      CeilingBatchControlEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
-    _updateDeviceFunctionFromCode(event.code, event.value);
+    if (event.code == 'sensitivity') {
+      deviceStatus.sensitivity = event.value;
+    } else if (event.code == 'none_body_time') {
+      deviceStatus.noBodyTime = event.value;
+    } else if (event.code == 'moving_max_dis') {
+      deviceStatus.maxDistance = event.value;
+    } else if (event.code == 'scene') {
+      deviceStatus.spaceType = getSpaceType(event.value);
+    }
     emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
+    await _runDeBouncer(
+      deviceId: event.deviceIds,
+      code: event.code,
+      value: event.value,
+      emit: emit,
+      isBatch: true,
+    );
+  }
 
-    try {
-      final success = await batchControlDevicesService.batchControlDevices(
-        uuids: event.deviceIds,
-        code: event.code,
-        value: event.value,
-      );
+  _runDeBouncer({
+    required dynamic deviceId,
+    required String code,
+    required dynamic value,
+    required Emitter<CeilingSensorState> emit,
+    required bool isBatch,
+  }) {
+    late String id;
 
-      if (!success) {
-        emit(const CeilingFailedState(error: 'Failed to control devices'));
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
+    }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(const Duration(seconds: 1), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          add(CeilingInitialEvent(id));
+        }
+        if (response == true && code == 'scene') {
+          emit(CeilingLoadingInitialState());
+          await Future.delayed(const Duration(seconds: 1));
+          add(CeilingInitialEvent(id));
+        }
+      } catch (_) {
+        await Future.delayed(const Duration(milliseconds: 500));
+        add(CeilingInitialEvent(id));
       }
-    } catch (e) {
-      emit(CeilingFailedState(error: e.toString()));
-    }
+    });
   }
 
-  void _updateDeviceFunctionFromCode(String code, dynamic value) {
-    switch (code) {
-      case 'sensitivity':
-        deviceStatus.sensitivity = value;
-        break;
-      case 'none_body_time':
-        deviceStatus.noBodyTime = value;
-        break;
-      case 'moving_max_dis':
-        deviceStatus.maxDistance = value;
-        break;
-      case 'scene':
-        deviceStatus.spaceType = getSpaceType(value);
-        break;
-      default:
-        break;
-    }
-  }
-
-  Future<void> _getDeviceReports(
-    GetCeilingDeviceReportsEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) async {
+  FutureOr<void> _getDeviceReports(GetCeilingDeviceReportsEvent event,
+      Emitter<CeilingSensorState> emit) async {
     if (event.code.isEmpty) {
       emit(ShowCeilingDescriptionState(description: reportString));
       return;
-    }
+    } else {
+      emit(CeilingReportsLoadingState());
+      // final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
+      // final to = DateTime.now().millisecondsSinceEpoch;
 
-    emit(CeilingReportsLoadingState());
-    try {
-      final value = await DevicesManagementApi.getDeviceReports(
-        deviceId,
-        event.code,
-      );
-      emit(CeilingReportsState(deviceReport: value));
-    } catch (e) {
-      emit(CeilingReportsFailedState(error: e.toString()));
+      try {
+        // await DevicesManagementApi.getDeviceReportsByDate(deviceId, event.code, from.toString(), to.toString())
+        await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+            .then((value) {
+          emit(CeilingReportsState(deviceReport: value));
+        });
+      } catch (e) {
+        emit(CeilingReportsFailedState(error: e.toString()));
+        return;
+      }
     }
   }
 
   void _showDescription(
-    ShowCeilingDescriptionEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) {
+      ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
     emit(ShowCeilingDescriptionState(description: event.description));
   }
 
   void _backToGridView(
-    BackToCeilingGridViewEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) {
+      BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
     emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
   }
 
-  Future<void> _fetchCeilingSensorBatchControl(
-    CeilingFetchDeviceStatusEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) async {
+  FutureOr<void> _fetchCeilingSensorBatchControl(
+      CeilingFetchDeviceStatusEvent event,
+      Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingInitialState());
     try {
-      final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      var response =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = CeilingSensorModel.fromJson(response.status);
       emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
     } catch (e) {
       emit(CeilingFailedState(error: e.toString()));
+      return;
     }
   }
 
-  Future<void> _onFactoryReset(
-    CeilingFactoryResetEvent event,
-    Emitter<CeilingSensorState> emit,
-  ) async {
+  FutureOr<void> _onFactoryReset(
+      CeilingFactoryResetEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
     try {
       final response = await DevicesManagementApi().factoryReset(

lib/pages/device_managment/ceiling_sensor/factories/ceiling_sensor_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-
-abstract final class CeilingSensorBlocFactory {
-  const CeilingSensorBlocFactory._();
-
-  static CeilingSensorBloc create({
-    required String deviceId,
-  }) {
-    return CeilingSensorBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_batch_control.dart

@@ -4,9 +4,9 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_event.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_state.dart';
-import 'package:syncrow_web/pages/device_managment/ceiling_sensor/factories/ceiling_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
+// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_space_type.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart';
@@ -23,9 +23,8 @@ class CeilingSensorBatchControlView extends StatelessWidget with HelperResponsiv
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => CeilingSensorBlocFactory.create(
-        deviceId: devicesIds.first,
-      )..add(CeilingFetchDeviceStatusEvent(devicesIds)),
+      create: (context) => CeilingSensorBloc(deviceId: devicesIds.first)
+        ..add(CeilingFetchDeviceStatusEvent(devicesIds)),
       child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
         builder: (context, state) {
           if (state is CeilingLoadingInitialState || state is CeilingReportsLoadingState) {
@@ -111,6 +110,7 @@ class CeilingSensorBatchControlView extends StatelessWidget with HelperResponsiv
                 ),
               ),
         ),
+        // FirmwareUpdateWidget(deviceId: devicesIds.first, version: 4),
         FactoryResetWidget(
           callFactoryReset: () {
             context.read<CeilingSensorBloc>().add(

lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_event.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_state.dart';
-import 'package:syncrow_web/pages/device_managment/ceiling_sensor/factories/ceiling_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_space_type.dart';
@@ -29,9 +28,8 @@ class CeilingSensorControlsView extends StatelessWidget
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => CeilingSensorBlocFactory.create(
-        deviceId: device.uuid ?? '',
-      )..add(CeilingInitialEvent(device.uuid ?? '')),
+      create: (context) => CeilingSensorBloc(deviceId: device.uuid ?? '')
+        ..add(CeilingInitialEvent(device.uuid ?? '')),
       child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
         builder: (context, state) {
           if (state is CeilingLoadingInitialState ||

lib/pages/device_managment/curtain/bloc/curtain_bloc.dart

@@ -1,25 +1,17 @@
 import 'dart:async';
-
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_state.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
   late bool deviceStatus;
   final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
+  Timer? _timer;
 
-  CurtainBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(CurtainInitial()) {
+  CurtainBloc({required this.deviceId}) : super(CurtainInitial()) {
     on<CurtainFetchDeviceStatus>(_onFetchDeviceStatus);
     on<CurtainFetchBatchStatus>(_onFetchBatchStatus);
     on<CurtainControl>(_onCurtainControl);
@@ -28,31 +20,32 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-    CurtainFetchDeviceStatus event,
-    Emitter<CurtainState> emit,
-  ) async {
+  FutureOr<void> _onFetchDeviceStatus(
+      CurtainFetchDeviceStatus event, Emitter<CurtainState> emit) async {
     emit(CurtainStatusLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId, emit);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId);
       deviceStatus = _checkStatus(status.status[0].value);
+
       emit(CurtainStatusLoaded(deviceStatus));
     } catch (e) {
       emit(CurtainError(e.toString()));
     }
   }
 
-  void _listenToChanges(String deviceId, Emitter<CurtainState> emit) {
+  void _listenToChanges(String deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
         final data = event.snapshot.value as Map<dynamic, dynamic>?;
         if (data == null) return;
 
-        final statusList = <Status>[];
+        List<Status> statusList = [];
         if (data['status'] != null) {
           for (var element in data['status']) {
             statusList.add(
@@ -64,7 +57,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
           }
         }
         if (statusList.isNotEmpty) {
-          final newStatus = _checkStatus(statusList[0].value);
+          bool newStatus = _checkStatus(statusList[0].value);
           if (newStatus != deviceStatus) {
             deviceStatus = newStatus;
             if (!isClosed) {
@@ -78,32 +71,76 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     }
   }
 
-  void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<CurtainState> emit,
-  ) {
+  void _onStatusUpdated(StatusUpdated event, Emitter<CurtainState> emit) {
     emit(CurtainStatusLoading());
     deviceStatus = event.deviceStatus;
     emit(CurtainStatusLoaded(deviceStatus));
   }
 
-  Future<void> _onCurtainControl(
-    CurtainControl event,
-    Emitter<CurtainState> emit,
-  ) async {
-    emit(CurtainStatusLoading());
+  FutureOr<void> _onCurtainControl(
+      CurtainControl event, Emitter<CurtainState> emit) async {
+    final oldValue = deviceStatus;
+
     _updateLocalValue(event.value, emit);
 
-    try {
-      final controlValue = event.value ? 'open' : 'close';
-      await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: controlValue),
-      );
-    } catch (e) {
-      _updateLocalValue(!event.value, emit);
-      emit(CurtainControlError(e.toString()));
+    emit(CurtainStatusLoaded(deviceStatus));
+
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: false,
+    );
+  }
+
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required bool value,
+    required bool oldValue,
+    required Emitter<CurtainState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
     }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(const Duration(seconds: 1), () async {
+      try {
+        final controlValue = value ? 'open' : 'close';
+
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, controlValue);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: controlValue));
+        }
+
+        if (!response) {
+          _revertValueAndEmit(id, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(id, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(
+      String deviceId, bool oldValue, Emitter<CurtainState> emit) {
+    _updateLocalValue(oldValue, emit);
+    emit(CurtainStatusLoaded(deviceStatus));
+    emit(const CurtainControlError('Failed to control the device.'));
   }
 
   void _updateLocalValue(bool value, Emitter<CurtainState> emit) {
@@ -115,44 +152,41 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     return command.toLowerCase() == 'open';
   }
 
-  Future<void> _onFetchBatchStatus(
-    CurtainFetchBatchStatus event,
-    Emitter<CurtainState> emit,
-  ) async {
+  FutureOr<void> _onFetchBatchStatus(
+      CurtainFetchBatchStatus event, Emitter<CurtainState> emit) async {
     emit(CurtainStatusLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+
       deviceStatus = _checkStatus(status.status[0].value);
+
       emit(CurtainStatusLoaded(deviceStatus));
     } catch (e) {
       emit(CurtainError(e.toString()));
     }
   }
 
-  Future<void> _onCurtainBatchControl(
-    CurtainBatchControl event,
-    Emitter<CurtainState> emit,
-  ) async {
-    emit(CurtainStatusLoading());
+  FutureOr<void> _onCurtainBatchControl(
+      CurtainBatchControl event, Emitter<CurtainState> emit) async {
+    final oldValue = deviceStatus;
+
     _updateLocalValue(event.value, emit);
 
-    try {
-      final controlValue = event.value ? 'open' : 'stop';
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.devicesIds,
-        code: event.code,
-        value: controlValue,
-      );
-    } catch (e) {
-      _updateLocalValue(!event.value, emit);
-      emit(CurtainControlError(e.toString()));
-    }
+    emit(CurtainStatusLoaded(deviceStatus));
+
+    await _runDebounce(
+      deviceId: event.devicesIds,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: true,
+    );
   }
 
-  Future<void> _onFactoryReset(
-    CurtainFactoryReset event,
-    Emitter<CurtainState> emit,
-  ) async {
+  FutureOr<void> _onFactoryReset(
+      CurtainFactoryReset event, Emitter<CurtainState> emit) async {
     emit(CurtainStatusLoading());
     try {
       final response = await DevicesManagementApi().factoryReset(

lib/pages/device_managment/curtain/factories/curtain_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-
-abstract final class CurtainBlocFactory {
-  const CurtainBlocFactory._();
-
-  static CurtainBloc create({
-    required String deviceId,
-  }) {
-    return CurtainBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/curtain/view/curtain_batch_status_view.dart

@@ -5,7 +5,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_state.dart';
-import 'package:syncrow_web/pages/device_managment/curtain/factories/curtain_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -19,7 +18,7 @@ class CurtainBatchStatusView extends StatelessWidget with HelperResponsiveLayout
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          CurtainBlocFactory.create(deviceId: devicesIds.first)..add(CurtainFetchBatchStatus(devicesIds)),
+          CurtainBloc(deviceId: devicesIds.first)..add(CurtainFetchBatchStatus(devicesIds)),
       child: BlocBuilder<CurtainBloc, CurtainState>(
         builder: (context, state) {
           if (state is CurtainStatusLoading) {

lib/pages/device_managment/curtain/view/curtain_status_view.dart

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/common/curtain_toggle.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_state.dart';
-import 'package:syncrow_web/pages/device_managment/curtain/factories/curtain_bloc_factory.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class CurtainStatusControlsView extends StatelessWidget
@@ -16,7 +15,7 @@ class CurtainStatusControlsView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => CurtainBlocFactory.create(deviceId: deviceId)
+      create: (context) => CurtainBloc(deviceId: deviceId)
         ..add(CurtainFetchDeviceStatus(deviceId)),
       child: BlocBuilder<CurtainBloc, CurtainState>(
         builder: (context, state) {

lib/pages/device_managment/factories/device_bloc_dependencies_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
-
-abstract final class DeviceBlocDependenciesFactory {
-  const DeviceBlocDependenciesFactory._();
-
-  static ControlDeviceService createControlDeviceService() {
-    return DebouncedControlDeviceService(
-      decoratee: RemoteControlDeviceService(),
-    );
-  }
-
-  static BatchControlDevicesService createBatchControlDevicesService() {
-    return DebouncedBatchControlDevicesService(
-      decoratee: RemoteBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart

@@ -1,5 +1,6 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 
 abstract final class FlushMountedPresenceSensorBlocFactory {
   const FlushMountedPresenceSensorBlocFactory._();
@@ -9,8 +10,12 @@ abstract final class FlushMountedPresenceSensorBlocFactory {
   }) {
     return FlushMountedPresenceSensorBloc(
       deviceId: deviceId,
-      controlDeviceService: DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService: DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+      controlDeviceService: DebouncedControlDeviceService(
+        decoratee: RemoteControlDeviceService(),
+      ),
+      batchControlDevicesService: DebouncedBatchControlDevicesService(
+        decoratee: RemoteBatchControlDevicesService(),
+      ),
     );
   }
 }

lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart

@@ -1,13 +1,11 @@
 import 'dart:async';
 
+import 'package:bloc/bloc.dart';
 import 'package:firebase_database/firebase_database.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:meta/meta.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 part 'one_gang_glass_switch_event.dart';
@@ -15,16 +13,13 @@ part 'one_gang_glass_switch_state.dart';
 
 class OneGangGlassSwitchBloc
     extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
-  late OneGangGlassStatusModel deviceStatus;
-  final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
+  OneGangGlassStatusModel deviceStatus;
+  Timer? _timer;
 
-  OneGangGlassSwitchBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(OneGangGlassSwitchInitial()) {
+  OneGangGlassSwitchBloc({required String deviceId})
+      : deviceStatus = OneGangGlassStatusModel(
+            uuid: deviceId, switch1: false, countDown: 0),
+        super(OneGangGlassSwitchInitial()) {
     on<OneGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
     on<OneGangGlassSwitchControl>(_onControl);
     on<OneGangGlassSwitchBatchControl>(_onBatchControl);
@@ -33,140 +28,160 @@ class OneGangGlassSwitchBloc
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-    OneGangGlassSwitchFetchDeviceEvent event,
-    Emitter<OneGangGlassSwitchState> emit,
-  ) async {
+  Future<void> _onFetchDeviceStatus(OneGangGlassSwitchFetchDeviceEvent event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId, emit);
-      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId);
+      deviceStatus =
+          OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
     }
   }
 
-  void _listenToChanges(
-    String deviceId,
-    Emitter<OneGangGlassSwitchState> emit,
-  ) {
+  _listenToChanges(deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        final data = event.snapshot.value as Map<dynamic, dynamic>?;
-        if (data == null) return;
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
 
-        final statusList = <Status>[];
-        if (data['status'] != null) {
-          for (var element in data['status']) {
-            statusList.add(
-              Status(
-                code: element['code'].toString(),
-                value: element['value'].toString(),
-              ),
-            );
-          }
-        }
-        if (statusList.isNotEmpty) {
-          final newStatus = OneGangGlassStatusModel.fromJson(deviceId, statusList);
-          if (newStatus != deviceStatus) {
-            deviceStatus = newStatus;
-            if (!isClosed) {
-              add(StatusUpdated(deviceStatus));
-            }
-          }
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus = OneGangGlassStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
         }
       });
-    } catch (e) {
-      emit(OneGangGlassSwitchError('Failed to listen to changes: $e'));
-    }
+    } catch (_) {}
   }
 
   void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<OneGangGlassSwitchState> emit,
-  ) {
-    emit(OneGangGlassSwitchLoading());
+      StatusUpdated event, Emitter<OneGangGlassSwitchState> emit) {
     deviceStatus = event.deviceStatus;
     emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
   }
 
-  Future<void> _onControl(
-    OneGangGlassSwitchControl event,
-    Emitter<OneGangGlassSwitchState> emit,
-  ) async {
-    emit(OneGangGlassSwitchLoading());
+  Future<void> _onControl(OneGangGlassSwitchControl event,
+      Emitter<OneGangGlassSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
     _updateLocalValue(event.code, event.value);
     emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
 
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: false,
+    );
+  }
+
+  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event,
+      Emitter<OneGangGlassSwitchState> emit) async {
+    emit(OneGangGlassSwitchLoading());
     try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
+      if (!response) {
+        emit(OneGangGlassSwitchError('Failed to reset device'));
+      } else {
+        emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
+      }
     } catch (e) {
-      _updateLocalValue(event.code, !event.value);
       emit(OneGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onBatchControl(
-    OneGangGlassSwitchBatchControl event,
-    Emitter<OneGangGlassSwitchState> emit,
-  ) async {
-    emit(OneGangGlassSwitchLoading());
+  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event,
+      Emitter<OneGangGlassSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
     _updateLocalValue(event.code, event.value);
     emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
 
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.deviceIds,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(OneGangGlassSwitchError(e.toString()));
-    }
+    await _runDebounce(
+      deviceId: event.deviceIds,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: true,
+    );
   }
 
   Future<void> _onFetchBatchStatus(
-    OneGangGlassSwitchFetchBatchStatusEvent event,
-    Emitter<OneGangGlassSwitchState> emit,
-  ) async {
+      OneGangGlassSwitchFetchBatchStatusEvent event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-      deviceStatus =
-          OneGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = OneGangGlassStatusModel.fromJson(
+          event.deviceIds.first, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onFactoryReset(
-    OneGangGlassFactoryResetEvent event,
-    Emitter<OneGangGlassSwitchState> emit,
-  ) async {
-    emit(OneGangGlassSwitchLoading());
-    try {
-      final response = await DevicesManagementApi().factoryReset(
-        event.factoryReset,
-        event.deviceId,
-      );
-      if (!response) {
-        emit(OneGangGlassSwitchError('Failed to reset device'));
-      } else {
-        add(OneGangGlassSwitchFetchDeviceEvent(event.deviceId));
-      }
-    } catch (e) {
-      emit(OneGangGlassSwitchError(e.toString()));
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required bool value,
+    required bool oldValue,
+    required Emitter<OneGangGlassSwitchState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
     }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+
+    _timer = Timer(const Duration(milliseconds: 500), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          _revertValueAndEmit(id, code, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(id, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<OneGangGlassSwitchState> emit) {
+    _updateLocalValue(code, oldValue);
+    emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
   }
 
   void _updateLocalValue(String code, bool value) {
@@ -174,4 +189,19 @@ class OneGangGlassSwitchBloc
       deviceStatus = deviceStatus.copyWith(switch1: value);
     }
   }
+
+  bool _getValueByCode(String code) {
+    switch (code) {
+      case 'switch_1':
+        return deviceStatus.switch1;
+      default:
+        return false;
+    }
+  }
+
+  @override
+  Future<void> close() {
+    _timer?.cancel();
+    return super.close();
+  }
 }

lib/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
-
-abstract final class OneGangGlassSwitchBlocFactory {
-  const OneGangGlassSwitchBlocFactory._();
-
-  static OneGangGlassSwitchBloc create({
-    required String deviceId,
-  }) {
-    return OneGangGlassSwitchBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_batch_control_view.dart

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
+// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -16,7 +16,7 @@ class OneGangGlassSwitchBatchControlView extends StatelessWidget with HelperResp
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => OneGangGlassSwitchBlocFactory.create(deviceId: deviceIds.first)
+      create: (context) => OneGangGlassSwitchBloc(deviceId: deviceIds.first)
         ..add(OneGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
       child: BlocBuilder<OneGangGlassSwitchBloc, OneGangGlassSwitchState>(
         builder: (context, state) {

lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_switch_control_view.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -10,13 +9,13 @@ import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_la
 class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
   final String deviceId;
 
-  const OneGangGlassSwitchControlView({required this.deviceId, super.key});
+  const OneGangGlassSwitchControlView({required this.deviceId, Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
+          OneGangGlassSwitchBloc(deviceId: deviceId)..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<OneGangGlassSwitchBloc, OneGangGlassSwitchState>(
         builder: (context, state) {
           if (state is OneGangGlassSwitchLoading) {

lib/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart

@@ -6,21 +6,12 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_sta
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
-class WallLightSwitchBloc extends Bloc<WallLightSwitchEvent, WallLightSwitchState> {
-  late WallLightStatusModel deviceStatus;
-  final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
-
-  WallLightSwitchBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(WallLightSwitchInitial()) {
+class WallLightSwitchBloc
+    extends Bloc<WallLightSwitchEvent, WallLightSwitchState> {
+  WallLightSwitchBloc({required this.deviceId})
+      : super(WallLightSwitchInitial()) {
     on<WallLightSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
     on<WallLightSwitchControl>(_onControl);
     on<WallLightSwitchFetchBatchEvent>(_onFetchBatchStatus);
@@ -29,114 +20,143 @@ class WallLightSwitchBloc extends Bloc<WallLightSwitchEvent, WallLightSwitchStat
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-    WallLightSwitchFetchDeviceEvent event,
-    Emitter<WallLightSwitchState> emit,
-  ) async {
+  late WallLightStatusModel deviceStatus;
+  final String deviceId;
+  Timer? _timer;
+
+  FutureOr<void> _onFetchDeviceStatus(WallLightSwitchFetchDeviceEvent event,
+      Emitter<WallLightSwitchState> emit) async {
     emit(WallLightSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId, emit);
-      deviceStatus = WallLightStatusModel.fromJson(event.deviceId, status.status);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+
+      deviceStatus =
+          WallLightStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(WallLightSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(WallLightSwitchError(e.toString()));
     }
   }
 
-  void _listenToChanges(
-    String deviceId,
-    Emitter<WallLightSwitchState> emit,
-  ) {
+  _listenToChanges(deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        final data = event.snapshot.value as Map<dynamic, dynamic>?;
-        if (data == null) return;
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
 
-        final statusList = <Status>[];
-        if (data['status'] != null) {
-          for (var element in data['status']) {
-            statusList.add(
-              Status(
-                code: element['code'].toString(),
-                value: element['value'].toString(),
-              ),
-            );
-          }
-        }
-        if (statusList.isNotEmpty) {
-          final newStatus = WallLightStatusModel.fromJson(deviceId, statusList);
-          if (newStatus != deviceStatus) {
-            deviceStatus = newStatus;
-            if (!isClosed) {
-              add(StatusUpdated(deviceStatus));
-            }
-          }
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            WallLightStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
         }
       });
-    } catch (e) {
-      emit(WallLightSwitchError('Failed to listen to changes: $e'));
-    }
+    } catch (_) {}
   }
 
   void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<WallLightSwitchState> emit,
-  ) {
-    emit(WallLightSwitchLoading());
+      StatusUpdated event, Emitter<WallLightSwitchState> emit) {
     deviceStatus = event.deviceStatus;
     emit(WallLightSwitchStatusLoaded(deviceStatus));
   }
 
-  Future<void> _onControl(
-    WallLightSwitchControl event,
-    Emitter<WallLightSwitchState> emit,
-  ) async {
-    emit(WallLightSwitchLoading());
+  FutureOr<void> _onControl(
+      WallLightSwitchControl event, Emitter<WallLightSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
     _updateLocalValue(event.code, event.value);
+
     emit(WallLightSwitchStatusLoaded(deviceStatus));
 
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(WallLightSwitchError(e.toString()));
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: false,
+    );
+  }
+
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required bool value,
+    required bool oldValue,
+    required Emitter<WallLightSwitchState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
+    }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+
+    _timer = Timer(const Duration(milliseconds: 500), () async {
+      try {
+        late bool response;
+
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          _revertValueAndEmit(id, code, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(id, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<WallLightSwitchState> emit) {
+    _updateLocalValue(code, oldValue);
+    emit(WallLightSwitchStatusLoaded(deviceStatus));
+  }
+
+  void _updateLocalValue(String code, bool value) {
+    if (code == 'switch_1') {
+      deviceStatus = deviceStatus.copyWith(switch1: value);
     }
   }
 
-  Future<void> _onBatchControl(
-    WallLightSwitchBatchControl event,
-    Emitter<WallLightSwitchState> emit,
-  ) async {
-    emit(WallLightSwitchLoading());
-    _updateLocalValue(event.code, event.value);
-    emit(WallLightSwitchStatusLoaded(deviceStatus));
-
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.devicesIds,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(WallLightSwitchError(e.toString()));
+  bool _getValueByCode(String code) {
+    switch (code) {
+      case 'switch_1':
+        return deviceStatus.switch1;
+      default:
+        return false;
     }
   }
 
-  Future<void> _onFetchBatchStatus(
-    WallLightSwitchFetchBatchEvent event,
-    Emitter<WallLightSwitchState> emit,
-  ) async {
+  Future<void> _onFetchBatchStatus(WallLightSwitchFetchBatchEvent event,
+      Emitter<WallLightSwitchState> emit) async {
     emit(WallLightSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus =
           WallLightStatusModel.fromJson(event.devicesIds.first, status.status);
       emit(WallLightSwitchStatusLoaded(deviceStatus));
@@ -145,10 +165,32 @@ class WallLightSwitchBloc extends Bloc<WallLightSwitchEvent, WallLightSwitchStat
     }
   }
 
-  Future<void> _onFactoryReset(
-    WallLightFactoryReset event,
-    Emitter<WallLightSwitchState> emit,
-  ) async {
+  @override
+  Future<void> close() {
+    _timer?.cancel();
+    return super.close();
+  }
+
+  FutureOr<void> _onBatchControl(WallLightSwitchBatchControl event,
+      Emitter<WallLightSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
+    _updateLocalValue(event.code, event.value);
+
+    emit(WallLightSwitchStatusLoaded(deviceStatus));
+
+    await _runDebounce(
+      deviceId: event.devicesIds,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: true,
+    );
+  }
+
+  FutureOr<void> _onFactoryReset(
+      WallLightFactoryReset event, Emitter<WallLightSwitchState> emit) async {
     emit(WallLightSwitchLoading());
     try {
       final response = await DevicesManagementApi().factoryReset(
@@ -156,18 +198,12 @@ class WallLightSwitchBloc extends Bloc<WallLightSwitchEvent, WallLightSwitchStat
         event.deviceId,
       );
       if (!response) {
-        emit(WallLightSwitchError('Failed to reset device'));
+        emit(WallLightSwitchError('Failed'));
       } else {
-        add(WallLightSwitchFetchDeviceEvent(event.deviceId));
+        emit(WallLightSwitchStatusLoaded(deviceStatus));
       }
     } catch (e) {
       emit(WallLightSwitchError(e.toString()));
     }
   }
-
-  void _updateLocalValue(String code, bool value) {
-    if (code == 'switch_1') {
-      deviceStatus = deviceStatus.copyWith(switch1: value);
-    }
-  }
 }

lib/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart';
-
-abstract final class WallLightSwitchBlocFactory {
-  const WallLightSwitchBlocFactory._();
-
-  static WallLightSwitchBloc create({
-    required String deviceId,
-  }) {
-    return WallLightSwitchBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/one_gang_switch/view/wall_light_batch_control.dart

@@ -4,9 +4,9 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
-import 'package:syncrow_web/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
+// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -18,7 +18,7 @@ class WallLightBatchControlView extends StatelessWidget with HelperResponsiveLay
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => WallLightSwitchBlocFactory.create(deviceId: deviceIds.first)
+      create: (context) => WallLightSwitchBloc(deviceId: deviceIds.first)
         ..add(WallLightSwitchFetchBatchEvent(deviceIds)),
       child: BlocBuilder<WallLightSwitchBloc, WallLightSwitchState>(
         builder: (context, state) {

lib/pages/device_managment/one_gang_switch/view/wall_light_device_control.dart

@@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
-import 'package:syncrow_web/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -16,7 +15,7 @@ class WallLightDeviceControl extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => WallLightSwitchBlocFactory.create(deviceId: deviceId)
+      create: (context) => WallLightSwitchBloc(deviceId: deviceId)
         ..add(WallLightSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<WallLightSwitchBloc, WallLightSwitchState>(
         builder: (context, state) {

lib/pages/device_managment/shared/device_control_dialog.dart

@@ -157,7 +157,7 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
             ),
           ),
           const SizedBox(width: 10),
-          SelectableText(
+          Text(
             value,
             style: TextStyle(
               fontSize: 16,

lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart

@@ -1,14 +1,11 @@
 import 'dart:async';
 
-import 'package:equatable/equatable.dart';
+import 'package:bloc/bloc.dart';
 import 'package:firebase_database/firebase_database.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:meta/meta.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/models/three_gang_glass_switch.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 part 'three_gang_glass_switch_event.dart';
@@ -16,16 +13,19 @@ part 'three_gang_glass_switch_state.dart';
 
 class ThreeGangGlassSwitchBloc
     extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
-  late ThreeGangGlassStatusModel deviceStatus;
-  final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
+  ThreeGangGlassStatusModel deviceStatus;
+  Timer? _timer;
 
-  ThreeGangGlassSwitchBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(ThreeGangGlassSwitchInitial()) {
+  ThreeGangGlassSwitchBloc({required String deviceId})
+      : deviceStatus = ThreeGangGlassStatusModel(
+            uuid: deviceId,
+            switch1: false,
+            countDown1: 0,
+            switch2: false,
+            countDown2: 0,
+            switch3: false,
+            countDown3: 0),
+        super(ThreeGangGlassSwitchInitial()) {
     on<ThreeGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
     on<ThreeGangGlassSwitchControl>(_onControl);
     on<ThreeGangGlassSwitchBatchControl>(_onBatchControl);
@@ -34,154 +34,188 @@ class ThreeGangGlassSwitchBloc
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-    ThreeGangGlassSwitchFetchDeviceEvent event,
-    Emitter<ThreeGangGlassSwitchState> emit,
-  ) async {
+  Future<void> _onFetchDeviceStatus(ThreeGangGlassSwitchFetchDeviceEvent event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId, emit);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus =
           ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
-  void _listenToChanges(
-    String deviceId,
-    Emitter<ThreeGangGlassSwitchState> emit,
-  ) {
+  _listenToChanges(deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        final data = event.snapshot.value as Map<dynamic, dynamic>?;
-        if (data == null) return;
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
 
-        final statusList = <Status>[];
-        if (data['status'] != null) {
-          for (var element in data['status']) {
-            statusList.add(
-              Status(
-                code: element['code'].toString(),
-                value: element['value'].toString(),
-              ),
-            );
-          }
-        }
-        if (statusList.isNotEmpty) {
-          final newStatus = ThreeGangGlassStatusModel.fromJson(deviceId, statusList);
-          if (newStatus != deviceStatus) {
-            deviceStatus = newStatus;
-            if (!isClosed) {
-              add(StatusUpdated(deviceStatus));
-            }
-          }
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus = ThreeGangGlassStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
         }
       });
-    } catch (e) {
-      emit(ThreeGangGlassSwitchError('Failed to listen to changes: $e'));
-    }
+    } catch (_) {}
   }
 
   void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<ThreeGangGlassSwitchState> emit,
-  ) {
-    emit(ThreeGangGlassSwitchLoading());
+      StatusUpdated event, Emitter<ThreeGangGlassSwitchState> emit) {
     deviceStatus = event.deviceStatus;
     emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
   }
 
-  Future<void> _onControl(
-    ThreeGangGlassSwitchControl event,
-    Emitter<ThreeGangGlassSwitchState> emit,
-  ) async {
-    emit(ThreeGangGlassSwitchLoading());
+  Future<void> _onControl(ThreeGangGlassSwitchControl event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
     _updateLocalValue(event.code, event.value);
     emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
 
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(ThreeGangGlassSwitchError(e.toString()));
-    }
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: false,
+    );
   }
 
-  Future<void> _onBatchControl(
-    ThreeGangGlassSwitchBatchControl event,
-    Emitter<ThreeGangGlassSwitchState> emit,
-  ) async {
-    emit(ThreeGangGlassSwitchLoading());
+  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
     _updateLocalValue(event.code, event.value);
     emit(ThreeGangGlassSwitchBatchStatusLoaded(deviceStatus));
 
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.deviceIds,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(ThreeGangGlassSwitchError(e.toString()));
-    }
+    await _runDebounce(
+      deviceId: event.deviceIds,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: true,
+    );
   }
 
   Future<void> _onFetchBatchStatus(
-    ThreeGangGlassSwitchFetchBatchStatusEvent event,
-    Emitter<ThreeGangGlassSwitchState> emit,
-  ) async {
+      ThreeGangGlassSwitchFetchBatchStatusEvent event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-      deviceStatus =
-          ThreeGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = ThreeGangGlassStatusModel.fromJson(
+          event.deviceIds.first, status.status);
       emit(ThreeGangGlassSwitchBatchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onFactoryReset(
-    ThreeGangGlassFactoryReset event,
-    Emitter<ThreeGangGlassSwitchState> emit,
-  ) async {
+  Future<void> _onFactoryReset(ThreeGangGlassFactoryReset event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final response = await DevicesManagementApi().factoryReset(
-        event.factoryReset,
-        event.deviceId,
-      );
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
-        emit(ThreeGangGlassSwitchError('Failed to reset device'));
+        emit(ThreeGangGlassSwitchError('Failed'));
       } else {
-        add(ThreeGangGlassSwitchFetchDeviceEvent(event.deviceId));
+        emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
       }
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required bool value,
+    required bool oldValue,
+    required Emitter<ThreeGangGlassSwitchState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
+    }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+
+    _timer = Timer(const Duration(milliseconds: 500), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          _revertValueAndEmit(id, code, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(id, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<ThreeGangGlassSwitchState> emit) {
+    _updateLocalValue(code, oldValue);
+    emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
+  }
+
   void _updateLocalValue(String code, bool value) {
-    switch (code) {
-      case 'switch_1':
-        deviceStatus = deviceStatus.copyWith(switch1: value);
-        break;
-      case 'switch_2':
-        deviceStatus = deviceStatus.copyWith(switch2: value);
-        break;
-      case 'switch_3':
-        deviceStatus = deviceStatus.copyWith(switch3: value);
-        break;
+    if (code == 'switch_1') {
+      deviceStatus = deviceStatus.copyWith(switch1: value);
+    } else if (code == 'switch_2') {
+      deviceStatus = deviceStatus.copyWith(switch2: value);
+    } else if (code == 'switch_3') {
+      deviceStatus = deviceStatus.copyWith(switch3: value);
     }
   }
+
+  bool _getValueByCode(String code) {
+    switch (code) {
+      case 'switch_1':
+        return deviceStatus.switch1;
+      case 'switch_2':
+        return deviceStatus.switch2;
+      case 'switch_3':
+        return deviceStatus.switch3;
+      default:
+        return false;
+    }
+  }
+
+  @override
+  Future<void> close() {
+    _timer?.cancel();
+    return super.close();
+  }
 }

lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_event.dart

@@ -1,10 +1,7 @@
 part of 'three_gang_glass_switch_bloc.dart';
 
 @immutable
-abstract class ThreeGangGlassSwitchEvent extends Equatable {
-  @override
-  List<Object?> get props => [];
-}
+abstract class ThreeGangGlassSwitchEvent {}
 
 class ThreeGangGlassSwitchFetchDeviceEvent extends ThreeGangGlassSwitchEvent {
   final String deviceId;
@@ -22,9 +19,6 @@ class ThreeGangGlassSwitchControl extends ThreeGangGlassSwitchEvent {
     required this.code,
     required this.value,
   });
-
-  @override
-  List<Object?> get props => [deviceId, code, value];
 }
 
 class ThreeGangGlassSwitchBatchControl extends ThreeGangGlassSwitchEvent {
@@ -37,9 +31,6 @@ class ThreeGangGlassSwitchBatchControl extends ThreeGangGlassSwitchEvent {
     required this.code,
     required this.value,
   });
-
-  @override
-  List<Object?> get props => [deviceIds, code, value];
 }
 
 class ThreeGangGlassSwitchFetchBatchStatusEvent
@@ -47,9 +38,6 @@ class ThreeGangGlassSwitchFetchBatchStatusEvent
   final List<String> deviceIds;
 
   ThreeGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
-
-  @override
-  List<Object?> get props => [deviceIds];
 }
 
 class ThreeGangGlassFactoryReset extends ThreeGangGlassSwitchEvent {
@@ -60,9 +48,6 @@ class ThreeGangGlassFactoryReset extends ThreeGangGlassSwitchEvent {
     required this.deviceId,
     required this.factoryReset,
   });
-
-  @override
-  List<Object?> get props => [deviceId, factoryReset];
 }
 
 class StatusUpdated extends ThreeGangGlassSwitchEvent {

lib/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
-
-abstract final class ThreeGangGlassSwitchBlocFactory {
-  const ThreeGangGlassSwitchBlocFactory._();
-
-  static ThreeGangGlassSwitchBloc create({
-    required String deviceId,
-  }) {
-    return ThreeGangGlassSwitchBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_batch_control_view.dart

@@ -5,7 +5,6 @@ import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/models/three_gang_glass_switch.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -17,7 +16,7 @@ class ThreeGangGlassSwitchBatchControlView extends StatelessWidget with HelperRe
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceIds.first)
+      create: (context) => ThreeGangGlassSwitchBloc(deviceId: deviceIds.first)
         ..add(ThreeGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
       child: BlocBuilder<ThreeGangGlassSwitchBloc, ThreeGangGlassSwitchState>(
         builder: (context, state) {

lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -17,7 +16,7 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperRespons
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
+          ThreeGangGlassSwitchBloc(deviceId: deviceId)..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<ThreeGangGlassSwitchBloc, ThreeGangGlassSwitchState>(
         builder: (context, state) {
           if (state is ThreeGangGlassSwitchLoading) {

lib/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart

@@ -1,14 +1,12 @@
-import 'dart:async';
-import 'dart:developer';
+// ignore_for_file: invalid_use_of_visible_for_testing_member
 
+import 'dart:async';
+import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:firebase_database/firebase_database.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 part 'living_room_event.dart';
@@ -17,14 +15,9 @@ part 'living_room_state.dart';
 class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
   late LivingRoomStatusModel deviceStatus;
   final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
+  Timer? _timer;
 
-  LivingRoomBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(LivingRoomInitial()) {
+  LivingRoomBloc({required this.deviceId}) : super(LivingRoomInitial()) {
     on<LivingRoomFetchDeviceStatusEvent>(_onFetchDeviceStatus);
     on<LivingRoomControl>(_livingRoomControl);
     on<LivingRoomBatchControl>(_livingRoomBatchControl);
@@ -33,108 +26,156 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-    LivingRoomFetchDeviceStatusEvent event,
-    Emitter<LivingRoomState> emit,
-  ) async {
+  FutureOr<void> _onFetchDeviceStatus(LivingRoomFetchDeviceStatusEvent event,
+      Emitter<LivingRoomState> emit) async {
     emit(LivingRoomDeviceStatusLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus =
+          LivingRoomStatusModel.fromJson(event.deviceId, status.status);
       _listenToChanges(deviceId);
-      deviceStatus = LivingRoomStatusModel.fromJson(event.deviceId, status.status);
       emit(LivingRoomDeviceStatusLoaded(deviceStatus));
     } catch (e) {
       emit(LivingRoomDeviceManagementError(e.toString()));
     }
   }
 
-  void _listenToChanges(String deviceId) {
-    try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      ref.onValue.listen((event) {
-        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
+  FutureOr<void> _livingRoomControl(
+      LivingRoomControl event, Emitter<LivingRoomState> emit) async {
+    final oldValue = _getValueByCode(event.code);
 
-        List<Status> statusList = [];
-        eventsMap['status'].forEach((element) {
-          statusList.add(
-            Status(code: element['code'], value: element['value']),
-          );
-        });
-
-        deviceStatus = LivingRoomStatusModel.fromJson(deviceId, statusList);
-        add(StatusUpdated(deviceStatus));
-      });
-    } catch (_) {
-      log('Error listening to changes');
-    }
-  }
-
-  void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<LivingRoomState> emit,
-  ) {
-    deviceStatus = event.deviceStatus;
-    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
-  }
-
-  Future<void> _livingRoomControl(
-    LivingRoomControl event,
-    Emitter<LivingRoomState> emit,
-  ) async {
-    emit(LivingRoomDeviceStatusLoading());
     _updateLocalValue(event.code, event.value);
+
     emit(LivingRoomDeviceStatusLoaded(deviceStatus));
 
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(LivingRoomDeviceManagementError(e.toString()));
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: false,
+    );
+  }
+
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required dynamic value,
+    required dynamic oldValue,
+    required Emitter<LivingRoomState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
+    }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(const Duration(seconds: 1), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+        if (!response) {
+          _revertValueAndEmit(id, code, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(id, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(String deviceId, String code, dynamic oldValue,
+      Emitter<LivingRoomState> emit) {
+    _updateLocalValue(code, oldValue);
+    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+  }
+
+  void _updateLocalValue(String code, dynamic value) {
+    switch (code) {
+      case 'switch_1':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(switch1: value);
+        }
+        break;
+      case 'switch_2':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(switch2: value);
+        }
+        break;
+      case 'switch_3':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(switch3: value);
+        }
+        break;
+      default:
+        break;
+    }
+    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+  }
+
+  dynamic _getValueByCode(String code) {
+    switch (code) {
+      case 'switch_1':
+        return deviceStatus.switch1;
+      case 'switch_2':
+        return deviceStatus.switch2;
+      case 'switch_3':
+        return deviceStatus.switch3;
+      default:
+        return null;
     }
   }
 
-  Future<void> _livingRoomBatchControl(
-    LivingRoomBatchControl event,
-    Emitter<LivingRoomState> emit,
-  ) async {
-    emit(LivingRoomDeviceStatusLoading());
-    _updateLocalValue(event.code, event.value);
-    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
-
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.devicesIds,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(LivingRoomDeviceManagementError(e.toString()));
-    }
-  }
-
-  Future<void> _livingRoomFetchBatchControl(
-    LivingRoomFetchBatchEvent event,
-    Emitter<LivingRoomState> emit,
-  ) async {
+  FutureOr<void> _livingRoomFetchBatchControl(
+      LivingRoomFetchBatchEvent event, Emitter<LivingRoomState> emit) async {
     emit(LivingRoomDeviceStatusLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus =
           LivingRoomStatusModel.fromJson(event.devicesIds.first, status.status);
+      // for (var deviceId in event.devicesIds) {
+      //   _listenToChanges(deviceId);
+      // }
       emit(LivingRoomDeviceStatusLoaded(deviceStatus));
     } catch (e) {
       emit(LivingRoomDeviceManagementError(e.toString()));
     }
   }
 
-  Future<void> _livingRoomFactoryReset(
-    LivingRoomFactoryResetEvent event,
-    Emitter<LivingRoomState> emit,
-  ) async {
+  FutureOr<void> _livingRoomBatchControl(
+      LivingRoomBatchControl event, Emitter<LivingRoomState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
+    _updateLocalValue(event.code, event.value);
+
+    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+
+    await _runDebounce(
+      deviceId: event.devicesIds,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: true,
+    );
+  }
+
+  FutureOr<void> _livingRoomFactoryReset(
+      LivingRoomFactoryResetEvent event, Emitter<LivingRoomState> emit) async {
     emit(LivingRoomDeviceStatusLoading());
     try {
       final response = await DevicesManagementApi().factoryReset(
@@ -142,28 +183,42 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
         event.uuid,
       );
       if (!response) {
-        emit(const LivingRoomDeviceManagementError('Failed to reset device'));
+        emit(const LivingRoomDeviceManagementError('Failed'));
       } else {
-        add(LivingRoomFetchDeviceStatusEvent(event.uuid));
+        emit(LivingRoomDeviceStatusLoaded(deviceStatus));
       }
     } catch (e) {
       emit(LivingRoomDeviceManagementError(e.toString()));
     }
   }
 
-  void _updateLocalValue(String code, dynamic value) {
-    if (value is! bool) return;
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-    switch (code) {
-      case 'switch_1':
-        deviceStatus = deviceStatus.copyWith(switch1: value);
-        break;
-      case 'switch_2':
-        deviceStatus = deviceStatus.copyWith(switch2: value);
-        break;
-      case 'switch_3':
-        deviceStatus = deviceStatus.copyWith(switch3: value);
-        break;
-    }
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            LivingRoomStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<LivingRoomState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
   }
 }

lib/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
-
-abstract final class LivingRoomBlocFactory {
-  const LivingRoomBlocFactory._();
-
-  static LivingRoomBloc create({
-    required String deviceId,
-  }) {
-    return LivingRoomBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/three_gang_switch/view/living_room_batch_controls.dart

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -18,7 +17,7 @@ class LivingRoomBatchControlsView extends StatelessWidget with HelperResponsiveL
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          LivingRoomBlocFactory.create(deviceId: deviceIds.first)..add(LivingRoomFetchBatchEvent(deviceIds)),
+          LivingRoomBloc(deviceId: deviceIds.first)..add(LivingRoomFetchBatchEvent(deviceIds)),
       child: BlocBuilder<LivingRoomBloc, LivingRoomState>(
         builder: (context, state) {
           if (state is LivingRoomDeviceStatusLoading) {

lib/pages/device_managment/three_gang_switch/view/living_room_device_control.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -15,7 +14,7 @@ class LivingRoomDeviceControlsView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => LivingRoomBlocFactory.create(deviceId: deviceId)
+      create: (context) => LivingRoomBloc(deviceId: deviceId)
         ..add(LivingRoomFetchDeviceStatusEvent(deviceId)),
       child: BlocBuilder<LivingRoomBloc, LivingRoomState>(
         builder: (context, state) {

lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart

@@ -1,33 +1,26 @@
 import 'dart:async';
-import 'dart:developer';
-
 import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
 import 'package:firebase_database/firebase_database.dart';
-import 'package:flutter/foundation.dart';
+import 'package:meta/meta.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
-
 part 'two_gang_glass_switch_event.dart';
 part 'two_gang_glass_switch_state.dart';
 
 class TwoGangGlassSwitchBloc
     extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
-  final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
-
-  late TwoGangGlassStatusModel deviceStatus;
-
-  TwoGangGlassSwitchBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(TwoGangGlassSwitchInitial()) {
+  TwoGangGlassStatusModel deviceStatus;
+  Timer? _timer;
+  TwoGangGlassSwitchBloc({required String deviceId})
+      : deviceStatus = TwoGangGlassStatusModel(
+            uuid: deviceId,
+            switch1: false,
+            countDown1: 0,
+            switch2: false,
+            countDown2: 0),
+        super(TwoGangGlassSwitchInitial()) {
     on<TwoGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
     on<TwoGangGlassSwitchControl>(_onControl);
     on<TwoGangGlassSwitchBatchControl>(_onBatchControl);
@@ -36,14 +29,14 @@ class TwoGangGlassSwitchBloc
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-    TwoGangGlassSwitchFetchDeviceEvent event,
-    Emitter<TwoGangGlassSwitchState> emit,
-  ) async {
+  Future<void> _onFetchDeviceStatus(TwoGangGlassSwitchFetchDeviceEvent event,
+      Emitter<TwoGangGlassSwitchState> emit) async {
     emit(TwoGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus = TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus =
+          TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
       _listenToChanges(event.deviceId);
       emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
@@ -53,121 +46,200 @@ class TwoGangGlassSwitchBloc
 
   void _listenToChanges(String deviceId) {
     try {
-      final ref = FirebaseDatabase.instance.ref(
-        'device-status/$deviceId',
-      );
-
-      ref.onValue.listen((event) {
-        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      ref.onValue.listen((DatabaseEvent event) {
+        if (event.snapshot.value == null) return;
 
+        Map<dynamic, dynamic> data =
+            event.snapshot.value as Map<dynamic, dynamic>;
         List<Status> statusList = [];
-        eventsMap['status'].forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
+
+        data['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
         });
 
-        deviceStatus = TwoGangGlassStatusModel.fromJson(deviceId, statusList);
-        add(StatusUpdated(deviceStatus));
+        // Parse the new status and add the event
+        final updatedStatus =
+            TwoGangGlassStatusModel.fromJson(data['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(updatedStatus));
+        }
       });
-    } catch (_) {
-      log(
-        'Error listening to changes',
-        name: 'TwoGangGlassSwitchBloc._listenToChanges',
-      );
+    } catch (e) {
+      // Handle errors and emit an error state if necessary
+      if (!isClosed) {
+        // add(TwoGangGlassSwitchError('Error listening to updates: $e'));
+      }
     }
   }
 
-  Future<void> _onControl(
-    TwoGangGlassSwitchControl event,
-    Emitter<TwoGangGlassSwitchState> emit,
-  ) async {
-    emit(TwoGangGlassSwitchLoading());
+  Future<void> _onControl(TwoGangGlassSwitchControl event,
+      Emitter<TwoGangGlassSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
     _updateLocalValue(event.code, event.value);
     emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
 
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(TwoGangGlassSwitchError(e.toString()));
-    }
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: false,
+    );
   }
 
-  Future<void> _onBatchControl(
-    TwoGangGlassSwitchBatchControl event,
-    Emitter<TwoGangGlassSwitchState> emit,
-  ) async {
-    emit(TwoGangGlassSwitchLoading());
+  Future<void> _onBatchControl(TwoGangGlassSwitchBatchControl event,
+      Emitter<TwoGangGlassSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
     _updateLocalValue(event.code, event.value);
     emit(TwoGangGlassSwitchBatchStatusLoaded(deviceStatus));
 
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.deviceIds,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(TwoGangGlassSwitchError(e.toString()));
-    }
+    await _runDebounce(
+      deviceId: event.deviceIds,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: true,
+    );
   }
 
   Future<void> _onFetchBatchStatus(
-    TwoGangGlassSwitchFetchBatchStatusEvent event,
-    Emitter<TwoGangGlassSwitchState> emit,
-  ) async {
+      TwoGangGlassSwitchFetchBatchStatusEvent event,
+      Emitter<TwoGangGlassSwitchState> emit) async {
     emit(TwoGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
       deviceStatus = TwoGangGlassStatusModel.fromJson(
-        event.deviceIds.first,
-        status.status,
-      );
+          event.deviceIds.first, status.status);
       emit(TwoGangGlassSwitchBatchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(TwoGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onFactoryReset(
-    TwoGangGlassFactoryReset event,
-    Emitter<TwoGangGlassSwitchState> emit,
-  ) async {
+  Future<void> _onFactoryReset(TwoGangGlassFactoryReset event,
+      Emitter<TwoGangGlassSwitchState> emit) async {
     emit(TwoGangGlassSwitchLoading());
     try {
-      final response = await DevicesManagementApi().factoryReset(
-        event.factoryReset,
-        event.deviceId,
-      );
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
-        emit(TwoGangGlassSwitchError('Failed to reset device'));
+        emit(TwoGangGlassSwitchError('Failed'));
       } else {
-        add(TwoGangGlassSwitchFetchDeviceEvent(event.deviceId));
+        emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
       }
     } catch (e) {
       emit(TwoGangGlassSwitchError(e.toString()));
     }
   }
 
-  void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<TwoGangGlassSwitchState> emit,
-  ) {
-    deviceStatus = event.deviceStatus;
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required bool value,
+    required bool oldValue,
+    required Emitter<TwoGangGlassSwitchState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
+    }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+
+    _timer = Timer(const Duration(milliseconds: 500), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          _revertValueAndEmit(id, code, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(id, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<TwoGangGlassSwitchState> emit) {
+    _updateLocalValue(code, oldValue);
     emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
   }
 
   void _updateLocalValue(String code, bool value) {
-    switch (code) {
-      case 'switch_1':
-        deviceStatus = deviceStatus.copyWith(switch1: value);
-        break;
-      case 'switch_2':
-        deviceStatus = deviceStatus.copyWith(switch2: value);
-        break;
+    if (code == 'switch_1') {
+      deviceStatus = deviceStatus.copyWith(switch1: value);
+    } else if (code == 'switch_2') {
+      deviceStatus = deviceStatus.copyWith(switch2: value);
     }
   }
+
+  bool _getValueByCode(String code) {
+    switch (code) {
+      case 'switch_1':
+        return deviceStatus.switch1;
+      case 'switch_2':
+        return deviceStatus.switch2;
+      default:
+        return false;
+    }
+  }
+
+  @override
+  Future<void> close() {
+    _timer?.cancel();
+    return super.close();
+  }
+
+  // _listenToChanges(deviceId) {
+  //   try {
+  //     DatabaseReference ref =
+  //         FirebaseDatabase.instance.ref('device-status/$deviceId');
+  //     Stream<DatabaseEvent> stream = ref.onValue;
+
+  //     stream.listen((DatabaseEvent event) {
+  //       Map<dynamic, dynamic> usersMap =
+  //           event.snapshot.value as Map<dynamic, dynamic>;
+
+  //       List<Status> statusList = [];
+  //       usersMap['status'].forEach((element) {
+  //         statusList
+  //             .add(Status(code: element['code'], value: element['value']));
+  //       });
+
+  //       deviceStatus = TwoGangGlassStatusModel.fromJson(
+  //           usersMap['productUuid'], statusList);
+  //       if (!isClosed) {
+  //         add(StatusUpdated(deviceStatus));
+  //       }
+  //     });
+  //   } catch (_) {}
+  // }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<TwoGangGlassSwitchState> emit) {
+    // Update the local deviceStatus with the new status from the event
+    deviceStatus = event.deviceStatus;
+    // Emit the new state with the updated status
+    emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_event.dart

@@ -1,17 +1,12 @@
 part of 'two_gang_glass_switch_bloc.dart';
 
 @immutable
-abstract class TwoGangGlassSwitchEvent extends Equatable {
-  const TwoGangGlassSwitchEvent();
-}
+abstract class TwoGangGlassSwitchEvent {}
 
 class TwoGangGlassSwitchFetchDeviceEvent extends TwoGangGlassSwitchEvent {
   final String deviceId;
 
-  const TwoGangGlassSwitchFetchDeviceEvent(this.deviceId);
-
-  @override
-  List<Object> get props => [deviceId];
+  TwoGangGlassSwitchFetchDeviceEvent(this.deviceId);
 }
 
 class TwoGangGlassSwitchControl extends TwoGangGlassSwitchEvent {
@@ -19,14 +14,11 @@ class TwoGangGlassSwitchControl extends TwoGangGlassSwitchEvent {
   final String code;
   final bool value;
 
-  const TwoGangGlassSwitchControl({
+  TwoGangGlassSwitchControl({
     required this.deviceId,
     required this.code,
     required this.value,
   });
-
-  @override
-  List<Object> get props => [deviceId, code, value];
 }
 
 class TwoGangGlassSwitchBatchControl extends TwoGangGlassSwitchEvent {
@@ -34,43 +26,33 @@ class TwoGangGlassSwitchBatchControl extends TwoGangGlassSwitchEvent {
   final String code;
   final bool value;
 
-  const TwoGangGlassSwitchBatchControl({
+  TwoGangGlassSwitchBatchControl({
     required this.deviceIds,
     required this.code,
     required this.value,
   });
-
-  @override
-  List<Object> get props => [deviceIds, code, value];
 }
 
 class TwoGangGlassSwitchFetchBatchStatusEvent extends TwoGangGlassSwitchEvent {
   final List<String> deviceIds;
 
-  const TwoGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
-
-  @override
-  List<Object> get props => [deviceIds];
+  TwoGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
 }
 
 class TwoGangGlassFactoryReset extends TwoGangGlassSwitchEvent {
   final String deviceId;
   final FactoryResetModel factoryReset;
 
-  const TwoGangGlassFactoryReset({
+  TwoGangGlassFactoryReset({
     required this.deviceId,
     required this.factoryReset,
   });
-
-  @override
-  List<Object> get props => [deviceId, factoryReset];
 }
 
 class StatusUpdated extends TwoGangGlassSwitchEvent {
   final TwoGangGlassStatusModel deviceStatus;
-
-  const StatusUpdated(this.deviceStatus);
-
+  StatusUpdated(this.deviceStatus);
   @override
   List<Object> get props => [deviceStatus];
 }
+

lib/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
-
-abstract final class TwoGangGlassSwitchBlocFactory {
-  const TwoGangGlassSwitchBlocFactory._();
-
-  static TwoGangGlassSwitchBloc create({
-    required String deviceId,
-  }) {
-    return TwoGangGlassSwitchBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_batch_control_view.dart

@@ -5,7 +5,6 @@ import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -17,7 +16,7 @@ class TwoGangGlassSwitchBatchControlView extends StatelessWidget with HelperResp
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: deviceIds.first)
+      create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceIds.first)
         ..add(TwoGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
       child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
         builder: (context, state) {

lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_control_view.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -16,7 +15,7 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+        create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceId)
           ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
         child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
           builder: (context, state) {

lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:developer';
 
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -7,22 +6,10 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_sta
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
-  final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
-
-  late TwoGangStatusModel deviceStatus;
-
-  TwoGangSwitchBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(TwoGangSwitchInitial()) {
+  TwoGangSwitchBloc({required this.deviceId}) : super(TwoGangSwitchInitial()) {
     on<TwoGangSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
     on<TwoGangSwitchControl>(_onControl);
     on<TwoGangSwitchFetchBatchEvent>(_onFetchBatchStatus);
@@ -31,13 +18,16 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-    TwoGangSwitchFetchDeviceEvent event,
-    Emitter<TwoGangSwitchState> emit,
-  ) async {
+  late TwoGangStatusModel deviceStatus;
+  final String deviceId;
+  Timer? _timer;
+
+  FutureOr<void> _onFetchDeviceStatus(TwoGangSwitchFetchDeviceEvent event,
+      Emitter<TwoGangSwitchState> emit) async {
     emit(TwoGangSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = TwoGangStatusModel.fromJson(event.deviceId, status.status);
       _listenToChanges(event.deviceId);
       emit(TwoGangSwitchStatusLoaded(deviceStatus));
@@ -46,91 +36,131 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
     }
   }
 
-  void _listenToChanges(String deviceId) {
-    try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+  FutureOr<void> _onControl(
+      TwoGangSwitchControl event, Emitter<TwoGangSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
 
-      ref.onValue.listen((event) {
-        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
-
-        List<Status> statusList = [];
-        eventsMap['status'].forEach((element) {
-          statusList.add(
-            Status(code: element['code'], value: element['value']),
-          );
-        });
-
-        deviceStatus = TwoGangStatusModel.fromJson(deviceId, statusList);
-        add(StatusUpdated(deviceStatus));
-      });
-    } catch (_) {
-      log(
-        'Error listening to changes',
-        name: 'TwoGangSwitchBloc._listenToChanges',
-      );
-    }
-  }
-
-  Future<void> _onControl(
-    TwoGangSwitchControl event,
-    Emitter<TwoGangSwitchState> emit,
-  ) async {
-    emit(TwoGangSwitchLoading());
     _updateLocalValue(event.code, event.value);
+
     emit(TwoGangSwitchStatusLoaded(deviceStatus));
 
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(TwoGangSwitchError(e.toString()));
-    }
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: false,
+    );
   }
 
-  Future<void> _onBatchControl(
-    TwoGangSwitchBatchControl event,
-    Emitter<TwoGangSwitchState> emit,
-  ) async {
-    emit(TwoGangSwitchLoading());
-    _updateLocalValue(event.code, event.value);
+  Future<void> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required bool value,
+    required bool oldValue,
+    required Emitter<TwoGangSwitchState> emit,
+    required bool isBatch,
+  }) async {
+    late String id;
+
+    if (deviceId is List) {
+      id = deviceId.first;
+    } else {
+      id = deviceId;
+    }
+
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+
+    _timer = Timer(const Duration(milliseconds: 500), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          _revertValueAndEmit(id, code, oldValue, emit);
+        }
+      } catch (e) {
+        _revertValueAndEmit(id, code, oldValue, emit);
+      }
+    });
+  }
+
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<TwoGangSwitchState> emit) {
+    _updateLocalValue(code, oldValue);
     emit(TwoGangSwitchStatusLoaded(deviceStatus));
+  }
 
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.deviceId,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(TwoGangSwitchError(e.toString()));
+  void _updateLocalValue(String code, bool value) {
+    if (code == 'switch_1') {
+      deviceStatus = deviceStatus.copyWith(switch1: value);
+    }
+
+    if (code == 'switch_2') {
+      deviceStatus = deviceStatus.copyWith(switch2: value);
     }
   }
 
-  Future<void> _onFetchBatchStatus(
-    TwoGangSwitchFetchBatchEvent event,
-    Emitter<TwoGangSwitchState> emit,
-  ) async {
+  bool _getValueByCode(String code) {
+    switch (code) {
+      case 'switch_1':
+        return deviceStatus.switch1;
+      case 'switch_2':
+        return deviceStatus.switch2;
+      default:
+        return false;
+    }
+  }
+
+  Future<void> _onFetchBatchStatus(TwoGangSwitchFetchBatchEvent event,
+      Emitter<TwoGangSwitchState> emit) async {
     emit(TwoGangSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
-      deviceStatus = TwoGangStatusModel.fromJson(
-        event.devicesIds.first,
-        status.status,
-      );
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      deviceStatus =
+          TwoGangStatusModel.fromJson(event.devicesIds.first, status.status);
       emit(TwoGangSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(TwoGangSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onFactoryReset(
-    TwoGangFactoryReset event,
-    Emitter<TwoGangSwitchState> emit,
-  ) async {
+  @override
+  Future<void> close() {
+    _timer?.cancel();
+    return super.close();
+  }
+
+  FutureOr<void> _onBatchControl(
+      TwoGangSwitchBatchControl event, Emitter<TwoGangSwitchState> emit) async {
+    final oldValue = _getValueByCode(event.code);
+
+    _updateLocalValue(event.code, event.value);
+
+    emit(TwoGangSwitchStatusLoaded(deviceStatus));
+
+    await _runDebounce(
+      deviceId: event.deviceId,
+      code: event.code,
+      value: event.value,
+      oldValue: oldValue,
+      emit: emit,
+      isBatch: true,
+    );
+  }
+
+  FutureOr<void> _onFactoryReset(
+      TwoGangFactoryReset event, Emitter<TwoGangSwitchState> emit) async {
     emit(TwoGangSwitchLoading());
     try {
       final response = await DevicesManagementApi().factoryReset(
@@ -138,31 +168,42 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
         event.deviceId,
       );
       if (!response) {
-        emit(TwoGangSwitchError('Failed to reset device'));
+        emit(TwoGangSwitchError('Failed'));
       } else {
-        add(TwoGangSwitchFetchDeviceEvent(event.deviceId));
+        emit(TwoGangSwitchStatusLoaded(deviceStatus));
       }
     } catch (e) {
       emit(TwoGangSwitchError(e.toString()));
     }
   }
 
-  void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<TwoGangSwitchState> emit,
-  ) {
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            TwoGangStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<TwoGangSwitchState> emit) {
     deviceStatus = event.deviceStatus;
     emit(TwoGangSwitchStatusLoaded(deviceStatus));
   }
-
-  void _updateLocalValue(String code, bool value) {
-    switch (code) {
-      case 'switch_1':
-        deviceStatus = deviceStatus.copyWith(switch1: value);
-        break;
-      case 'switch_2':
-        deviceStatus = deviceStatus.copyWith(switch2: value);
-        break;
-    }
-  }
 }

lib/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
-
-abstract final class TwoGangSwitchBlocFactory {
-  const TwoGangSwitchBlocFactory._();
-
-  static TwoGangSwitchBloc create({
-    required String deviceId,
-  }) {
-    return TwoGangSwitchBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart

@@ -24,16 +24,16 @@ class TwoGangStatusModel {
     for (var status in jsonList) {
       switch (status.code) {
         case 'switch_1':
-          switch1 = bool.tryParse(status.value.toString()) ?? false;
+          switch1 = status.value ?? false;
           break;
         case 'countdown_1':
-          countDown = int.tryParse(status.value.toString()) ?? 0;
+          countDown = status.value ?? 0;
           break;
         case 'switch_2':
-          switch2 = bool.tryParse(status.value.toString()) ?? false;
+          switch2 = status.value ?? false;
           break;
         case 'countdown_2':
-          countDown2 = int.tryParse(status.value.toString()) ?? 0;
+          countDown2 = status.value ?? 0;
           break;
       }
     }

lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
+// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
-import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -18,7 +18,7 @@ class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayou
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
+      create: (context) => TwoGangSwitchBloc(deviceId: deviceIds.first)
         ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
       child: BlocBuilder<TwoGangSwitchBloc, TwoGangSwitchState>(
         builder: (context, state) {

lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
-import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -16,7 +15,7 @@ class TwoGangDeviceControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceId)
+      create: (context) => TwoGangSwitchBloc(deviceId: deviceId)
         ..add(TwoGangSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<TwoGangSwitchBloc, TwoGangSwitchState>(
         builder: (context, state) {

lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart

@@ -1,28 +1,18 @@
 import 'dart:async';
-import 'dart:developer';
-
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_state.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
 class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
   final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
-
   late WallSensorModel deviceStatus;
+  Timer? _timer;
 
-  WallSensorBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(WallSensorInitialState()) {
+  WallSensorBloc({required this.deviceId}) : super(WallSensorInitialState()) {
     on<WallSensorFetchStatusEvent>(_fetchWallSensorStatus);
     on<WallSensorFetchBatchStatusEvent>(_fetchWallSensorBatchControl);
     on<WallSensorChangeValueEvent>(_changeValue);
@@ -34,28 +24,28 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     on<WallSensorRealtimeUpdateEvent>(_onRealtimeUpdate);
   }
 
-  Future<void> _fetchWallSensorStatus(
-    WallSensorFetchStatusEvent event,
-    Emitter<WallSensorState> emit,
-  ) async {
+  void _fetchWallSensorStatus(
+      WallSensorFetchStatusEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingInitialState());
     try {
-      final response = await DevicesManagementApi().getDeviceStatus(deviceId);
+      var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
-      _listenToChanges(deviceId);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+      _listenToChanges(deviceId);
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
+      return;
     }
   }
 
-  Future<void> _fetchWallSensorBatchControl(
-    WallSensorFetchBatchStatusEvent event,
-    Emitter<WallSensorState> emit,
-  ) async {
+  // Fetch batch status
+  FutureOr<void> _fetchWallSensorBatchControl(
+      WallSensorFetchBatchStatusEvent event,
+      Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingInitialState());
     try {
-      final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      var response =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
     } catch (e) {
@@ -64,105 +54,132 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
   }
 
   void _listenToChanges(String deviceId) {
-    try {
-      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+    DatabaseReference ref =
+        FirebaseDatabase.instance.ref('device-status/$deviceId');
+    ref.onValue.listen((DatabaseEvent event) {
+      final data = event.snapshot.value as Map<dynamic, dynamic>?;
+      if (data == null) return;
 
-      ref.onValue.listen((event) {
-        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
+      final statusList = (data['status'] as List?)
+          ?.map((e) => Status(code: e['code'], value: e['value']))
+          .toList();
 
-        List<Status> statusList = [];
-        eventsMap['status'].forEach((element) {
-          statusList.add(
-            Status(code: element['code'], value: element['value']),
-          );
-        });
-
-        deviceStatus = WallSensorModel.fromJson(statusList);
+      if (statusList != null) {
+        final updatedDeviceStatus = WallSensorModel.fromJson(statusList);
         if (!isClosed) {
-          add(WallSensorRealtimeUpdateEvent(deviceStatus));
+          add(WallSensorRealtimeUpdateEvent(updatedDeviceStatus));
         }
-      });
-    } catch (_) {
-      log(
-        'Error listening to changes',
-        name: 'WallSensorBloc._listenToChanges',
-      );
-    }
+      }
+    });
   }
 
-  Future<void> _changeValue(
-    WallSensorChangeValueEvent event,
-    Emitter<WallSensorState> emit,
-  ) async {
-    emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-    _updateLocalValue(event.code, event.value);
-    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
 
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, event.value == 0 ? 1 : 0);
-      emit(WallSensorFailedState(error: e.toString()));
+  void _changeValue(
+      WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
+    emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
+    if (event.code == 'far_detection') {
+      deviceStatus.farDetection = event.value;
+    } else if (event.code == 'motionless_sensitivity') {
+      deviceStatus.motionlessSensitivity = event.value;
+    } else if (event.code == 'motion_sensitivity_value') {
+      deviceStatus.motionSensitivity = event.value;
+    } else if (event.code == 'no_one_time') {
+      deviceStatus.noBodyTime = event.value;
     }
+    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+    await _runDeBouncer(
+      deviceId: deviceId,
+      code: event.code,
+      value: event.value,
+      isBatch: false,
+      emit: emit,
+    );
   }
 
   Future<void> _onBatchControl(
-    WallSensorBatchControlEvent event,
-    Emitter<WallSensorState> emit,
-  ) async {
+      WallSensorBatchControlEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-    _updateLocalValue(event.code, event.value);
-    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.deviceIds,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (e) {
-      _updateLocalValue(event.code, !event.value);
-      emit(WallSensorFailedState(error: e.toString()));
+    if (event.code == 'far_detection') {
+      deviceStatus.farDetection = event.value;
+    } else if (event.code == 'motionless_sensitivity') {
+      deviceStatus.motionlessSensitivity = event.value;
+    } else if (event.code == 'motion_sensitivity_value') {
+      deviceStatus.motionSensitivity = event.value;
+    } else if (event.code == 'no_one_time') {
+      deviceStatus.noBodyTime = event.value;
     }
+    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+    await _runDeBouncer(
+      deviceId: event.deviceIds,
+      code: event.code,
+      value: event.value,
+      emit: emit,
+      isBatch: true,
+    );
   }
 
-  Future<void> _getDeviceReports(
-    GetDeviceReportsEvent event,
-    Emitter<WallSensorState> emit,
-  ) async {
+  _runDeBouncer({
+    required dynamic deviceId,
+    required String code,
+    required dynamic value,
+    required Emitter<WallSensorState> emit,
+    required bool isBatch,
+  }) {
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(const Duration(seconds: 1), () async {
+      try {
+        late bool response;
+        if (isBatch) {
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
+        } else {
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
+        }
+
+        if (!response) {
+          add(WallSensorFetchStatusEvent());
+        }
+      } catch (_) {
+        await Future.delayed(const Duration(milliseconds: 500));
+        add(WallSensorFetchStatusEvent());
+      }
+    });
+  }
+
+  FutureOr<void> _getDeviceReports(
+      GetDeviceReportsEvent event, Emitter<WallSensorState> emit) async {
     emit(DeviceReportsLoadingState());
+    // final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
+    // final to = DateTime.now().millisecondsSinceEpoch;
+
     try {
-      final reports = await DevicesManagementApi.getDeviceReports(
-        deviceId,
-        event.code,
-      );
-      emit(DeviceReportsState(deviceReport: reports, code: event.code));
+      // await DevicesManagementApi.getDeviceReportsByDate(
+      //         deviceId, event.code, from.toString(), to.toString())
+      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+          .then((value) {
+        emit(DeviceReportsState(deviceReport: value, code: event.code));
+      });
     } catch (e) {
       emit(DeviceReportsFailedState(error: e.toString()));
+      return;
     }
   }
 
   void _showDescription(
-    ShowDescriptionEvent event,
-    Emitter<WallSensorState> emit,
-  ) {
+      ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorShowDescriptionState(description: event.description));
   }
 
   void _backToGridView(
-    BackToGridViewEvent event,
-    Emitter<WallSensorState> emit,
-  ) {
+      BackToGridViewEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
   }
 
-  Future<void> _onFactoryReset(
-    WallSensorFactoryResetEvent event,
-    Emitter<WallSensorState> emit,
-  ) async {
+  FutureOr<void> _onFactoryReset(
+      WallSensorFactoryResetEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
     try {
       final response = await DevicesManagementApi().factoryReset(
@@ -170,9 +187,9 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
         event.deviceId,
       );
       if (!response) {
-        emit(const WallSensorFailedState(error: 'Failed to reset device'));
+        emit(const WallSensorFailedState(error: 'Failed'));
       } else {
-        add(WallSensorFetchStatusEvent());
+        emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
       }
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
@@ -183,23 +200,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     WallSensorRealtimeUpdateEvent event,
     Emitter<WallSensorState> emit,
   ) {
-    emit(WallSensorUpdateState(wallSensorModel: event.deviceStatus));
-  }
-
-  void _updateLocalValue(String code, dynamic value) {
-    switch (code) {
-      case 'far_detection':
-        deviceStatus.farDetection = value;
-        break;
-      case 'motionless_sensitivity':
-        deviceStatus.motionlessSensitivity = value;
-        break;
-      case 'motion_sensitivity_value':
-        deviceStatus.motionSensitivity = value;
-        break;
-      case 'no_one_time':
-        deviceStatus.noBodyTime = value;
-        break;
-    }
+    deviceStatus = event.deviceStatus;
+    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
   }
 }

lib/pages/device_managment/wall_sensor/factories/wall_sensor_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_bloc.dart';
-
-abstract final class WallSensorBlocFactory {
-  const WallSensorBlocFactory._();
-
-  static WallSensorBloc create({
-    required String deviceId,
-  }) {
-    return WallSensorBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart

@@ -7,7 +7,6 @@ import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presen
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_state.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/factories/wall_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -22,7 +21,7 @@ class WallSensorBatchControlView extends StatelessWidget with HelperResponsiveLa
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => WallSensorBlocFactory.create(deviceId: devicesIds.first)
+      create: (context) => WallSensorBloc(deviceId: devicesIds.first)
         ..add(WallSensorFetchBatchStatusEvent(devicesIds)),
       child: BlocBuilder<WallSensorBloc, WallSensorState>(
         builder: (context, state) {

lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart

@@ -10,7 +10,6 @@ import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presen
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_static_widget.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_status.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/factories/wall_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -27,7 +26,7 @@ class WallSensorControlsView extends StatelessWidget with HelperResponsiveLayout
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
       create: (context) =>
-          WallSensorBlocFactory.create(deviceId: device.uuid!)..add(WallSensorFetchStatusEvent()),
+          WallSensorBloc(deviceId: device.uuid!)..add(WallSensorFetchStatusEvent()),
       child: BlocBuilder<WallSensorBloc, WallSensorState>(
         builder: (context, state) {
           if (state is WallSensorLoadingInitialState || state is DeviceReportsLoadingState) {

lib/pages/device_managment/water_heater/bloc/water_heater_bloc.dart

@@ -1,3 +1,5 @@
+// water_heater_bloc.dart
+
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
@@ -8,8 +10,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_sta
 import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/utils/format_date_time.dart';
 
@@ -17,17 +17,7 @@ part 'water_heater_event.dart';
 part 'water_heater_state.dart';
 
 class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
-  late WaterHeaterStatusModel deviceStatus;
-  final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
-  Timer? _countdownTimer;
-
-  WaterHeaterBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(WaterHeaterInitial()) {
+  WaterHeaterBloc() : super(WaterHeaterInitial()) {
     on<WaterHeaterFetchStatusEvent>(_fetchWaterHeaterStatus);
     on<ToggleWaterHeaterEvent>(_controlWaterHeater);
     on<FetchWaterHeaterBatchStatusEvent>(_batchFetchWaterHeater);
@@ -39,6 +29,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     on<UpdateSelectedTimeEvent>(_updateSelectedTime);
     on<UpdateSelectedDayEvent>(_updateSelectedDay);
     on<UpdateFunctionOnEvent>(_updateFunctionOn);
+
     on<GetSchedulesEvent>(_getSchedule);
     on<AddScheduleEvent>(_onAddSchedule);
     on<EditWaterHeaterScheduleEvent>(_onEditSchedule);
@@ -47,7 +38,11 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  void _initializeAddSchedule(
+  late WaterHeaterStatusModel deviceStatus;
+  Timer? _countdownTimer;
+  // Timer? _inchingTimer;
+
+  FutureOr<void> _initializeAddSchedule(
     InitializeAddScheduleEvent event,
     Emitter<WaterHeaterState> emit,
   ) {
@@ -69,7 +64,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _updateSelectedTime(
+  FutureOr<void> _updateSelectedTime(
     UpdateSelectedTimeEvent event,
     Emitter<WaterHeaterState> emit,
   ) {
@@ -78,7 +73,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     emit(currentState.copyWith(selectedTime: event.selectedTime));
   }
 
-  void _updateSelectedDay(
+  FutureOr<void> _updateSelectedDay(
     UpdateSelectedDayEvent event,
     Emitter<WaterHeaterState> emit,
   ) {
@@ -89,7 +84,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         selectedDays: updatedDays, selectedTime: currentState.selectedTime));
   }
 
-  void _updateFunctionOn(
+  FutureOr<void> _updateFunctionOn(
     UpdateFunctionOnEvent event,
     Emitter<WaterHeaterState> emit,
   ) {
@@ -98,18 +93,16 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         functionOn: event.isOn, selectedTime: currentState.selectedTime));
   }
 
-  Future<void> _updateScheduleEvent(
+  FutureOr<void> _updateScheduleEvent(
     UpdateScheduleEvent event,
     Emitter<WaterHeaterState> emit,
   ) async {
     final currentState = state;
     if (currentState is WaterHeaterDeviceStatusLoaded) {
       if (event.scheduleMode == ScheduleModes.schedule) {
-        emit(
-          currentState.copyWith(
-            scheduleMode: ScheduleModes.schedule,
-          ),
-        );
+        emit(currentState.copyWith(
+          scheduleMode: ScheduleModes.schedule,
+        ));
       }
       if (event.scheduleMode == ScheduleModes.countdown) {
         final countdownRemaining =
@@ -123,88 +116,87 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           countdownRemaining: countdownRemaining,
         ));
 
-        if (!currentState.isCountdownActive! && countdownRemaining > Duration.zero) {
+        if (!currentState.isCountdownActive! &&
+            countdownRemaining > Duration.zero) {
           _startCountdownTimer(emit, countdownRemaining);
         }
       } else if (event.scheduleMode == ScheduleModes.inching) {
-        final inchingDuration = Duration(hours: event.hours, minutes: event.minutes);
+        final inchingDuration =
+            Duration(hours: event.hours, minutes: event.minutes);
 
-        emit(
-          currentState.copyWith(
-            scheduleMode: ScheduleModes.inching,
-            inchingHours: inchingDuration.inHours,
-            inchingMinutes: inchingDuration.inMinutes % 60,
-            isInchingActive: currentState.isInchingActive,
-          ),
-        );
+        emit(currentState.copyWith(
+          scheduleMode: ScheduleModes.inching,
+          inchingHours: inchingDuration.inHours,
+          inchingMinutes: inchingDuration.inMinutes % 60,
+          isInchingActive: currentState.isInchingActive,
+        ));
       }
     }
   }
 
-  Future<void> _controlWaterHeater(
+  FutureOr<void> _controlWaterHeater(
     ToggleWaterHeaterEvent event,
     Emitter<WaterHeaterState> emit,
   ) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
+      final oldValue = _getValueByCode(event.code);
+
       _updateLocalValue(event.code, event.value);
 
-      emit(
-        currentState.copyWith(
-          status: deviceStatus,
-        ),
-      );
+      emit(currentState.copyWith(
+        status: deviceStatus,
+      ));
 
-      final success = await controlDeviceService.controlDevice(
-        deviceUuid: event.deviceId,
-        status: Status(
-          code: event.code,
-          value: event.value,
-        ),
+      final success = await _runDebounce(
+        deviceId: event.deviceId,
+        code: event.code,
+        value: event.value,
+        oldValue: oldValue,
+        emit: emit,
+        isBatch: false,
       );
 
       if (success) {
         if (event.code == "countdown_1") {
           final countdownDuration = Duration(seconds: event.value);
 
-          emit(
-            currentState.copyWith(
-              countdownHours: countdownDuration.inHours,
-              countdownMinutes: countdownDuration.inMinutes % 60,
-              countdownRemaining: countdownDuration,
-              isCountdownActive: true,
-            ),
-          );
+          emit(currentState.copyWith(
+            countdownHours: countdownDuration.inHours,
+            countdownMinutes: countdownDuration.inMinutes % 60,
+            countdownRemaining: countdownDuration,
+            isCountdownActive: true,
+          ));
 
           if (countdownDuration.inSeconds > 0) {
             _startCountdownTimer(emit, countdownDuration);
           } else {
             _countdownTimer?.cancel();
-            emit(
-              currentState.copyWith(
-                countdownHours: 0,
-                countdownMinutes: 0,
-                countdownRemaining: Duration.zero,
-                isCountdownActive: false,
-              ),
-            );
+            emit(currentState.copyWith(
+              countdownHours: 0,
+              countdownMinutes: 0,
+              countdownRemaining: Duration.zero,
+              isCountdownActive: false,
+            ));
           }
         } else if (event.code == "switch_inching") {
           final inchingDuration = Duration(seconds: event.value);
-          emit(
-            currentState.copyWith(
-              inchingHours: inchingDuration.inHours,
-              inchingMinutes: inchingDuration.inMinutes % 60,
-              isInchingActive: true,
-            ),
-          );
+          //if (inchingDuration.inSeconds > 0) {
+          // _startInchingTimer(emit, inchingDuration);
+          //  } else {
+          emit(currentState.copyWith(
+            inchingHours: inchingDuration.inHours,
+            inchingMinutes: inchingDuration.inMinutes % 60,
+            isInchingActive: true,
+          ));
+          // }
         }
       }
     }
   }
 
-  Future<void> _stopScheduleEvent(
+  FutureOr<void> _stopScheduleEvent(
     StopScheduleEvent event,
     Emitter<WaterHeaterState> emit,
   ) async {
@@ -215,28 +207,25 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
       _countdownTimer?.cancel();
 
       if (isCountDown) {
-        emit(
-          currentState.copyWith(
-            countdownHours: 0,
-            countdownMinutes: 0,
-            countdownRemaining: Duration.zero,
-            isCountdownActive: false,
-          ),
-        );
+        emit(currentState.copyWith(
+          countdownHours: 0,
+          countdownMinutes: 0,
+          countdownRemaining: Duration.zero,
+          isCountdownActive: false,
+        ));
       } else if (currentState.scheduleMode == ScheduleModes.inching) {
-        emit(
-          currentState.copyWith(
-            inchingHours: 0,
-            inchingMinutes: 0,
-            isInchingActive: false,
-          ),
-        );
+        emit(currentState.copyWith(
+          inchingHours: 0,
+          inchingMinutes: 0,
+          isInchingActive: false,
+        ));
       }
 
       try {
         final status = await DevicesManagementApi().deviceControl(
           event.deviceId,
-          Status(code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
+          Status(
+              code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
         );
         if (!status) {
           emit(const WaterHeaterFailedState(error: 'Failed to stop schedule.'));
@@ -247,15 +236,17 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  Future<void> _fetchWaterHeaterStatus(
+  FutureOr<void> _fetchWaterHeaterStatus(
     WaterHeaterFetchStatusEvent event,
     Emitter<WaterHeaterState> emit,
   ) async {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus = WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus =
+          WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
 
       if (deviceStatus.scheduleMode == ScheduleModes.countdown) {
         final countdownRemaining = Duration(
@@ -297,6 +288,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
             inchingMinutes: deviceStatus.inchingMinutes,
             isInchingActive: true,
           ));
+//_startInchingTimer(emit, inchingDuration);
         } else {
           emit(WaterHeaterDeviceStatusLoaded(
             deviceStatus,
@@ -324,7 +316,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _listenToChanges(deviceId) {
+  _listenToChanges(deviceId) {
     try {
       DatabaseReference ref =
           FirebaseDatabase.instance.ref('device-status/$deviceId');
@@ -336,11 +328,12 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
         List<Status> statusList = [];
         usersMap['status'].forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
         });
 
-        deviceStatus =
-            WaterHeaterStatusModel.fromJson(usersMap['productUuid'], statusList);
+        deviceStatus = WaterHeaterStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
         if (!isClosed) {
           add(StatusUpdated(deviceStatus));
         }
@@ -348,10 +341,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     } catch (_) {}
   }
 
-  void _onStatusUpdated(
-    StatusUpdated event,
-    Emitter<WaterHeaterState> emit,
-  ) {
+  void _onStatusUpdated(StatusUpdated event, Emitter<WaterHeaterState> emit) {
     deviceStatus = event.deviceStatus;
     emit(WaterHeaterDeviceStatusLoaded(deviceStatus));
   }
@@ -362,13 +352,23 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
   ) {
     _countdownTimer?.cancel();
 
-    _countdownTimer = Timer.periodic(
-      const Duration(minutes: 1),
-      (timer) => add(DecrementCountdownEvent()),
-    );
+    _countdownTimer = Timer.periodic(const Duration(minutes: 1), (timer) {
+      add(DecrementCountdownEvent());
+    });
   }
 
-  void _onDecrementCountdown(
+  // void _startInchingTimer(
+  //   Emitter<WaterHeaterState> emit,
+  //   Duration inchingDuration,
+  // ) {
+  //   _inchingTimer?.cancel();
+
+  //   _inchingTimer = Timer.periodic(const Duration(minutes: 1), (timer) {
+  //     add(DecrementInchingEvent());
+  //   });
+  // }
+
+  _onDecrementCountdown(
     DecrementCountdownEvent event,
     Emitter<WaterHeaterState> emit,
   ) {
@@ -382,29 +382,105 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
         if (newRemaining <= Duration.zero) {
           _countdownTimer?.cancel();
-          emit(
-            currentState.copyWith(
-              countdownHours: 0,
-              countdownMinutes: 0,
-              isCountdownActive: false,
-              countdownRemaining: Duration.zero,
-            ),
-          );
+          emit(currentState.copyWith(
+            countdownHours: 0,
+            countdownMinutes: 0,
+            isCountdownActive: false,
+            countdownRemaining: Duration.zero,
+          ));
           return;
         }
 
-        final totalSeconds = newRemaining.inSeconds;
-        final newHours = totalSeconds ~/ 3600;
-        final newMinutes = (totalSeconds % 3600) ~/ 60;
+        int totalSeconds = newRemaining.inSeconds;
 
-        emit(
-          currentState.copyWith(
-            countdownHours: newHours,
-            countdownMinutes: newMinutes,
-            countdownRemaining: newRemaining,
-          ),
+        int newHours = totalSeconds ~/ 3600;
+        int newMinutes = (totalSeconds % 3600) ~/ 60;
+
+        emit(currentState.copyWith(
+          countdownHours: newHours,
+          countdownMinutes: newMinutes,
+          countdownRemaining: newRemaining,
+        ));
+      }
+    }
+  }
+
+  // FutureOr<void> _onDecrementInching(
+  //   DecrementInchingEvent event,
+  //   Emitter<WaterHeaterState> emit,
+  // ) {
+  //   if (state is WaterHeaterDeviceStatusLoaded) {
+  //     final currentState = state as WaterHeaterDeviceStatusLoaded;
+
+  //     if (currentState.inchingHours > 0 || currentState.inchingMinutes > 0) {
+  //       final newRemaining = Duration(
+  //             hours: currentState.inchingHours,
+  //             minutes: currentState.inchingMinutes,
+  //           ) -
+  //           const Duration(minutes: 1);
+
+  //       if (newRemaining <= Duration.zero) {
+  //         _inchingTimer?.cancel();
+  //         emit(currentState.copyWith(
+  //           inchingHours: 0,
+  //           inchingMinutes: 0,
+  //           isInchingActive: false,
+  //         ));
+  //       } else {
+  //         emit(currentState.copyWith(
+  //           inchingHours: newRemaining.inHours,
+  //           inchingMinutes: newRemaining.inMinutes % 60,
+  //         ));
+  //       }
+  //     }
+  //   }
+  // }
+
+  Future<bool> _runDebounce({
+    required dynamic deviceId,
+    required String code,
+    required dynamic value,
+    required dynamic oldValue,
+    required Emitter<WaterHeaterState> emit,
+    required bool isBatch,
+  }) async {
+    try {
+      late bool status;
+      await Future.delayed(const Duration(milliseconds: 500));
+
+      if (isBatch) {
+        status = await DevicesManagementApi().deviceBatchControl(
+          deviceId,
+          code,
+          value,
+        );
+      } else {
+        status = await DevicesManagementApi().deviceControl(
+          deviceId,
+          Status(code: code, value: value),
         );
       }
+
+      if (!status) {
+        _revertValue(code, oldValue, emit.call);
+        return false;
+      } else {
+        return true;
+      }
+    } catch (e) {
+      _revertValue(code, oldValue, emit.call);
+      return false;
+    }
+  }
+
+  void _revertValue(String code, dynamic oldValue,
+      void Function(WaterHeaterState state) emit) {
+    _updateLocalValue(code, oldValue);
+    if (state is WaterHeaterDeviceStatusLoaded) {
+      final currentState = state as WaterHeaterDeviceStatusLoaded;
+      emit(currentState.copyWith(
+        status: deviceStatus,
+      ));
     }
   }
 
@@ -429,12 +505,14 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
   }
 
   dynamic _getValueByCode(String code) {
-    return switch (code) {
-      'switch_1' => deviceStatus.heaterSwitch,
-      'countdown_1' =>
-        (deviceStatus.countdownHours * 60) + deviceStatus.countdownMinutes,
-      _ => null,
-    };
+    switch (code) {
+      case 'switch_1':
+        return deviceStatus.heaterSwitch;
+      case 'countdown_1':
+        return deviceStatus.countdownHours * 60 + deviceStatus.countdownMinutes;
+      default:
+        return null;
+    }
   }
 
   @override
@@ -443,17 +521,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     return super.close();
   }
 
-  Future<void> _getSchedule(
-    GetSchedulesEvent event,
-    Emitter<WaterHeaterState> emit,
-  ) async {
+  FutureOr<void> _getSchedule(
+      GetSchedulesEvent event, Emitter<WaterHeaterState> emit) async {
     emit(ScheduleLoadingState());
 
     try {
-      final schedules = await DevicesManagementApi().getDeviceSchedules(
-        deviceStatus.uuid,
-        event.category,
-      );
+      List<ScheduleModel> schedules = await DevicesManagementApi()
+          .getDeviceSchedules(deviceStatus.uuid, event.category);
 
       emit(WaterHeaterDeviceStatusLoaded(
         deviceStatus,
@@ -461,6 +535,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         scheduleMode: ScheduleModes.schedule,
       ));
     } catch (e) {
+      //(const WaterHeaterFailedState(error: 'Failed to fetch schedules.'));
       emit(WaterHeaterDeviceStatusLoaded(
         deviceStatus,
         schedules: const [],
@@ -468,7 +543,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  Future<void> _onAddSchedule(
+  FutureOr<void> _onAddSchedule(
     AddScheduleEvent event,
     Emitter<WaterHeaterState> emit,
   ) async {
@@ -482,6 +557,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
 
+      // emit(ScheduleLoadingState());
+
       bool success = await DevicesManagementApi()
           .addScheduleRecord(newSchedule, currentState.status.uuid);
 
@@ -489,14 +566,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         add(GetSchedulesEvent(category: 'switch_1', uuid: deviceStatus.uuid));
       } else {
         emit(currentState);
+        //emit(const WaterHeaterFailedState(error: 'Failed to add schedule.'));
       }
     }
   }
 
-  Future<void> _onEditSchedule(
-    EditWaterHeaterScheduleEvent event,
-    Emitter<WaterHeaterState> emit,
-  ) async {
+  FutureOr<void> _onEditSchedule(EditWaterHeaterScheduleEvent event,
+      Emitter<WaterHeaterState> emit) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
@@ -508,6 +584,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
 
+      // emit(ScheduleLoadingState());
+
       bool success = await DevicesManagementApi().editScheduleRecord(
         currentState.status.uuid,
         newSchedule,
@@ -517,11 +595,12 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         add(GetSchedulesEvent(category: 'switch_1', uuid: deviceStatus.uuid));
       } else {
         emit(currentState);
+        //emit(const WaterHeaterFailedState(error: 'Failed to add schedule.'));
       }
     }
   }
 
-  Future<void> _onUpdateSchedule(
+  FutureOr<void> _onUpdateSchedule(
     UpdateScheduleEntryEvent event,
     Emitter<WaterHeaterState> emit,
   ) async {
@@ -548,17 +627,20 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         emit(currentState.copyWith(schedules: updatedSchedules));
       } else {
         emit(currentState);
+        // emit(const WaterHeaterFailedState(error: 'Failed to update schedule.'));
       }
     }
   }
 
-  Future<void> _onDeleteSchedule(
+  FutureOr<void> _onDeleteSchedule(
     DeleteScheduleEvent event,
     Emitter<WaterHeaterState> emit,
   ) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
+      // emit(ScheduleLoadingState());
+
       bool success = await DevicesManagementApi()
           .deleteScheduleRecord(currentState.status.uuid, event.scheduleId);
 
@@ -570,22 +652,20 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         emit(currentState.copyWith(schedules: updatedSchedules));
       } else {
         emit(currentState);
+        // emit(const WaterHeaterFailedState(error: 'Failed to delete schedule.'));
       }
     }
   }
 
-  Future<void> _batchFetchWaterHeater(
-    FetchWaterHeaterBatchStatusEvent event,
-    Emitter<WaterHeaterState> emit,
-  ) async {
+  FutureOr<void> _batchFetchWaterHeater(FetchWaterHeaterBatchStatusEvent event,
+      Emitter<WaterHeaterState> emit) async {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status = await DevicesManagementApi().getBatchStatus(
-        event.devicesUuid,
-      );
-      deviceStatus =
-          WaterHeaterStatusModel.fromJson(event.devicesUuid.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.devicesUuid);
+      deviceStatus = WaterHeaterStatusModel.fromJson(
+          event.devicesUuid.first, status.status);
 
       emit(WaterHeaterDeviceStatusLoaded(deviceStatus));
     } catch (e) {
@@ -593,8 +673,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  Future<void> _batchControlWaterHeater(
-      ControlWaterHeaterBatchEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _batchControlWaterHeater(ControlWaterHeaterBatchEvent event,
+      Emitter<WaterHeaterState> emit) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
@@ -606,10 +686,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         status: deviceStatus,
       ));
 
-      final success = await batchControlDevicesService.batchControlDevices(
-        uuids: event.devicesUuid,
+      final success = await _runDebounce(
+        deviceId: event.devicesUuid,
         code: event.code,
         value: event.value,
+        oldValue: oldValue,
+        emit: emit,
+        isBatch: true,
       );
 
       if (success) {

lib/pages/device_managment/water_heater/bloc/water_heater_state.dart

@@ -1,3 +1,5 @@
+// water_heater_state.dart
+
 part of 'water_heater_bloc.dart';
 
 sealed class WaterHeaterState extends Equatable {

lib/pages/device_managment/water_heater/factories/water_heater_bloc_factory.dart

@@ -1,18 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-
-abstract final class WaterHeaterBlocFactory {
-  const WaterHeaterBlocFactory._();
-
-  static WaterHeaterBloc create({
-    required String deviceId,
-  }) {
-    return WaterHeaterBloc(
-      deviceId: deviceId,
-      controlDeviceService:
-          DeviceBlocDependenciesFactory.createControlDeviceService(),
-      batchControlDevicesService:
-          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
-    );
-  }
-}

lib/pages/device_managment/water_heater/view/water_heater_batch_control.dart

@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/factories/water_heater_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class WaterHEaterBatchControlView extends StatelessWidget
-    with HelperResponsiveLayout {
+class WaterHEaterBatchControlView extends StatelessWidget with HelperResponsiveLayout {
   const WaterHEaterBatchControlView({super.key, required this.deviceIds});
 
   final List<String> deviceIds;
@@ -18,9 +17,8 @@ class WaterHEaterBatchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => WaterHeaterBlocFactory.create(
-        deviceId: deviceIds.first,
-      )..add(FetchWaterHeaterBatchStatusEvent(devicesUuid: deviceIds)),
+      create: (context) =>
+          WaterHeaterBloc()..add(FetchWaterHeaterBatchStatusEvent(devicesUuid: deviceIds)),
       child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
         builder: (context, state) {
           if (state is WaterHeaterLoadingState) {

lib/pages/device_managment/water_heater/view/water_heater_device_control.dart

@@ -5,7 +5,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/factories/water_heater_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedual_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -22,9 +21,8 @@ class WaterHeaterDeviceControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) => WaterHeaterBlocFactory.create(
-              deviceId: device.uuid ?? '',
-            )..add(WaterHeaterFetchStatusEvent(device.uuid!)),
+        create: (context) =>
+            WaterHeaterBloc()..add(WaterHeaterFetchStatusEvent(device.uuid!)),
         child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
           builder: (context, state) {
             if (state is WaterHeaterLoadingState) {
@@ -35,7 +33,8 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                 state is WaterHeaterBatchFailedState) {
               return const Center(child: Text('Error fetching status'));
             } else {
-              return const SizedBox(height: 200, child: Center(child: SizedBox()));
+              return const SizedBox(
+                  height: 200, child: Center(child: SizedBox()));
             }
           },
         ));

lib/pages/routines/widgets/condition_toggle.dart

@@ -12,53 +12,22 @@ class ConditionToggle extends StatelessWidget {
   });
 
   static const _conditions = ["<", "==", ">"];
-  static const _icons = [
-    Icons.chevron_left,
-    Icons.drag_handle,
-    Icons.chevron_right
-  ];
 
   @override
   Widget build(BuildContext context) {
-    final selectedIndex = _conditions.indexOf(currentCondition ?? "==");
-
-    return Container(
-      height: 30,
-      width: MediaQuery.of(context).size.width * 0.1,
-      decoration: BoxDecoration(
-        color: ColorsManager.softGray.withOpacity(0.5),
-        borderRadius: BorderRadius.circular(50),
-      ),
-      clipBehavior: Clip.antiAlias,
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: List.generate(_conditions.length, (index) {
-          final isSelected = index == selectedIndex;
-          return Expanded(
-            child: InkWell(
-              onTap: () => onChanged(_conditions[index]),
-              child: AnimatedContainer(
-                duration: const Duration(milliseconds: 180),
-                curve: Curves.ease,
-                decoration: BoxDecoration(
-                  color:
-                      isSelected ? ColorsManager.vividBlue : Colors.transparent,
-                ),
-                child: Center(
-                  child: Icon(
-                    _icons[index],
-                    size: 20,
-                    color: isSelected
-                        ? ColorsManager.whiteColors
-                        : ColorsManager.blackColor,
-                    weight: isSelected ? 700 : 500,
-                  ),
-                ),
-              ),
-            ),
-          );
-        }),
+    return ToggleButtons(
+      onPressed: (index) => onChanged(_conditions[index]),
+      borderRadius: const BorderRadius.all(Radius.circular(8)),
+      selectedBorderColor: ColorsManager.primaryColorWithOpacity,
+      selectedColor: Colors.white,
+      fillColor: ColorsManager.primaryColorWithOpacity,
+      color: ColorsManager.primaryColorWithOpacity,
+      constraints: const BoxConstraints(
+        minHeight: 40.0,
+        minWidth: 40.0,
       ),
+      isSelected: _conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      children: _conditions.map((c) => Text(c)).toList(),
     );
   }
 }

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -24,6 +24,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     on<PaginationEvent>(_fetchPaginationSpaces);
     on<DebouncedSearchEvent>(_onDebouncedSearch);
     on<SpaceTreeClearSelectionEvent>(_onSpaceTreeClearSelectionEvent);
+    on<AnalyticsClearAllSpaceTreeSelectionsEvent>(
+      _onAnalyticsClearAllSpaceTreeSelectionsEvent,
+    );
   }
   Timer _timer = Timer(const Duration(microseconds: 0), () {});
 
@@ -493,6 +496,20 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     );
   }
 
+  void _onAnalyticsClearAllSpaceTreeSelectionsEvent(
+    AnalyticsClearAllSpaceTreeSelectionsEvent event,
+    Emitter<SpaceTreeState> emit,
+  ) async {
+    emit(
+      state.copyWith(
+        selectedCommunities: [],
+        selectedCommunityAndSpaces: {},
+        selectedSpaces: [],
+        soldCheck: [],
+      ),
+    );
+  }
+
   @override
   Future<void> close() async {
     _timer.cancel();

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -112,3 +112,7 @@ class ClearCachedData extends SpaceTreeEvent {}
 class SpaceTreeClearSelectionEvent extends SpaceTreeEvent {
   const SpaceTreeClearSelectionEvent();
 }
+
+final class AnalyticsClearAllSpaceTreeSelectionsEvent extends SpaceTreeEvent {
+  const AnalyticsClearAllSpaceTreeSelectionsEvent();
+}