Merge pull request #168 from SyncrowIOT/flush-presence-sensor-routines

fix real time garage door and add flush sensor to routines
2025-07-10 15:17:31 +00:00 · 2025-04-29 10:25:17 +03:00
parent b4de07de2f ea88f54d20
commit fe1dbb66ac
21 changed files with 1435 additions and 140 deletions
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart'
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/flush/flush_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/two_gang_switch/two_gang_switch.dart';
@ -155,13 +156,17 @@ class AllDevicesModel {
    batteryLevel = int.tryParse(json['battery']?.toString() ?? '');
    productName = json['productName']?.toString();
    deviceTags = json['deviceTag'] != null && json['deviceTag'] is List
-        ? (json['deviceTag'] as List).map((tag) => DeviceTagModel.fromJson(tag)).toList()
+        ? (json['deviceTag'] as List)
+            .map((tag) => DeviceTagModel.fromJson(tag))
+            .toList()
        : [];
    deviceSubSpace = json['subspace'] != null
        ? DeviceSubSpace.fromJson(json['subspace'])
        : DeviceSubSpace(subspaceName: '');
    if (json['spaces'] != null && json['spaces'] is List) {
-      spaces = (json['spaces'] as List).map((space) => DeviceSpaceModel.fromJson(space)).toList();
+      spaces = (json['spaces'] as List)
+          .map((space) => DeviceSpaceModel.fromJson(space))
+          .toList();
    }
  }

@ -209,7 +214,8 @@ SOS
    String tempIcon = '';
    if (type == DeviceType.LightBulb) {
      tempIcon = Assets.lightBulb;
-    } else if (type == DeviceType.CeilingSensor || type == DeviceType.WallSensor) {
+    } else if (type == DeviceType.CeilingSensor ||
+        type == DeviceType.WallSensor) {
      tempIcon = Assets.sensors;
    } else if (type == DeviceType.AC) {
      tempIcon = Assets.ac;
@ -239,6 +245,8 @@ SOS
      //  tempIcon = Assets.gang3touch;
    } else if (type == DeviceType.WaterLeak) {
      tempIcon = Assets.waterLeakNormal;
+    } else if (type == DeviceType.NCPS) {
+      tempIcon = Assets.sensors;
    } else {
      tempIcon = Assets.logoHorizontal;
    }
@ -254,51 +262,75 @@ SOS
    switch (productType) {
      case 'AC':
        return [
-          SwitchFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ModeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          TempSetFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          CurrentTempFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          LevelFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ChildLockFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          SwitchFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ModeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          TempSetFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          CurrentTempFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          LevelFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ChildLockFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
        ];

      case '1G':
        return [
          OneGangSwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          OneGangCountdownFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          OneGangCountdownFunction(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
        ];

      case '2G':
        return [
          TwoGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
          TwoGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown1Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
        ];

      case '3G':
        return [
-          ThreeGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangSwitch3Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown3Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch1Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch2Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch3Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown1Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown3Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
        ];
      case 'WPS':
        return [
          //IF Functions
-          PresenceStateFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          CurrentDistanceFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          IlluminanceValueFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          PresenceTimeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PresenceStateFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentDistanceFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          IlluminanceValueFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PresenceTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),

          //THEN Functions
-          FarDetectionFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          MotionSensitivityFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          MotionLessSensitivityFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          IndicatorFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          NoOneTimeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FarDetectionFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          MotionSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          MotionLessSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          IndicatorFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          NoOneTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
        ];
      case 'GW':
        return [
@ -323,6 +355,30 @@ SOS
          uuid: uuid ?? '',
          name: name ?? '',
        );
+      case 'NCPS':
+        return [
+          FlushPresenceDelayFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF',),
+
+          FlushIlluminanceFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          //THEN Functions
+          FlushSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushNearDetectionFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushMaxDetectDistFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushTargetConfirmTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushDisappeDelayFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushIndentLevelFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushTriggerLevelFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+        ];
+
      default:
        return [];
    }
@ -454,5 +510,6 @@ SOS
    "3GT": DeviceType.ThreeTouch,
    "GD": DeviceType.GarageDoor,
    "WL": DeviceType.WaterLeak,
+    "NCPS": DeviceType.NCPS,
  };
 }
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart
@ -97,3 +97,7 @@ class FlushMountedPresenceSensorModel {
    );
  }
 }
+
+
+
+
--- a/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart
+++ b/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart
@ -106,14 +106,14 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
      ScheduleEntry newSchedule = ScheduleEntry(
        category: event.category,
        time: formatTimeOfDayToISO(event.time),
-        function: Status(code: 'switch_1', value: event.functionOn),
+        function: Status(code: 'doorcontact_state', value: event.functionOn),
        days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
      );
      bool success =
          await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
      if (success) {
        add(FetchGarageDoorSchedulesEvent(
-            deviceId: deviceId, category: 'switch_1'));
+            deviceId: deviceId, category: 'doorcontact_state'));
      } else {
        emit(GarageDoorLoadedState(status: deviceStatus));
      }
@ -149,7 +149,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
      final updatedSchedules = deviceStatus.schedules?.map((schedule) {
        if (schedule.scheduleId == event.scheduleId) {
          return schedule.copyWith(
-            function: Status(code: 'switch_1', value: event.functionOn),
+            function:
+                Status(code: 'doorcontact_state', value: event.functionOn),
            enable: event.enable,
          );
        }
@ -274,7 +275,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {

  Future<void> _onBatchControl(
      GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
-    final oldValue = event.code == 'switch_1' ? deviceStatus.switch1 : false;
+    final oldValue =
+        event.code == 'doorcontact_state' ? deviceStatus.switch1 : false;

    _updateLocalValue(event.code, event.value);
    emit(GarageDoorBatchStatusLoaded(deviceStatus));
@ -409,7 +411,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
  void _revertValue(
      String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
    switch (code) {
-      case 'switch_1':
+      case 'doorcontact_state':
        if (oldValue is bool) {
          deviceStatus = deviceStatus.copyWith(switch1: oldValue);
        }
@ -468,10 +470,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
          deviceStatus = deviceStatus.copyWith(voiceControl1: value);
        }
        break;
-      case 'door_contact_state':
+      case 'doorcontact_state':
        if (value is bool) {
          deviceStatus = deviceStatus.copyWith(doorContactState: value);
        }
+
      default:
        break;
    }
@ -490,14 +493,14 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
        scheduleId: event.scheduleId,
        category: event.category,
        time: formatTimeOfDayToISO(event.time),
-        function: Status(code: 'switch_1', value: event.functionOn),
+        function: Status(code: 'doorcontact_state', value: event.functionOn),
        days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
      );
      bool success = await DevicesManagementApi()
          .editScheduleRecord(deviceId, newSchedule);
      if (success) {
        add(FetchGarageDoorSchedulesEvent(
-            deviceId: deviceId, category: 'switch_1'));
+            deviceId: deviceId, category: 'doorcontact_state'));
      } else {
        emit(GarageDoorLoadedState(status: deviceStatus));
      }
--- a/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
+++ b/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
@ -14,7 +14,8 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

-class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout {
+class GarageDoorControlView extends StatelessWidget
+    with HelperResponsiveLayout {
  final String deviceId;

  const GarageDoorControlView({required this.deviceId, super.key});
@ -22,7 +23,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => GarageDoorBloc(deviceId: deviceId)..add(GarageDoorInitialEvent(deviceId)),
+      create: (context) => GarageDoorBloc(deviceId: deviceId)
+        ..add(GarageDoorInitialEvent(deviceId)),
      child: BlocBuilder<GarageDoorBloc, GarageDoorState>(
        builder: (context, state) {
          if (state is GarageDoorLoadingState) {
@ -34,7 +36,9 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
              garageDoorSensor: true,
              onRowTap: (index) {},
              onClose: () {
-                context.read<GarageDoorBloc>().add(BackToGarageDoorGridViewEvent());
+                context
+                    .read<GarageDoorBloc>()
+                    .add(BackToGarageDoorGridViewEvent());
              },
            );
          } else if (state is GarageDoorLoadedState) {
@ -71,11 +75,14 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
      children: [
        IconNameStatusContainer(
          isFullIcon: false,
-          name: status.switch1 ? 'Opened' : 'Closed',
-          icon: status.switch1 ? Assets.openedDoor : Assets.closedDoor,
+          name: status.doorContactState ? 'Opened' : 'Closed',
+          icon: status.doorContactState ? Assets.openedDoor : Assets.closedDoor,
          onTap: () {
            context.read<GarageDoorBloc>().add(
-                  GarageDoorControlEvent(deviceId: status.uuid, value: !status.switch1, code: 'switch_1'),
+                  GarageDoorControlEvent(
+                      deviceId: status.uuid,
+                      value: !status.switch1,
+                      code: 'doorcontact_state'),
                );
          },
          status: status.switch1,
@ -84,7 +91,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
        IconNameStatusContainer(
          onTap: () {
            context.read<GarageDoorBloc>().add(
-                  FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'),
+                  FetchGarageDoorSchedulesEvent(
+                      deviceId: deviceId, category: 'doorcontact_state'),
                );
            showDialog(
                context: context,
@ -107,7 +115,9 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
            children: [
              IconButton(
                onPressed: () {
-                  context.read<GarageDoorBloc>().add(DecreaseGarageDoorDelayEvent(deviceId: status.uuid));
+                  context
+                      .read<GarageDoorBloc>()
+                      .add(DecreaseGarageDoorDelayEvent(deviceId: status.uuid));
                },
                icon: const Icon(
                  Icons.remove,
@ -125,7 +135,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
              ),
              Text(
                'h',
-                style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
+                style: context.textTheme.bodySmall!
+                    .copyWith(color: ColorsManager.blackColor),
              ),
              Text(
                (status.delay.inMinutes % 60).toString().padLeft(2, '0'),
@ -136,11 +147,14 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
              ),
              Text(
                'm',
-                style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
+                style: context.textTheme.bodySmall!
+                    .copyWith(color: ColorsManager.blackColor),
              ),
              IconButton(
                onPressed: () {
-                  context.read<GarageDoorBloc>().add(IncreaseGarageDoorDelayEvent(deviceId: status.uuid));
+                  context
+                      .read<GarageDoorBloc>()
+                      .add(IncreaseGarageDoorDelayEvent(deviceId: status.uuid));
                },
                icon: const Icon(
                  Icons.add,
@ -158,7 +172,9 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
          onChange: (value) {
            context.read<GarageDoorBloc>().add(
                  GarageDoorControlEvent(
-                      deviceId: status.uuid, value: value ? status.delay.inSeconds : 0, code: 'countdown_1'),
+                      deviceId: status.uuid,
+                      value: value ? status.delay.inSeconds : 0,
+                      code: 'countdown_1'),
                );
          },
        ),
@ -167,7 +183,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
          name: 'Records',
          icon: Assets.records,
          onTap: () {
-            context.read<GarageDoorBloc>().add(FetchGarageDoorRecordsEvent(code: 'switch_1', deviceId: status.uuid));
+            context.read<GarageDoorBloc>().add(FetchGarageDoorRecordsEvent(
+                code: 'doorcontact_state', deviceId: status.uuid));
          },
          status: false,
          textColor: ColorsManager.blackColor,