diff --git a/assets/images/4_sceen_switch.svg b/assets/images/4_sceen_switch.svg new file mode 100644 index 00000000..3765e137 --- /dev/null +++ b/assets/images/4_sceen_switch.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/6_sceen_switch.svg b/assets/images/6_sceen_switch.svg new file mode 100644 index 00000000..fef2291b --- /dev/null +++ b/assets/images/6_sceen_switch.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/lib/pages/device_managment/gateway/view/gateway_view.dart b/lib/pages/device_managment/gateway/view/gateway_view.dart index d674e4d8..372f190a 100644 --- a/lib/pages/device_managment/gateway/view/gateway_view.dart +++ b/lib/pages/device_managment/gateway/view/gateway_view.dart @@ -100,6 +100,7 @@ class _DeviceItem extends StatelessWidget { @override Widget build(BuildContext context) { + return DeviceControlsContainer( child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_devices_box.dart b/lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_devices_box.dart index cf65dbb6..4c8fec4f 100644 --- a/lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_devices_box.dart +++ b/lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_devices_box.dart @@ -103,7 +103,9 @@ class SpaceDetailsDevicesBox extends StatelessWidget { ).then((resultSpace) { if (resultSpace != null) { if (context.mounted) { - context.read().add(UpdateSpaceDetails(resultSpace)); + context + .read() + .add(UpdateSpaceDetails(resultSpace)); } } }); @@ -133,6 +135,9 @@ class SpaceDetailsDevicesBox extends StatelessWidget { DeviceType.ThreeTouch => Assets.gangSwitch, DeviceType.NCPS => Assets.sensors, DeviceType.PC => Assets.powerClamp, + DeviceType.fourSceen => Assets.fourSceenSwitch, + DeviceType.sixSceen => Assets.sixSceenSwitch, + DeviceType.SOS => Assets.sos, DeviceType.Other => Assets.blackLogo, null => Assets.blackLogo, }; diff --git a/lib/pages/visitor_password/model/device_model.dart b/lib/pages/visitor_password/model/device_model.dart index 75d00350..99f84393 100644 --- a/lib/pages/visitor_password/model/device_model.dart +++ b/lib/pages/visitor_password/model/device_model.dart @@ -84,6 +84,14 @@ class DeviceModel { tempIcon = Assets.curtainIcon; } else if (type == DeviceType.Curtain) { tempIcon = Assets.curtainIcon; + } else if (type == DeviceType.fourSceen) { + tempIcon = Assets.fourSceenSwitch; + } else if (type == DeviceType.sixSceen) { + tempIcon = Assets.sixSceenSwitch; + } else if (type == DeviceType.SOS) { + tempIcon = Assets.sos; + } else if (type == DeviceType.NCPS) { + tempIcon = Assets.presenceSensor; } else { tempIcon = Assets.blackLogo; } diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart index 4e282a88..f4413cda 100644 --- a/lib/utils/constants/assets.dart +++ b/lib/utils/constants/assets.dart @@ -4,6 +4,8 @@ class Assets { static const String webBackground = 'assets/images/web_Background.svg'; static const String webBackgroundPng = 'assets/images/web_Background.png'; static const String blackLogo = 'assets/images/black-logo.png'; + static const String fourSceenSwitch = 'assets/images/4_sceen_switch.svg'; + static const String sixSceenSwitch = 'assets/images/6_sceen_switch.svg'; static const String logo = 'assets/images/Logo.svg'; static const String logoHorizontal = 'assets/images/logo_horizontal.png'; static const String vector = 'assets/images/Vector.png'; diff --git a/lib/utils/enum/device_types.dart b/lib/utils/enum/device_types.dart index 947e63aa..85b5d5fa 100644 --- a/lib/utils/enum/device_types.dart +++ b/lib/utils/enum/device_types.dart @@ -21,6 +21,9 @@ enum DeviceType { NCPS, DoorSensor, PC, + fourSceen, + sixSceen, + SOS, Other, } /* @@ -63,4 +66,7 @@ Map devicesTypesMap = { 'WL': DeviceType.WaterLeak, 'NCPS': DeviceType.NCPS, 'PC': DeviceType.PC, + '4S': DeviceType.fourSceen, + '6S': DeviceType.sixSceen, + 'SOS': DeviceType.SOS, };