Merge pull request 'fix: black screen Issue-514' (#528) from mso7nueh/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#528
2025-06-25 12:38:06 +00:00
parent d14fbbb8d3 80afcd8949
commit 535dd595b7
8 changed files with 42 additions and 16 deletions
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -388,7 +388,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -538,7 +538,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -576,7 +576,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>31</string>
+	<string>32</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
--- a/lib/features/auth/presentation/pages/auth_screen.dart
+++ b/lib/features/auth/presentation/pages/auth_screen.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -60,17 +61,20 @@ class _AuthScreenState extends State<AuthScreen> {
    }
    if (context.mounted) {
      try {
-        context.read<ProfileAvatarCubit>().getMyProfile();
-        context.read<ChatsCubit>().getChatRoomsWithLoading();
-        context.read<ChatsCubit>().connectToWebSocket();
-        context.read<NotificationsCubit>().getNotifications();
-        context.read<NotificationsCubit>().connectToWebSocket();
+        await sl<ProfileAvatarCubit>().getMyProfile();
+        await sl<ChatsCubit>().getChatRoomsWithLoading();
+        await sl<ChatsCubit>().connectToWebSocket();
+        await sl<NotificationsCubit>().getNotifications();
+        await sl<NotificationsCubit>().connectToWebSocket();
        showSuccessToast('Успешный вход');
      } catch (e) {
        rethrow;
      }
-      GoRouter.of(context).go('/feed-screen', extra: {'needToInitializeWebSocket': false});
    }
+    AppRouter.navigatorKey.currentContext?.go(
+      '/feed-screen',
+      extra: {'needToInitializeWebSocket': false},
+    );
  }

  @override
--- a/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
+++ b/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
@@ -6,6 +6,10 @@ import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
+import 'package:eatvio_app/core/websockets/ws_manager.dart';
+import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
+import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
+import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
@@ -58,7 +62,7 @@ class _ScanQRCodeScreenState extends State<ScanQRCodeScreen> {
      setState(() {
        result = scanData;
      });
-      controller.pauseCamera();
+      await controller.pauseCamera();
      try {
        final scannedUrl = scanData.code;
        final uri = Uri.parse(scannedUrl ?? '');
@@ -76,14 +80,29 @@ class _ScanQRCodeScreenState extends State<ScanQRCodeScreen> {
        );
        final token = response.data['token'];
        await TokenStorage.saveTokenInStorage(token);
+        try {
+          await sl<WsManager>().clear();
+          await sl<WsManager>().initialize();
+        } catch (e) {
+          rethrow;
+        }
+        try {
+          await sl<ProfileAvatarCubit>().getMyProfile();
+          await sl<ChatsCubit>().getChatRoomsWithLoading();
+          await sl<ChatsCubit>().connectToWebSocket();
+          await sl<NotificationsCubit>().getNotifications();
+          await sl<NotificationsCubit>().connectToWebSocket();
+        } catch (e) {
+          rethrow;
+        }
        AppRouter.navigatorKey.currentContext?.go(
          '/feed-screen',
          extra: {'needToInitializeWebSocket': false},
        );
        showSuccessToast('Добро пожаловать!');
      } catch (e) {
-        controller.resumeCamera();
-        showErrorToast('Что-то пошло не так, попробуйте обновить страницу с qr кодом или используйте вход через логин и пароль');
+        await controller.resumeCamera();
+        showErrorToast('Что-то пошло не так. Попробуйте обновить страницу с QR-кодом или войдите с помощью логина и пароля.');
      }
    });
  }
--- a/lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart
+++ b/lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart
@@ -1,6 +1,8 @@
+import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';

 class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
  final ProfileRepository profileRepository;
@@ -18,6 +20,7 @@ class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
        ),
      );
    } catch (e) {
+      AppRouter.navigatorKey.currentContext?.go('/auth-screen');
      emit(ProfileAvatarState.error(errorMessage: e.toString()));
    }
  }
--- a/lib/features/menu/presentation/pages/menu_screen.dart
+++ b/lib/features/menu/presentation/pages/menu_screen.dart
@@ -114,7 +114,7 @@ class MenuScreen extends StatelessWidget {
              child: const Text("Отмена"),
            ),
          ],
-          content: const Text("Вы уверены что хотите выйти из аккаунта?"),
+          content: const Text("Вы уверены, что хотите выйти из аккаунта?"),
        ),
      );
    };
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -27,7 +27,7 @@ Future<void> main() async {
  await di.init();

  await SentryFlutter.init(
-        (options) {
+    (options) {
      options.dsn = 'http://ba7f2653067776f3034e6e89850e85a1@sentry.md-desk.ru:9000/2';
      options.tracesSampleRate = 1.0;
      options.debug = false;
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: eatvio_app
 description: A new Flutter project.
-version: 1.1.8+38
+version: 1.1.9+39
 publish_to: 'none'

 environment: