diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 498aa0d1..5e31d3d3 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -40,7 +40,7 @@ { - kTransitionInfoKey: const TransitionInfo( - hasTransition: true, - transitionType: PageTransitionType.fade, - ), - }, - ); + Navigator.push(context, MaterialPageRoute(builder: (context) => const HomePageWidget())); } else if (haveLocal == false) { context.pushNamed( 'receptionPage', diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart index 29220d92..cf0963cc 100644 --- a/lib/flutter_flow/nav/nav.dart +++ b/lib/flutter_flow/nav/nav.dart @@ -80,8 +80,7 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) => GoRouter( FFRoute( name: 'homePage', path: '/homePage', - builder: (context, params) => - params.isEmpty ? const HomePageWidget() : const HomePageWidget(), + builder: (context, params) => const HomePageWidget(), ), FFRoute( name: 'receptionPage', diff --git a/lib/main.dart b/lib/main.dart index 16cf29a0..d20c77f5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -90,7 +90,6 @@ class _AppState extends State { @override Widget build(BuildContext context) { - log("haveLocals: ${AppState().haveLocal}"); return MultiProvider( providers: [ ChangeNotifierProvider(create: (_) => AppState()), diff --git a/lib/pages/home_page/home_page_widget.dart b/lib/pages/home_page/home_page_widget.dart index f7fc329a..4ca38299 100644 --- a/lib/pages/home_page/home_page_widget.dart +++ b/lib/pages/home_page/home_page_widget.dart @@ -31,103 +31,59 @@ class _HomePageWidgetState extends State { late LocalProfileComponentWidget _localProfileComponentWidget; _HomePageWidgetState() { - log('HomePageWidget'); - _localProfileComponentWidget = - LocalProfileComponentWidget(showBottomSheet: showBottomSheet); + _localProfileComponentWidget = LocalProfileComponentWidget(showBottomSheet: showModalSelectLocal); } - final _dataSubject = BehaviorSubject(); - bool isShowModalLocal = false; - bool isShowingBottomSheet = false; - - Future checkData() async { + Future processData() async { try { - PhpGroup.getDadosCall - .call( + var response = await PhpGroup.getDadosCall.call( devUUID: AppState().devUUID, userUUID: AppState().userUUID, cliUUID: AppState().cliUUID, atividade: 'getDados', - ) - .then((response) { - log('Response getDadosCall: ${response.jsonBody}'); - if (response.statusCode == 200) { - final error = response.jsonBody['error']; - final errorMsg = response.jsonBody['error_msg']; + ); - if (error == false) { - AppState().whatsapp = response.jsonBody['whatsapp'] ?? false; - AppState().provisional = response.jsonBody['provisional'] ?? false; - AppState().name = response.jsonBody['visitado']['VDO_NOME']; - safeSetState(() {}); - } else if (errorMsg == - r'''Usuario nao possui vĂ­nculo ativo com esse condominio''') { - log(errorMsg); - return DialogUtil.warningDefault(context) - .whenComplete(() => checkLocal()) - .then((_) => safeSetState(() {})); - } else { - return DialogUtil.warningDefault(context) - .whenComplete(() => checkLocal()) - .then((_) => safeSetState(() {})); - } - } else { - return DialogUtil.warningDefault(context) - .whenComplete(() => checkLocal()) - .then((_) => safeSetState(() {})); - } - }).catchError((e) { - log('Error in getDadosCall: $e'); - return DialogUtil.warningDefault(context) - .whenComplete(() => checkLocal()) - .then((_) => safeSetState(() {})); - }).onError((error, stackTrace) { - log('Error in getDadosCall: $error\n\n$stackTrace'); - return DialogUtil.warningDefault(context) - .whenComplete(() => checkLocal()) - .then((_) => safeSetState(() {})); - }).whenComplete(() { + final error = response.jsonBody['error']; + final errorMsg = response.jsonBody['error_msg']; + + if (error == false) { + AppState().whatsapp = response.jsonBody['whatsapp'] ?? false; + AppState().provisional = response.jsonBody['provisional'] ?? false; + AppState().name = response.jsonBody['visitado']['VDO_NOME']; safeSetState(() {}); - }); - } catch (e, s) { - log('Error in checkData: \n\n$e\n\n$s'); - await DialogUtil.warningDefault(context).whenComplete(() => checkLocal()); + return; + } + + DialogUtil.warningDefault(context).whenComplete(() => processLocals()); + safeSetState(() {}); + return; + } catch(e, s) { + DialogUtil.warningDefault(context).whenComplete(() => processLocals()); } } - Future checkLocal() async { - log('Checklocal'); + Future processLocals() async { try { - final response = await PhpGroup.getLocalsCall.call( + var response = await PhpGroup.getLocalsCall.call( devUUID: AppState().devUUID, userUUID: AppState().userUUID, ); List locals = response.jsonBody['locais'] ?? []; - final activeLocals = - locals.where((local) => local['CLU_STATUS'] == 'A').toList(); - log('ActiveLocals: $activeLocals'); + + final activeLocals = locals.where((local) => local['CLU_STATUS'] == 'A').toList(); if (activeLocals.isEmpty || AppState().cliUUID.isEmpty) { - log('2ShowBottomSheet: $isShowModalLocal'); - if (isShowModalLocal || isShowingBottomSheet) return; - isShowModalLocal = true; - await showBottomSheet(); + await showModalSelectLocal(); } else { - await checkData(); + await processData(); } } catch (e) { - log('Error in checkLocal: $e'); - if (isShowModalLocal || isShowingBottomSheet) return; - await showBottomSheet(); + await showModalSelectLocal(); } } - Future showBottomSheet() async { - if (isShowingBottomSheet) return; - isShowingBottomSheet = true; - - log('ShowBottomSheet: $isShowModalLocal'); + Future showModalSelectLocal() async { await showModalBottomSheet( isScrollControlled: true, backgroundColor: Colors.transparent, @@ -140,34 +96,17 @@ class _HomePageWidgetState extends State { ), ).then((_) async { _model.updatePage(() => safeSetState(() { - // isShowModalLocal = false; - _localProfileComponentWidget = - LocalProfileComponentWidget(showBottomSheet: showBottomSheet); - })); - await checkData(); - }).whenComplete(() { - isShowingBottomSheet = false; + _localProfileComponentWidget = LocalProfileComponentWidget(showBottomSheet: showModalSelectLocal); + })); + + await processData(); }); } @override void dispose() { - _model.dispose(); - - // Close the data subject - _dataSubject.close(); - super.dispose(); - } - - // Call this method to trigger the checkData() function - void triggerCheckData() { - _dataSubject.add(true); - } - - // Call this method to trigger the checkLocal() function - void triggerCheckLocal() { - _dataSubject.add(false); + _model.dispose(); } @override @@ -179,24 +118,14 @@ class _HomePageWidgetState extends State { () async { await FirebaseMessagingService().updateDeviceToken(); - checkLocal(); - }(); - _dataSubject.stream.listen((data) { - if (data) { - checkData(); - } else { - checkLocal(); + if (AppState().cliUUID.isEmpty) { + await processLocals(); } - }); - - // WidgetsBinding.instance.addPostFrameCallback((_) async { - // }); + }(); _model.textController ??= TextEditingController(); _model.textFieldFocusNode ??= FocusNode(); - - // Subscribe to the data subject } @override