Merge branch 'dev' of https://github.com/SyncrowIOT/syncrow-app into SP-1246

updated device endpoint
2026-03-11 01:21:43 +00:00 · 2025-04-03 10:47:27 +04:00 · 2025-04-03 10:47:09 +04:00
12 changed files with 344 additions and 591 deletions
--- a/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart
+++ b/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart
@ -169,19 +169,18 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
    }
  }

-  List<DeviceModel> _getOnlyImplementedDevices(List<DeviceModel> devices) {
-    const allowedDeviceTypes = {
-      DeviceType.AC,
-      DeviceType.DoorLock,
-      DeviceType.Gateway,
-      DeviceType.WallSensor,
-      DeviceType.CeilingSensor,
-      DeviceType.ThreeGang,
-      DeviceType.OneGang,
-    };
-
-    return devices
-        .where((device) => allowedDeviceTypes.contains(device.productType))
-        .toList();
+  _getOnlyImplementedDevices(List<DeviceModel> devices) {
+    List<DeviceModel> implementedDevices = [];
+    for (int i = 0; i < devices.length; i++) {
+      if (devices[i].productType == DeviceType.AC ||
+          devices[i].productType == DeviceType.DoorLock ||
+          devices[i].productType == DeviceType.Gateway ||
+          devices[i].productType == DeviceType.WallSensor ||
+          devices[i].productType == DeviceType.CeilingSensor ||
+          devices[i].productType == DeviceType.ThreeGang) {
+        implementedDevices.add(devices[i]);
+      }
+    }
+    return implementedDevices;
  }
 }
--- a/lib/features/devices/view/widgets/garage_door/garage_list.dart
+++ b/lib/features/devices/view/widgets/garage_door/garage_list.dart
@ -8,7 +8,8 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';

 class GarageList extends StatelessWidget {
-  const GarageList({super.key, required this.garageList, required this.allSwitches});
+  const GarageList(
+      {super.key, required this.garageList, required this.allSwitches});

  final List<GroupGarageModel> garageList;
  final bool allSwitches;
@ -22,42 +23,43 @@ class GarageList extends StatelessWidget {
            crossAxisAlignment: CrossAxisAlignment.stretch,
            children: [
              const SizedBox(height: 10),
-              const BodySmall(text: 'All Garages'),
+              const BodySmall(text: 'All Lights'),
              const SizedBox(height: 5),
              DevicesDefaultSwitch(
-                off: 'Close',
-                on: 'Open',
+                off: 'OFF',
+                on: 'ON',
                switchValue: allSwitches,
-                action: () => BlocProvider.of<GarageDoorBloc>(context).add(
-                  GroupAllOnEvent(),
-                ),
-                secondAction: () => BlocProvider.of<GarageDoorBloc>(context).add(
-                  GroupAllOffEvent(),
-                ),
+                action: () {
+                  BlocProvider.of<GarageDoorBloc>(context)
+                      .add(GroupAllOnEvent());
+                },
+                secondAction: () {
+                  BlocProvider.of<GarageDoorBloc>(context)
+                      .add(GroupAllOffEvent());
+                },
              ),
              ListView.builder(
                shrinkWrap: true,
                physics: const NeverScrollableScrollPhysics(),
-                padding: EdgeInsetsDirectional.zero,
+                padding: const EdgeInsets.all(0),
                itemCount: garageList.length,
                itemBuilder: (context, index) {
-                  final garageDoor = garageList[index];
                  return Column(
                    crossAxisAlignment: CrossAxisAlignment.start,
                    children: [
                      const SizedBox(height: 10),
-                      BodySmall(text: garageDoor.deviceName),
+                      BodySmall(text: garageList[index].deviceName),
                      const SizedBox(height: 5),
                      DevicesDefaultSwitch(
-                        off: 'Close',
-                        on: 'Open',
-                        switchValue: garageDoor.firstSwitch,
-                        action: () => BlocProvider.of<GarageDoorBloc>(context).add(
-                          ChangeFirstWizardSwitchStatusEvent(
-                            value: garageDoor.firstSwitch,
-                            deviceId: garageDoor.deviceId,
-                          ),
-                        ),
+                        off: 'OFF',
+                        on: 'ON',
+                        switchValue: garageList[index].firstSwitch,
+                        action: () {
+                          BlocProvider.of<GarageDoorBloc>(context).add(
+                              ChangeFirstWizardSwitchStatusEvent(
+                                  value: garageList[index].firstSwitch,
+                                  deviceId: garageList[index].deviceId));
+                        },
                      ),
                    ],
                  );
--- a/lib/features/devices/view/widgets/water_heater/wh_list.dart
+++ b/lib/features/devices/view/widgets/water_heater/wh_list.dart
@ -8,11 +8,7 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';

 class WHList extends StatelessWidget {
-  const WHList({
-    required this.whList,
-    required this.allSwitches,
-    super.key,
-  });
+  const WHList({super.key, required this.whList, required this.allSwitches});

  final List<GroupWHModel> whList;
  final bool allSwitches;
@ -26,42 +22,43 @@ class WHList extends StatelessWidget {
            crossAxisAlignment: CrossAxisAlignment.stretch,
            children: [
              const SizedBox(height: 10),
-              const BodySmall(text: 'All Water Heaters'),
+              const BodySmall(text: 'All Lights'),
              const SizedBox(height: 5),
              DevicesDefaultSwitch(
                off: 'OFF',
                on: 'ON',
                switchValue: allSwitches,
-                action: () => context.read<WaterHeaterBloc>().add(
-                      GroupAllOnEvent(),
-                    ),
-                secondAction: () => context.read<WaterHeaterBloc>().add(
-                      GroupAllOffEvent(),
-                    ),
+                action: () {
+                  BlocProvider.of<WaterHeaterBloc>(context)
+                      .add(GroupAllOnEvent());
+                },
+                secondAction: () {
+                  BlocProvider.of<WaterHeaterBloc>(context)
+                      .add(GroupAllOffEvent());
+                },
              ),
              ListView.builder(
                shrinkWrap: true,
                physics: const NeverScrollableScrollPhysics(),
-                padding: EdgeInsetsDirectional.zero,
+                padding: const EdgeInsets.all(0),
                itemCount: whList.length,
                itemBuilder: (context, index) {
-                  final waterHeater = whList[index];
                  return Column(
                    crossAxisAlignment: CrossAxisAlignment.start,
                    children: [
                      const SizedBox(height: 10),
-                      BodySmall(text: waterHeater.deviceName),
+                      BodySmall(text: whList[index].deviceName),
                      const SizedBox(height: 5),
                      DevicesDefaultSwitch(
                        off: 'OFF',
                        on: 'ON',
-                        switchValue: waterHeater.firstSwitch,
-                        action: () => context.read<WaterHeaterBloc>().add(
+                        switchValue: whList[index].firstSwitch,
+                        action: () {
+                          BlocProvider.of<WaterHeaterBloc>(context).add(
                              ChangeFirstWizardSwitchStatusEvent(
-                                value: waterHeater.firstSwitch,
-                                deviceId: waterHeater.deviceId,
-                              ),
-                            ),
+                                  value: whList[index].firstSwitch,
+                                  deviceId: whList[index].deviceId));
+                        },
                      ),
                    ],
                  );
--- a/lib/features/scene/helper/functions_per_device/one_gang_functions.dart
+++ b/lib/features/scene/helper/functions_per_device/one_gang_functions.dart
@ -1,78 +0,0 @@
-import 'package:syncrow_app/features/scene/enum/operation_dialog_type.dart';
-import 'package:syncrow_app/features/scene/model/scene_static_function.dart';
-import 'package:syncrow_app/generated/assets.dart';
-
-class OneGangHelperFunctions {
-  static List<SceneStaticFunction> oneGangHelperFunctions(
-      String deviceId, String deviceName, functionValue) {
-    return [
-      SceneStaticFunction(
-        deviceId: deviceId,
-        deviceName: deviceName,
-        icon: Assets.assetsAcPower,
-        operationName: 'Light Switch',
-        code: 'switch_1',
-        functionValue: functionValue,
-        operationDialogType: OperationDialogType.onOff,
-        operationalValues: [
-          SceneOperationalValue(
-              icon: Assets.assetsAcPower, description: "ON", value: true),
-          SceneOperationalValue(
-              icon: Assets.assetsAcPowerOFF, description: "OFF", value: false),
-        ],
-      ),
-      SceneStaticFunction(
-        deviceId: deviceId,
-        deviceName: deviceName,
-        icon: Assets.assetsLightCountdown,
-        operationName: 'Light CountDown',
-        code: 'countdown_1',
-        functionValue: functionValue,
-        operationDialogType: OperationDialogType.countdown,
-        operationalValues: [
-          SceneOperationalValue(icon: '', value: 0),
-        ],
-      ),
-    ];
-  }
-
-  static List<SceneStaticFunction> oneGangAutomationFunctions(
-      String deviceId, String deviceName, functionValue) {
-    return [
-      SceneStaticFunction(
-        deviceId: deviceId,
-        deviceName: deviceName,
-        icon: Assets.assetsAcPower,
-        operationName: 'Light Switch',
-        code: 'switch_1',
-        functionValue: functionValue,
-        operationDialogType: OperationDialogType.onOff,
-        operationalValues: [
-          SceneOperationalValue(
-              icon: Assets.assetsAcPower, description: "ON", value: true),
-          SceneOperationalValue(
-              icon: Assets.assetsAcPowerOFF, description: "OFF", value: false),
-        ],
-      ),
-      SceneStaticFunction(
-        deviceId: deviceId,
-        deviceName: deviceName,
-        icon: Assets.assetsLightCountdown,
-        operationName: 'Light CountDown',
-        code: 'countdown_1',
-        functionValue: functionValue,
-        operationDialogType: OperationDialogType.integerSteps,
-        operationalValues: [
-          SceneOperationalValue(
-            icon: '',
-            description: "sec",
-            value: 0.0,
-            minValue: 0,
-            maxValue: 43200,
-            stepValue: 1,
-          ),
-        ],
-      ),
-    ];
-  }
-}
--- a/lib/features/scene/helper/scene_bloc_factory.dart
+++ b/lib/features/scene/helper/scene_bloc_factory.dart
@ -1,48 +0,0 @@
-import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
-import 'package:syncrow_app/features/app_layout/model/community_model.dart';
-import 'package:syncrow_app/features/app_layout/model/space_model.dart';
-import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
-import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
-
-abstract final class SceneBlocFactory {
-  static SceneBloc create({
-    required bool pageType,
-    required HomeCubit homeCubit,
-  }) {
-    final selectedSpace = homeCubit.selectedSpace;
-    final defaultSpace = SpaceModel(
-      id: '-1',
-      name: '',
-      community: Community(
-        uuid: '-1',
-        name: '',
-      ),
-    );
-
-    final spaceId = selectedSpace?.id ?? defaultSpace.id;
-    final space = selectedSpace ?? defaultSpace;
-    final communityUuid =
-        selectedSpace?.community.uuid ?? defaultSpace.community.uuid;
-
-    final sceneBloc = SceneBloc();
-
-    sceneBloc.add(
-      LoadScenes(
-        spaceId,
-        space,
-        showInDevice: pageType,
-      ),
-    );
-
-    if (!pageType) {
-      sceneBloc.add(
-        LoadAutomation(
-          spaceId,
-          communityUuid,
-        ),
-      );
-    }
-
-    return sceneBloc;
-  }
-}
--- a/lib/features/scene/helper/scene_operations_data_helper.dart
+++ b/lib/features/scene/helper/scene_operations_data_helper.dart
@ -6,7 +6,6 @@ import 'package:syncrow_app/features/scene/helper/functions_per_device/ac_functi
 import 'package:syncrow_app/features/scene/helper/functions_per_device/door_lock_functions.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/gateway_functions.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/human_presence_functions.dart';
-import 'package:syncrow_app/features/scene/helper/functions_per_device/one_gang_functions.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/presence_sensor.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/three_gang_functions.dart';
 import 'package:syncrow_app/features/scene/model/scene_details_model.dart';
@ -15,9 +14,8 @@ import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';

 mixin SceneOperationsDataHelper {
-  final Map<DeviceType,
-          Function(List<FunctionModel>, String, String, dynamic, bool)>
-      _functionMap = {
+  final Map<DeviceType, Function(List<FunctionModel>, String, String, dynamic, bool)> _functionMap =
+      {
    DeviceType.LightBulb: lightBulbFunctions,
    DeviceType.CeilingSensor: ceilingSensorFunctions,
    DeviceType.WallSensor: wallSensorFunctions,
@ -26,7 +24,6 @@ mixin SceneOperationsDataHelper {
    DeviceType.Curtain: curtainFunctions,
    DeviceType.ThreeGang: threeGangFunctions,
    DeviceType.Gateway: gatewayFunctions,
-    DeviceType.OneGang: oneGangFunctions,
  };

  final Map<DeviceType, String> _titleMap = {
@ -38,24 +35,7 @@ mixin SceneOperationsDataHelper {
    DeviceType.Curtain: 'Curtain Functions',
    DeviceType.ThreeGang: '3G Light Switch Functions',
    DeviceType.Gateway: 'Gateway Functions',
-    DeviceType.OneGang: '1G Light Switch Conditions',
  };
-  static String _productTypeCache = '';
-
-  //one gang functions
-  static List<SceneStaticFunction> oneGangFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
-    if (isAutomation) {
-      return OneGangHelperFunctions.oneGangAutomationFunctions(
-          deviceId, deviceName, functionValue);
-    }
-    return OneGangHelperFunctions.oneGangHelperFunctions(
-        deviceId, deviceName, functionValue);
-  }

  List<SceneStaticFunction> getFunctionsWithIcons({
    DeviceType? type,
@ -65,22 +45,16 @@ mixin SceneOperationsDataHelper {
    required bool isAutomation,
  }) {
    final functionValue = null;
-    return _functionMap[type]?.call(
-            functions, deviceId, deviceName, functionValue, isAutomation) ??
-        lightBulbFunctions(
-            functions, deviceId, deviceName, functionValue, isAutomation);
+    return _functionMap[type]?.call(functions, deviceId, deviceName, functionValue, isAutomation) ??
+        lightBulbFunctions(functions, deviceId, deviceName, functionValue, isAutomation);
  }

  String getTitle({DeviceType? type}) {
    return _titleMap[type] ?? '';
  }

-  static List<SceneStaticFunction> ceilingSensorFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
+  static List<SceneStaticFunction> ceilingSensorFunctions(List<FunctionModel> functions,
+      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
    if (isAutomation) {
      return PresenceSensorHelperFunctions.automationPresenceSensorFunctions(
          deviceId, deviceName, functionValue);
@ -89,35 +63,22 @@ mixin SceneOperationsDataHelper {
        deviceId, deviceName, functionValue);
  }

-  static List<SceneStaticFunction> curtainFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
+  static List<SceneStaticFunction> curtainFunctions(List<FunctionModel> functions, String deviceId,
+      String deviceName, dynamic functionValue, bool isAutomation) {
    return [];
  }

-  static List<SceneStaticFunction> doorLockFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
+  static List<SceneStaticFunction> doorLockFunctions(List<FunctionModel> functions, String deviceId,
+      String deviceName, dynamic functionValue, bool isAutomation) {
    if (isAutomation) {
      return DoorLockHelperFunctions.doorLockAutomationFunctions(
          deviceId, deviceName, functionValue);
    }
-    return DoorLockHelperFunctions.doorLockTapToRunFunctions(
-        deviceId, deviceName, functionValue);
+    return DoorLockHelperFunctions.doorLockTapToRunFunctions(deviceId, deviceName, functionValue);
  }

-  static List<SceneStaticFunction> wallSensorFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
+  static List<SceneStaticFunction> wallSensorFunctions(List<FunctionModel> functions,
+      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
    if (isAutomation) {
      return HumanPresenceHelperFunctions.automationHumanPresenceFunctions(
          deviceId, deviceName, functionValue);
@ -126,51 +87,31 @@ mixin SceneOperationsDataHelper {
        deviceId, deviceName, functionValue);
  }

-  static List<SceneStaticFunction> lightBulbFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
+  static List<SceneStaticFunction> lightBulbFunctions(List<FunctionModel> functions,
+      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
    return [];
  }

-  static List<SceneStaticFunction> gatewayFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
-    return GatewayHelperFunctions.tabToRunGatewayFunctions(
-        deviceId, deviceName, functionValue);
+  static List<SceneStaticFunction> gatewayFunctions(List<FunctionModel> functions, String deviceId,
+      String deviceName, dynamic functionValue, bool isAutomation) {
+    return GatewayHelperFunctions.tabToRunGatewayFunctions(deviceId, deviceName, functionValue);
  }

-  static List<SceneStaticFunction> threeGangFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
+  static List<SceneStaticFunction> threeGangFunctions(List<FunctionModel> functions,
+      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
    if (isAutomation) {
      return ThreeGangHelperFunctions.threeGangAutomationFunctions(
          deviceId, deviceName, functionValue);
    }
-    return ThreeGangHelperFunctions.threeGangHelperFunctions(
-        deviceId, deviceName, functionValue);
+    return ThreeGangHelperFunctions.threeGangHelperFunctions(deviceId, deviceName, functionValue);
  }

-  static List<SceneStaticFunction> acFunctions(
-      List<FunctionModel> functions,
-      String deviceId,
-      String deviceName,
-      dynamic functionValue,
-      bool isAutomation) {
+  static List<SceneStaticFunction> acFunctions(List<FunctionModel> functions, String deviceId,
+      String deviceName, dynamic functionValue, bool isAutomation) {
    if (isAutomation) {
-      return ACFunctionsHelper.automationAcFunctions(
-          deviceId, deviceName, functionValue);
+      return ACFunctionsHelper.automationAcFunctions(deviceId, deviceName, functionValue);
    }
-    return ACFunctionsHelper.tabToRunAcFunctions(
-        deviceId, deviceName, functionValue);
+    return ACFunctionsHelper.tabToRunAcFunctions(deviceId, deviceName, functionValue);
  }

  List<SceneStaticFunction> getTaskListFunctionsFromApi({
@ -208,12 +149,8 @@ mixin SceneOperationsDataHelper {
          SceneStaticFunction(
            deviceId: action.entityId,
            deviceName: action.name.toString(),
-            deviceIcon: action.type == 'automation'
-                ? Assets.player
-                : Assets.handClickIcon,
-            icon: action.type == 'automation'
-                ? Assets.player
-                : Assets.handClickIcon,
+            deviceIcon: action.type == 'automation' ? Assets.player : Assets.handClickIcon,
+            icon: action.type == 'automation' ? Assets.player : Assets.handClickIcon,
            operationName: action.type.toString(),
            operationDialogType: OperationDialogType.onOff,
            functionValue: action.actionExecutor,
@ -233,8 +170,7 @@ mixin SceneOperationsDataHelper {
          ),
        );
      } else {
-        functions
-            .add(_mapExecutorPropertyToSceneFunction(action, isAutomation));
+        functions.add(_mapExecutorPropertyToSceneFunction(action, isAutomation));
      }
    }

@ -270,9 +206,7 @@ mixin SceneOperationsDataHelper {
  }) {
    final executorProperty = action.executorProperty;

-    final Map<String,
-            SceneStaticFunction Function(Action, bool, String?, String?)>
-        functionMap = {
+    final Map<String, SceneStaticFunction Function(Action, bool, String?, String?)> functionMap = {
      'sensitivity': _createSensitivityFunction,
      'normal_open_switch': _createNormalOpenSwitchFunction,
      'unlock_fingerprint': _createUnlockFingerprintFunction,
@ -348,16 +282,14 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createSensitivityFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSensitivityFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Presence Sensor',
      Assets.assetsIconsSensors,
      'Sensitivity',
-      isAutomation
-          ? OperationDialogType.integerSteps
-          : OperationDialogType.listOfOptions,
+      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.listOfOptions,
      isAutomation ? _createIntegerStepsOptions() : _createSensitivityOptions(),
      isAutomation,
      comparator,
@ -365,8 +297,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createNormalOpenSwitchFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createNormalOpenSwitchFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -419,8 +351,8 @@ mixin SceneOperationsDataHelper {
    ];
  }

-  SceneStaticFunction _createUnlockFingerprintFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockFingerprintFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -434,8 +366,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createUnlockPasswordFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockPasswordFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -449,8 +381,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createUnlockCardFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockCardFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -464,8 +396,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createAlarmLockFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createAlarmLockFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -479,8 +411,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createUnlockRequestFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockRequestFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -494,8 +426,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createResidualElectricityFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createResidualElectricityFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -509,8 +441,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createReverseLockFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createReverseLockFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -524,8 +456,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createUnlockAppFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockAppFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -539,8 +471,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createHijackFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createHijackFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -554,8 +486,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createDoorbellFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createDoorbellFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -569,8 +501,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createUnlockTemporaryFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockTemporaryFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'WIFI LOCK PRO',
@ -584,8 +516,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createFarDetectionFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createFarDetectionFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -599,8 +531,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createMotionSensitivityFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createMotionSensitivityFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -614,8 +546,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createMotionlessSensitivityFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createMotionlessSensitivityFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -629,8 +561,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createIndicatorFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createIndicatorFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -644,8 +576,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createPresenceTimeFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createPresenceTimeFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -659,8 +591,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createPresenceStateFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createPresenceStateFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -674,16 +606,14 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createDisCurrentFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createDisCurrentFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
      Assets.assetsIconsSensors,
      'Current Distance',
-      isAutomation
-          ? OperationDialogType.integerSteps
-          : OperationDialogType.countdown,
+      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
      _createCurrentDistanceOptions(),
      isAutomation,
      comparator,
@ -691,8 +621,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createIlluminanceValueFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createIlluminanceValueFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -706,8 +636,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createCheckingResultFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createCheckingResultFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Human Presence Sensor',
@ -721,8 +651,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createSwitchFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitchFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Smart AC Thermostat - Grey - Model A',
@ -736,27 +666,23 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createTempSetFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createTempSetFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Smart AC Thermostat - Grey - Model A',
      Assets.assetsIconsAC,
      'Set Temperature',
-      isAutomation
-          ? OperationDialogType.integerSteps
-          : OperationDialogType.temperature,
-      isAutomation
-          ? _createAutomationTemperatureOptions()
-          : _createTemperatureOptions(),
+      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.temperature,
+      isAutomation ? _createAutomationTemperatureOptions() : _createTemperatureOptions(),
      isAutomation,
      comparator,
      uniqueCustomId,
    );
  }

-  SceneStaticFunction _createTempCurrentFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createTempCurrentFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Smart AC Thermostat - Grey - Model A',
@ -770,8 +696,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createModeFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createModeFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Smart AC Thermostat - Grey - Model A',
@ -785,8 +711,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createLevelFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createLevelFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Smart AC Thermostat - Grey - Model A',
@ -800,8 +726,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createChildLockFunction(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createChildLockFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Smart AC Thermostat - Grey - Model A',
@ -815,38 +741,23 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createSwitch1Function(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
-    switch (action.productType) {
-      case "3G":
-        return _createSceneFunction(
-          action,
-          '3 Gang Button Switch L-L',
-          Assets.assetsIcons3GangSwitch,
-          'Light 1 Switch',
-          OperationDialogType.onOff,
-          _createOnOffOptions(),
-          isAutomation,
-          comparator,
-          uniqueCustomId,
-        );
-      default:
-        return _createSceneFunction(
-          action,
-          '1 Gang Button Switch L-L',
-          Assets.oneGang,
-          'Light Switch',
-          OperationDialogType.onOff,
-          _createOnOffOptions(),
-          isAutomation,
-          comparator,
-          uniqueCustomId,
-        );
-    }
+  SceneStaticFunction _createSwitch1Function(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+    return _createSceneFunction(
+      action,
+      '3 Gang Button Switch L-L',
+      Assets.assetsIcons3GangSwitch,
+      'Light 1 Switch',
+      OperationDialogType.onOff,
+      _createOnOffOptions(),
+      isAutomation,
+      comparator,
+      uniqueCustomId,
+    );
  }

-  SceneStaticFunction _createSwitch2Function(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitch2Function(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      '3 Gang Button Switch L-L',
@ -860,8 +771,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createSwitch3Function(Action action, bool isAutomation,
-      String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitch3Function(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      '3 Gang Button Switch L-L',
@ -875,84 +786,53 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createCountdown1Function(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
-    switch (action.productType) {
-      case "3G":
-        return _createSceneFunction(
-          action,
-          '3 Gang Button Switch L-L',
-          Assets.assetsIcons3GangSwitch,
-          'Light 1 CountDown',
-          isAutomation
-              ? OperationDialogType.integerSteps
-              : OperationDialogType.countdown,
-          isAutomation
-              ? _createAutomationCountDownOptions()
-              : _createCountdownOptions(),
-          isAutomation,
-          comparator,
-          uniqueCustomId,
-        );
-      default:
-        return _createSceneFunction(
-          action,
-          '1 Gang Button Switch L-L',
-          Assets.oneGang,
-          'Light CountDown',
-          isAutomation
-              ? OperationDialogType.integerSteps
-              : OperationDialogType.countdown,
-          isAutomation
-              ? _createAutomationCountDownOptions()
-              : _createCountdownOptions(),
-          isAutomation,
-          comparator,
-          uniqueCustomId,
-        );
-    }
+  SceneStaticFunction _createCountdown1Function(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+    return _createSceneFunction(
+      action,
+      '3 Gang Button Switch L-L',
+      Assets.assetsIcons3GangSwitch,
+      'Light 1 CountDown',
+      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
+      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
+      isAutomation,
+      comparator,
+      uniqueCustomId,
+    );
  }

-  SceneStaticFunction _createCountdown2Function(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createCountdown2Function(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      '3 Gang Button Switch L-L',
      Assets.assetsIcons3GangSwitch,
      'Light 2 CountDown',
-      isAutomation
-          ? OperationDialogType.integerSteps
-          : OperationDialogType.countdown,
-      isAutomation
-          ? _createAutomationCountDownOptions()
-          : _createCountdownOptions(),
+      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
+      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
      isAutomation,
      comparator,
      uniqueCustomId,
    );
  }

-  SceneStaticFunction _createCountdown3Function(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createCountdown3Function(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      '3 Gang Button Switch L-L',
      Assets.assetsIcons3GangSwitch,
      'Light 3 CountDown',
-      isAutomation
-          ? OperationDialogType.integerSteps
-          : OperationDialogType.countdown,
-      isAutomation
-          ? _createAutomationCountDownOptions()
-          : _createCountdownOptions(),
+      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
+      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
      isAutomation,
      comparator,
      uniqueCustomId,
    );
  }

-  SceneStaticFunction _createSwitchAlarmSoundFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitchAlarmSoundFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Gateway',
@ -966,8 +846,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createMasterStateFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createMasterStateFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Gateway',
@ -981,8 +861,8 @@ mixin SceneOperationsDataHelper {
    );
  }

-  SceneStaticFunction _createFactoryResetFunction(Action action,
-      bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createFactoryResetFunction(
+      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
    return _createSceneFunction(
      action,
      'Gateway',
@ -1300,12 +1180,8 @@ mixin SceneOperationsDataHelper {
          uniqueCustomId: taskItem.uniqueCustomId,
          deviceId: taskItem.deviceId,
          deviceName: taskItem.deviceName.toString(),
-          deviceIcon: taskItem.operationName == 'automation'
-              ? Assets.player
-              : Assets.handClickIcon,
-          icon: taskItem.operationName == 'automation'
-              ? Assets.player
-              : Assets.handClickIcon,
+          deviceIcon: taskItem.operationName == 'automation' ? Assets.player : Assets.handClickIcon,
+          icon: taskItem.operationName == 'automation' ? Assets.player : Assets.handClickIcon,
          operationName: taskItem.operationName,
          operationDialogType: OperationDialogType.onOff,
          functionValue: taskItem.functionValue == 'rule_enable' ? true : false,
--- a/lib/features/scene/model/scene_details_model.dart
+++ b/lib/features/scene/model/scene_details_model.dart
@ -74,7 +74,6 @@ class Action {
  ExecutorProperty? executorProperty;
  String? name;
  String? type;
-  String? productType;

  Action({
    required this.actionExecutor,
@ -82,7 +81,6 @@ class Action {
    this.executorProperty,
    this.name,
    this.type,
-    this.productType,
  });

  String toRawJson() => json.encode(toJson());
@ -90,11 +88,10 @@ class Action {
  static Action? fromJson(Map<String, dynamic> json) {
    if (json['name'] != null && json['type'] != null) {
      return Action(
-        actionExecutor: json["actionExecutor"] as String,
-        entityId: json["entityId"] as String,
-        name: json['name'] as String?,
-        type: json['type'] as String?,
-        productType: json['productType'] as String?,
+        actionExecutor: json["actionExecutor"],
+        entityId: json["entityId"],
+        name: json['name'],
+        type: json['type'],
      );
    }
    if (json["executorProperty"] == null) {
@ -102,10 +99,9 @@ class Action {
    }

    return Action(
-      actionExecutor: json["actionExecutor"] as String,
-      entityId: json["entityId"] as String,
+      actionExecutor: json["actionExecutor"],
+      entityId: json["entityId"],
      executorProperty: ExecutorProperty.fromJson(json["executorProperty"]),
-      productType: json['productType'] as String?,
    );
  }

--- a/lib/features/scene/view/scene_view.dart
+++ b/lib/features/scene/view/scene_view.dart
@ -1,54 +1,92 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/app_layout/model/community_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/scene_listview.dart';
 import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
 import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart';
-import 'package:syncrow_app/features/scene/helper/scene_bloc_factory.dart';
 import 'package:syncrow_app/features/scene/widgets/empty_devices_widget.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_grid_view.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_header.dart';
-import 'package:syncrow_app/features/shared_widgets/app_loading_indicator.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';

 class SceneView extends StatelessWidget {
-  const SceneView({
-    this.pageType = false,
-    super.key,
-  });
-
  final bool pageType;
+  const SceneView({super.key, this.pageType = false});

  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => SceneBlocFactory.create(
-        pageType: pageType,
-        homeCubit: HomeCubit.getInstance(),
-      ),
+      create: (BuildContext context) {
+        if (pageType) {
+          return SceneBloc()
+            ..add(LoadScenes(
+                HomeCubit.getInstance().selectedSpace?.id ?? '',
+                HomeCubit.getInstance().selectedSpace ??
+                    SpaceModel(
+                        id: '-1',
+                        name: '',
+                        community: Community(
+                          uuid: '-1',
+                          name: '',
+                        )),
+                showInDevice: pageType));
+        } else {
+          return SceneBloc()
+            ..add(LoadScenes(
+                HomeCubit.getInstance().selectedSpace?.id ?? '',
+                HomeCubit.getInstance().selectedSpace ??
+                    SpaceModel(
+                        id: '-1',
+                        name: '',
+                        community: Community(
+                          uuid: '-1',
+                          name: '',
+                        )),
+                showInDevice: pageType))
+            ..add(LoadAutomation(
+                HomeCubit.getInstance().selectedSpace?.id ?? '',
+                HomeCubit.getInstance().selectedSpace?.community.uuid ?? ''));
+        }
+      },
      child: BlocBuilder<CreateSceneBloc, CreateSceneState>(
        builder: (context, state) {
-          final selectedSpace = HomeCubit.getInstance().selectedSpace;
          if (state is DeleteSceneSuccess) {
-            if (state.success) _loadScenesAndAutomations(context, selectedSpace);
+            if (state.success) {
+              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
+                  HomeCubit.getInstance().selectedSpace!.id,
+                  HomeCubit.getInstance().selectedSpace!,
+                  showInDevice: pageType));
+              BlocProvider.of<SceneBloc>(context).add(LoadAutomation(
+                  HomeCubit.getInstance().selectedSpace!.id,
+                  HomeCubit.getInstance().selectedSpace!.community.uuid));
+            }
          }
          if (state is CreateSceneWithTasks) {
-            if (state.success) {
-              _loadScenesAndAutomations(context, selectedSpace);
-              context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent());
+            if (state.success == true) {
+              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
+                  HomeCubit.getInstance().selectedSpace!.id,
+                  HomeCubit.getInstance().selectedSpace!,
+                  showInDevice: pageType));
+              BlocProvider.of<SceneBloc>(context).add(LoadAutomation(
+                  HomeCubit.getInstance().selectedSpace!.id,
+                  HomeCubit.getInstance().selectedSpace!.community.uuid));
+              context
+                  .read<SmartSceneSelectBloc>()
+                  .add(const SmartSceneClearEvent());
            }
          }
          return BlocListener<SceneBloc, SceneState>(
            listener: (context, state) {
              if (state is SceneTriggerSuccess) {
                context.showCustomSnackbar(
-                  message: 'Scene ${state.sceneName} triggered successfully!',
-                );
+                    message:
+                        'Scene ${state.sceneName} triggered successfully!');
              }
            },
            child: HomeCubit.getInstance().spaces.isEmpty
@ -57,14 +95,13 @@ class SceneView extends StatelessWidget {
                    mainAxisAlignment: MainAxisAlignment.start,
                    crossAxisAlignment: CrossAxisAlignment.stretch,
                    children: [
-                      if (!pageType) ...[
-                        const SceneHeader(),
-                        const SizedBox(height: 8),
-                      ],
+                      if (pageType == false) const SceneHeader(),
+                      if (pageType == false) const SizedBox(height: 8),
                      BlocBuilder<SceneBloc, SceneState>(
                        builder: (context, state) {
                          if (state is SceneLoading) {
-                            return const AppLoadingIndicator();
+                            return const Center(
+                                child: CircularProgressIndicator());
                          }
                          if (state is SceneError) {
                            return Center(
@ -74,81 +111,84 @@ class SceneView extends StatelessWidget {
                          if (state is SceneLoaded) {
                            final scenes = state.scenes;
                            final automationList = state.automationList;
-                            if (scenes.isEmpty) return const EmptyDevicesWidget();

-                            if (pageType) {
-                              return SizedBox(
-                                height: context.height * 0.1,
-                                child: SceneListview(
-                                  scenes: scenes,
-                                  loadingSceneId: state.loadingSceneId,
-                                ),
-                              );
-                            }
-
-                            return Theme(
-                              data: Theme.of(context).copyWith(
-                                dividerColor: Colors.transparent,
-                              ),
-                              child: Expanded(
-                                child: ListView(
-                                  children: [
-                                    ExpansionTile(
-                                      tilePadding: const EdgeInsets.symmetric(
-                                        horizontal: 6,
-                                      ),
-                                      initiallyExpanded: true,
-                                      iconColor: ColorsManager.grayColor,
-                                      title: const BodyMedium(
-                                        text: 'Tap to run routines',
-                                      ),
+                            return pageType
+                                ? SizedBox(
+                                    height: context.height * 0.1,
+                                    child: SceneListview(
+                                      scenes: scenes,
+                                      loadingSceneId: state.loadingSceneId,
+                                    ),
+                                  )
+                                : Expanded(
+                                    child: ListView(
                                      children: [
-                                        if (scenes.isNotEmpty)
-                                          SceneGrid(
-                                            scenes: scenes,
-                                            loadingSceneId: state.loadingSceneId,
-                                            disablePlayButton: false,
-                                            loadingStates: state.loadingStates,
-                                          )
-                                        else
-                                          const Center(
-                                            child: BodyMedium(
-                                              text: 'No scenes have been added yet',
-                                            ),
+                                        Theme(
+                                          data: ThemeData().copyWith(
+                                              dividerColor: Colors.transparent),
+                                          child: ExpansionTile(
+                                            tilePadding:
+                                                const EdgeInsets.symmetric(
+                                                    horizontal: 6),
+                                            initiallyExpanded: true,
+                                            iconColor: ColorsManager.grayColor,
+                                            title: const BodyMedium(
+                                                text: 'Tap to run routines'),
+                                            children: [
+                                              scenes.isNotEmpty
+                                                  ? SceneGrid(
+                                                      scenes: scenes,
+                                                      loadingSceneId:
+                                                          state.loadingSceneId,
+                                                      disablePlayButton: false,
+                                                      loadingStates: state
+                                                          .loadingStates, // Add this line
+                                                    )
+                                                  : const Center(
+                                                      child: BodyMedium(
+                                                        text:
+                                                            'No scenes have been added yet',
+                                                      ),
+                                                    ),
+                                              const SizedBox(height: 10),
+                                            ],
                                          ),
-                                        const SizedBox(height: 10),
+                                        ),
+                                        Theme(
+                                          data: ThemeData().copyWith(
+                                              dividerColor: Colors.transparent),
+                                          child: ExpansionTile(
+                                            initiallyExpanded: true,
+                                            iconColor: ColorsManager.grayColor,
+                                            tilePadding:
+                                                const EdgeInsets.symmetric(
+                                                    horizontal: 6),
+                                            title: const BodyMedium(
+                                                text: 'Automation'),
+                                            children: [
+                                              automationList.isNotEmpty
+                                                  ? SceneGrid(
+                                                      scenes: automationList,
+                                                      loadingSceneId:
+                                                          state.loadingSceneId,
+                                                      disablePlayButton: true,
+                                                      loadingStates: state
+                                                          .loadingStates, // Add this line
+                                                    )
+                                                  : const Center(
+                                                      child: BodyMedium(
+                                                        text:
+                                                            'No automations have been added yet',
+                                                      ),
+                                                    ),
+                                              const SizedBox(height: 10),
+                                            ],
+                                          ),
+                                        ),
+                                        const SizedBox(height: 15),
                                      ],
                                    ),
-                                    ExpansionTile(
-                                      initiallyExpanded: true,
-                                      iconColor: ColorsManager.grayColor,
-                                      tilePadding: const EdgeInsets.symmetric(
-                                        horizontal: 6,
-                                      ),
-                                      title: const BodyMedium(text: 'Automation'),
-                                      children: [
-                                        if (automationList.isNotEmpty)
-                                          SceneGrid(
-                                            scenes: automationList,
-                                            loadingSceneId: state.loadingSceneId,
-                                            disablePlayButton: true,
-                                            loadingStates: state.loadingStates,
-                                          )
-                                        else
-                                          const Center(
-                                            child: BodyMedium(
-                                              text:
-                                                  'No automations have been added yet',
-                                            ),
-                                          ),
-                                        const SizedBox(height: 10),
-                                      ],
-                                    ),
-                                    const SizedBox(height: 15),
-                                  ],
-                                ),
-                              ),
-                            );
+                                  );
                          }
                          return const SizedBox.shrink();
                        },
@ -160,21 +200,4 @@ class SceneView extends StatelessWidget {
      ),
    );
  }
-
-  void _loadScenesAndAutomations(BuildContext context, SpaceModel? selectedSpace) {
-    BlocProvider.of<SceneBloc>(context)
-      ..add(
-        LoadScenes(
-          selectedSpace!.id,
-          selectedSpace,
-          showInDevice: pageType,
-        ),
-      )
-      ..add(
-        LoadAutomation(
-          selectedSpace.id,
-          selectedSpace.community.uuid,
-        ),
-      );
-  }
 }
--- a/lib/features/shared_widgets/app_loading_indicator.dart
+++ b/lib/features/shared_widgets/app_loading_indicator.dart
@ -1,12 +0,0 @@
-import 'package:flutter/material.dart';
-
-class AppLoadingIndicator extends StatelessWidget {
-  const AppLoadingIndicator({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: CircularProgressIndicator.adaptive(),
-    );
-  }
-}
--- a/lib/services/api/api_links_endpoints.dart
+++ b/lib/services/api/api_links_endpoints.dart
@ -111,9 +111,9 @@ abstract class ApiEndpoints {
 //POST
  static const String addDeviceToRoom = '/device/room';
  static const String addDeviceToGroup = '/device/group';
-  static const String controlDevice = '/device/{deviceUuid}/control';
+  static const String controlDevice = '/devices/{deviceUuid}/command';
  static const String firmwareDevice =
-      '/device/{deviceUuid}/firmware/{firmwareVersion}';
+      '/devices/{deviceUuid}/firmware/{firmwareVersion}';
  static const String getDevicesByUserId = '/device/user/{userId}';
  static const String getDevicesByUnitId = '/device/unit/{unitUuid}';
  static const String openDoorLock = '/door-lock/open/{doorLockUuid}';
@ -121,13 +121,13 @@ abstract class ApiEndpoints {
 //GET
  static const String deviceByRoom =
      '/projects/{projectUuid}/communities/{communityUuid}/spaces/{spaceUuid}/subspaces/{subSpaceUuid}/devices';
-  static const String deviceByUuid = '/device/{deviceUuid}';
-  static const String deviceFunctions = '/device/{deviceUuid}/functions';
-  static const String gatewayApi = '/device/gateway/{gatewayUuid}/devices';
+  static const String deviceByUuid = '/devices/{deviceUuid}';
+  static const String deviceFunctions = '/devices/{deviceUuid}/functions';
+  static const String gatewayApi = '/devices/gateway/{gatewayUuid}/devices';
  static const String deviceFunctionsStatus =
-      '/device/{deviceUuid}/functions/status';
-  static const String powerClamp =
-      '/device/{powerClampUuid}/power-clamp/status';
+      '/devices/{deviceUuid}/functions/status';
+
+

  ///Device Permission Module
 //POST
--- a/lib/services/api/devices_api.dart
+++ b/lib/services/api/devices_api.dart
@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 import 'package:syncrow_app/features/devices/model/device_category_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
@ -8,7 +7,6 @@ import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/devices/model/function_model.dart';
 import 'package:syncrow_app/services/api/api_links_endpoints.dart';
 import 'package:syncrow_app/services/api/http_service.dart';
-import 'package:syncrow_app/utils/constants/temp_const.dart';
 import '../../features/devices/model/create_temporary_password_model.dart';

 class DevicesAPI {
@ -39,7 +37,7 @@ class DevicesAPI {
        path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
        body: {"deviceName": deviceName},
        expectedResponseModel: (json) {
-          return json;
+          return json['data'];
        },
      );
      return response;
@ -92,7 +90,7 @@ class DevicesAPI {
          .replaceAll('{deviceUuid}', deviceId),
      showServerMessage: false,
      expectedResponseModel: (json) {
-        return json;
+        return json['data'];
      },
    );
    return response;
@ -101,7 +99,7 @@ class DevicesAPI {
  static Future<Map<String, dynamic>> getPowerClampStatus(
      String deviceId) async {
    final response = await _httpService.get(
-      path: ApiEndpoints.powerClamp.replaceAll('{powerClampUuid}', deviceId),
+      path: ApiEndpoints.deviceFunctionsStatus.replaceAll('{powerClampUuid}', deviceId),
      showServerMessage: false,
      expectedResponseModel: (json) {
        return json;
@ -132,7 +130,7 @@ class DevicesAPI {
        path: ApiEndpoints.deviceFunctions.replaceAll('{deviceUuid}', deviceId),
        showServerMessage: false,
        expectedResponseModel: (json) {
-          final functions = FunctionModel.fromJson(json);
+          final functions = FunctionModel.fromJson(json['data']);
          return functions;
        });
    return response;
@ -188,7 +186,7 @@ class DevicesAPI {
        path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
        showServerMessage: false,
        expectedResponseModel: (json) {
-          return json;
+          return json['data'];
        });
    return response;
  }
@ -264,7 +262,7 @@ class DevicesAPI {
        if (json == null || json.isEmpty || json == []) {
          return devices;
        }
-        for (var device in json['devices']) {
+        for (var device in json['data']['devices']) {
          devices.add(DeviceModel.fromJson(device));
        }
        return devices;
--- a/lib/services/api/home_management_api.dart
+++ b/lib/services/api/home_management_api.dart
@ -34,7 +34,7 @@ class HomeManagementAPI {
        path: ApiEndpoints.devices.replaceAll("{projectUuid}", projectUuid),
        showServerMessage: false,
        expectedResponseModel: (json) {
-          json.forEach((value) {
+          json['data'].forEach((value) {
            list.add(DeviceModel.fromJson(value));
          });
        });
Author	SHA1	Message	Date
hannathkadher	4c8f2c72df	Merge branch 'dev' of https://github.com/SyncrowIOT/syncrow-app into SP-1246	2025-04-03 10:47:27 +04:00
hannathkadher	fb867e5df3	updated device endpoint	2025-04-03 10:47:09 +04:00