From bf944a6121b123b3778dbcc1676c950819260568 Mon Sep 17 00:00:00 2001 From: mohammad Date: Sun, 1 Sep 2024 10:21:04 +0300 Subject: [PATCH] curtain changes --- .../bloc/curtain_bloc/curtain_bloc.dart | 33 +++---------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/lib/features/devices/bloc/curtain_bloc/curtain_bloc.dart b/lib/features/devices/bloc/curtain_bloc/curtain_bloc.dart index c42acd9..25d3d23 100644 --- a/lib/features/devices/bloc/curtain_bloc/curtain_bloc.dart +++ b/lib/features/devices/bloc/curtain_bloc/curtain_bloc.dart @@ -1,9 +1,7 @@ -import 'package:dio/dio.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:syncrow_app/features/devices/bloc/curtain_bloc/curtain_event.dart'; import 'package:syncrow_app/features/devices/bloc/curtain_bloc/curtain_state.dart'; import 'package:syncrow_app/features/devices/model/device_control_model.dart'; -import 'package:syncrow_app/features/devices/model/function_model.dart'; import 'package:syncrow_app/features/devices/model/status_model.dart'; import 'package:syncrow_app/services/api/devices_api.dart'; import 'package:syncrow_app/utils/resource_manager/constants.dart'; @@ -29,7 +27,7 @@ class CurtainBloc extends Bloc { Future _onOpenCurtain( OpenCurtain event, Emitter emit) async { - if (state is CurtainsOpening) return; + // if (state is CurtainsOpening) return; isMoving = true; while (openPercentage < 100.0) { if (state is CurtainsClosing) { @@ -51,7 +49,7 @@ class CurtainBloc extends Bloc { _pauseCurtain(emit); } }); - if (openPercentage == 100.0) { + if (openPercentage >=100.0) { await DevicesAPI.controlDevice( DeviceControlModel( deviceId: curtainId, @@ -78,7 +76,6 @@ class CurtainBloc extends Bloc { Future _onCloseCurtain( CloseCurtain event, Emitter emit) async { - if (state is CurtainsClosing) return; isMoving = true; while (openPercentage > 0.0) { if (state is CurtainsOpening) { @@ -100,7 +97,6 @@ class CurtainBloc extends Bloc { _pauseCurtain(emit); } }); - if (openPercentage == 0.0) { await DevicesAPI.controlDevice( DeviceControlModel( @@ -157,25 +153,8 @@ class CurtainBloc extends Bloc { } - // void _fetchStatus(InitCurtain event, Emitter emit) async { - // try { - // var response = await DevicesAPI.getDeviceStatus(curtainId); - // List statusModelList = []; - // for (var status in response['status']) { - // print(status); - // statusModelList.add(StatusModel.fromJson(status)); - // } - // openPercentage = double.tryParse(statusModelList[1].value.toString())!; - // emit(CurtainsOpening( - // curtainWidth: curtainWidth , - // blindHeight: blindHeight, - // openPercentage: openPercentage, - // )); - // } catch (e) { - // emit(FailedState()); - // return; - // } - // } + + void _fetchStatus(InitCurtain event, Emitter emit) async { try { emit(CurtainLoadingState()); @@ -193,10 +172,6 @@ class CurtainBloc extends Bloc { curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace; blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace; } - print('openPercentage fetched: $openPercentage'); - print('Calculated curtainWidth: $curtainWidth'); - print('Calculated blindHeight: $blindHeight'); - // Emit the updated state with calculated values emit(CurtainsOpening( curtainWidth: curtainWidth, blindHeight: blindHeight,