diff --git a/lib/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart b/lib/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart index 25d929c..31a9130 100644 --- a/lib/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart +++ b/lib/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart @@ -54,12 +54,15 @@ class SixSceneScreen extends StatelessWidget { title: _bloc.deviceInfo.subspace.subspaceName, actions: [ InkWell( - onTap: () { - Navigator.of(context).push( + onTap: () async { + bool val = await Navigator.of(context).push( MaterialPageRoute( builder: (context) => SixSceneSettings(device: device!), ), ); + if (val == true) { + _bloc.add(const SixSceneInitialInfo()); + } }, child: SvgPicture.asset(Assets.assetsIconsSettings), ), diff --git a/lib/features/devices/view/widgets/four_scene_switch/four_scene_setting/four_scene_settings.dart b/lib/features/devices/view/widgets/four_scene_switch/four_scene_setting/four_scene_settings.dart index a6cea79..99f9f39 100644 --- a/lib/features/devices/view/widgets/four_scene_switch/four_scene_setting/four_scene_settings.dart +++ b/lib/features/devices/view/widgets/four_scene_switch/four_scene_setting/four_scene_settings.dart @@ -367,7 +367,7 @@ class FourSceneSettings extends StatelessWidget { ), const SizedBox(height: 20), Row( - mainAxisAlignment:MainAxisAlignment.spaceBetween, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ InkWell( onTap: () { diff --git a/lib/features/devices/view/widgets/sos/sos_screen.dart b/lib/features/devices/view/widgets/sos/sos_screen.dart index ea9e7df..4a3b765 100644 --- a/lib/features/devices/view/widgets/sos/sos_screen.dart +++ b/lib/features/devices/view/widgets/sos/sos_screen.dart @@ -45,12 +45,15 @@ class SosScreen extends StatelessWidget { title: sensor.deviceInfo.name, actions: [ InkWell( - onTap: () { - Navigator.of(context).push( + onTap: () async { + var val = await Navigator.of(context).push( MaterialPageRoute( builder: (context) => SosSettings(device: device!), ), ); + + sensor.add(SosInitialDeviseInfo()); + sensor.add(const SosInitial()); }, child: SvgPicture.asset(Assets.assetsIconsSettings), ),