new release 2.0.0

added skyle 3 support added skyle type change added version and serial fixed calibration for skyle 3
eyev-de · Sep 30, 2024 · 7fba4c2 · 7fba4c2
1 parent b150cb5
commit 7fba4c2
Show file tree

Hide file tree

Showing 35 changed files with 841 additions and 377 deletions.
diff --git a/.github/workflows/github-actions-release-android.yml b/.github/workflows/github-actions-release-android.yml
@@ -20,7 +20,7 @@ jobs:
         java-version: '11'
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.3.7'
+        flutter-version: '3.22.0'
         channel: 'stable'
         cache: true
     - run: flutter build apk --release
@@ -38,6 +38,6 @@ jobs:
       with:
         artifacts: 'build/app/outputs/apk/release/skyle_ik-android.zip'
         token: ${{ secrets.RELEASES_TOKEN }}
-        tag: '1.1.1'
+        tag: '2.0.0'
         commit: main
         allowUpdates: true
diff --git a/.github/workflows/github-actions-release-ios.yml b/.github/workflows/github-actions-release-ios.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.3.7'
+        flutter-version: '3.22.0'
         channel: 'stable'
         architecture: x64
         cache: true
@@ -35,6 +35,6 @@ jobs:
       with:
         artifacts: 'build/ios/iphoneos/skyle_ik-ios.zip'
         token: ${{ secrets.RELEASES_TOKEN }}
-        tag: '1.1.1'
+        tag: '2.0.0'
         commit: main
         allowUpdates: true
diff --git a/.github/workflows/github-actions-release-linux.yml b/.github/workflows/github-actions-release-linux.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.3.7'
+        flutter-version: '3.22.0'
         channel: 'stable'
         cache: true
     - name: Install dependencies
@@ -35,6 +35,6 @@ jobs:
       with:
         artifacts: 'build/linux/x64/release/bundle/skyle_ik-linux.zip'
         token: ${{ secrets.RELEASES_TOKEN }}
-        tag: '1.1.1'
+        tag: '2.0.0'
         commit: main
         allowUpdates: true
diff --git a/.github/workflows/github-actions-release-macos.yml b/.github/workflows/github-actions-release-macos.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.3.7'
+        flutter-version: '3.22.0'
         channel: 'stable'
         architecture: x64
         cache: true
@@ -34,6 +34,6 @@ jobs:
       with:
         artifacts: 'build/macos/Build/Products/Release/skyle_ik-macos/skyle_ik-macos.zip'
         token: ${{ secrets.RELEASES_TOKEN }}
-        tag: '1.1.1'
+        tag: '2.0.0'
         commit: main
         allowUpdates: true
diff --git a/.github/workflows/github-actions-release-windows.yml b/.github/workflows/github-actions-release-windows.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.3.7'
+        flutter-version: '3.22.0'
         channel: 'stable'
         cache: true
     - run: flutter build windows --release
@@ -33,6 +33,6 @@ jobs:
       with:
         artifacts: 'build/windows/runner/Release/skyle_ik-windows.zip'
         token: ${{ secrets.RELEASES_TOKEN }}
-        tag: '1.1.1'
+        tag: '2.0.0'
         commit: main
         allowUpdates: true
diff --git a/lib/app.dart b/lib/app.dart
@@ -53,7 +53,8 @@ class _SkyleAppState extends ConsumerState<SkyleApp> with WidgetsBindingObserver
     } else if (state == AppLifecycleState.resumed) {
       // Resume Skyle API
       try {
-        await AppState().et.connect(grpcPort: Configuration.grpcPort);
+        final skyleType = ref.read(AppState().skyleTypeProvider);
+        await AppState().et.connect(grpcPort: skyleType.port);
       } catch (e) {
         print('Failed to connect Skyle in didChangeAppLifecycle. $e');
       }
@@ -75,7 +76,8 @@ class _SkyleAppState extends ConsumerState<SkyleApp> with WidgetsBindingObserver
       } else {
         // Start Skyle API
         try {
-          await AppState().et.connect(grpcPort: Configuration.grpcPort);
+          final skyleType = ref.read(AppState().skyleTypeProvider);
+          await AppState().et.connect(grpcPort: skyleType.port);
         } catch (e) {
           print('Failed to connect Skyle in initState. $e');
         }

diff --git a/lib/config/app_state.dart b/lib/config/app_state.dart
@@ -23,6 +23,23 @@ import '../domain/repositories/update_repository.dart';
 import 'local_settings_notifiers.dart';
 import 'positioning_type_notifier.dart';
 
+enum SkyleType {
+  skyleIntegrationKit(50051),
+  skyleForIpad(50052);
+
+  final int port;
+  const SkyleType(this.port);
+}
+
+enum SkyleVersion {
+  skyle1(1),
+  skyle2(2),
+  skyle3(3);
+
+  final int version;
+  const SkyleVersion(this.version);
+}
+
 class AppState {
   // Navigator 2.0 stuff
   final parserProvider = Provider<MainRouteInformationParser>((ref) => MainRouteInformationParser());
@@ -32,6 +49,10 @@ class AppState {
 
   final navigatorProvider = StateNotifierProvider<MainNavigatorStateNotifier, List<RouteState>>((ref) => MainNavigatorStateNotifier());
 
+  // Skyle Type stuff
+  final skyleTypeProvider = StateProvider((ref) => SkyleType.skyleIntegrationKit);
+  final skyleVersionProvider = StateProvider((ref) => SkyleVersion.skyle3);
+
   // Skyle API oject
   final skyle.ET et = skyle.ET();
 
@@ -64,6 +85,10 @@ class AppState {
     return PositioningTypeNotifier();
   });
 
+  late final videoStreamProvider = StreamProvider((ref) {
+    return videoStreamController.stream;
+  });
+
   late final switchSettingsProvider = StreamProvider.autoDispose((ref) {
     ref
       ..onDispose(et.switchSettings.stop)
@@ -157,14 +182,20 @@ class AppState {
   StreamController<skyle.DataState<skyle.PositioningMessage>> positioningStreamController = StreamController();
   StreamSubscription<skyle.DataState<skyle.PositioningMessage>>? positioningStreamSubscription;
 
+  Stream<skyle.DataState<skyle.RawImage>>? videoStream;
+  StreamController<skyle.DataState<skyle.RawImage>> videoStreamController = StreamController();
+  StreamSubscription<skyle.DataState<skyle.RawImage>>? videoStreamSubscription;
+
   Future<void> init() async {
     connectionStreamSubscription = et.connectionStream.listen((connection) {
       if (connection == skyle.Connection.connected) {
         _startGazeStream();
         _startPositioningStream();
+        _startVideoStream();
       } else {
         _stopGazeStream();
         _stopPositioningStream();
+        _stopVideoStream();
       }
     });
   }
@@ -183,6 +214,11 @@ class AppState {
     await et.positioning.stop();
   }
 
+  Future<void> _stopVideoStream() async {
+    await videoStreamSubscription?.cancel();
+    await et.video.stop();
+  }
+
   Future<void> _startGazeStream() async {
     if (et.connection != skyle.Connection.connected) return;
     gazeStream = et.gaze.start();
@@ -211,4 +247,18 @@ class AppState {
       }
     });
   }
+
+  Future<void> _startVideoStream() async {
+    if (et.connection != skyle.Connection.connected) return;
+    videoStream = et.video.start();
+    videoStreamSubscription = videoStream?.listen((video) async {
+      if (video is skyle.DataFailed) {
+        await _stopVideoStream();
+        await Future.delayed(const Duration(milliseconds: 500));
+        await _startVideoStream();
+      } else if (video is skyle.DataSuccess) {
+        videoStreamController.add(video);
+      }
+    });
+  }
 }
diff --git a/lib/config/configuration.dart b/lib/config/configuration.dart
@@ -5,18 +5,17 @@
 //
 
 import 'package:flutter/foundation.dart';
-import 'package:skyle_api/api.dart';
 
 class Configuration {
-  static const String updateDestinationURL = 'http://skyle.local/api/update/';
+  static const String updateDestinationURL = 'http://192.168.137.2/api/update/';
   static const String updateURL = 'https://update.eyev.de/check.php';
   static const String isBetaDeviceURL = 'https://update.eyev.de/get_beta.php';
   static const String releaseNotesURL = 'https://update.eyev.de/notes.php';
   static const String updateBaseDirectory = 'updates';
 
-  static String mjpegURL = 'http://${ET.baseURL}:8080/?action=stream';
+  static String mjpegURL = 'http://192.168.137.2:8080/?action=stream';
 
   static const bool simulateET = kDebugMode && false;
 
-  static const grpcPort = 50051;
+  // static const grpcPort = 50052;
 }
diff --git a/lib/config/routes/main_routes.dart b/lib/config/routes/main_routes.dart
@@ -31,7 +31,7 @@ enum MainRoutes {
       case MainRoutes.home:
         return PageWrapper(
           key: ValueKey(fromPath(path)),
-          child: const MainView(),
+          child: MainView(),
         );
       case MainRoutes.capture:
         return PageWrapper(

diff --git a/lib/config/routes/routes.dart b/lib/config/routes/routes.dart
@@ -48,7 +48,7 @@ class Routes {
     currentRoute += '/dialog';
   }
 
-  static bool gazeInteractionPredicate(Rect itemRect, Rect gazePointerRect, String itemRoute, String currentRoute) {
+  static PredicateReturnState gazeInteractionPredicate(Rect itemRect, Rect gazePointerRect, Rect gazeSnapPointerRect, String itemRoute, String currentRoute) {
     // final intersection = itemRect.intersect(gazePointerRect);
     // if (intersection.width.isNegative || intersection.height.isNegative) return false;
     // final intersectionArea = intersection.width * intersection.height;
@@ -59,15 +59,15 @@ class Routes {
     // skyleLogger?.i('$itemRoute ?== $currentRoute');
     if (currentRoute.endsWith('dialog')) {
       if (itemRoute == currentRoute && itemRect.contains(gazePointerRect.center)) {
-        return true;
+        return PredicateReturnState.gaze;
       } else {
-        return false;
+        return PredicateReturnState.none;
       }
     }
     // Check in case of Regular Route
     if ((itemRoute == currentRoute) && itemRect.contains(gazePointerRect.center)) {
-      return true;
+      return PredicateReturnState.gaze;
     }
-    return false;
+    return PredicateReturnState.none;
   }
 }
diff --git a/lib/config/theme/app_theme.dart b/lib/config/theme/app_theme.dart
@@ -26,28 +26,28 @@ class AppTheme {
         onSecondary: Colors.white,
         onSurface: Colors.white,
       ),
-      toggleableActiveColor: Colors.teal.shade800,
+      // toggleableActiveColor: Colors.teal.shade800,
       primaryColor: Colors.teal.shade800,
       primaryTextTheme: TextTheme(
-        headline1: const TextStyle(
+        headlineLarge: const TextStyle(
           color: Colors.white,
           fontSize: 25,
           fontWeight: FontWeight.bold,
           decoration: TextDecoration.none,
         ),
-        headline2: const TextStyle(
+        headlineMedium: const TextStyle(
           color: Colors.white,
           fontSize: 14,
           fontWeight: FontWeight.bold,
           decoration: TextDecoration.none,
         ),
-        bodyText1: const TextStyle(
+        bodyLarge: const TextStyle(
           color: Colors.white,
           fontSize: 14,
           fontWeight: FontWeight.normal,
           decoration: TextDecoration.none,
         ),
-        bodyText2: TextStyle(
+        bodyMedium: TextStyle(
           color: Colors.white.withOpacity(0.6),
           fontSize: 14,
           fontWeight: FontWeight.normal,
@@ -61,7 +61,7 @@ class AppTheme {
   static ThemeData of(BuildContext context) {
     return data().copyWith(
       primaryTextTheme: TextTheme(
-        headline1: TextStyle(
+        headlineLarge: TextStyle(
           color: Colors.white,
           fontSize: Responsive.getResponsiveValue(
             forLargeScreen: 40,
@@ -71,7 +71,7 @@ class AppTheme {
           fontWeight: FontWeight.bold,
           decoration: TextDecoration.none,
         ),
-        headline2: TextStyle(
+        headlineMedium: TextStyle(
           color: Colors.white,
           fontSize: Responsive.getResponsiveValue(
             forLargeScreen: 30,
@@ -81,7 +81,7 @@ class AppTheme {
           fontWeight: FontWeight.bold,
           decoration: TextDecoration.none,
         ),
-        headline3: TextStyle(
+        headlineSmall: TextStyle(
           color: Colors.white,
           fontSize: Responsive.getResponsiveValue(
             forLargeScreen: 20,
@@ -91,7 +91,7 @@ class AppTheme {
           fontWeight: FontWeight.bold,
           decoration: TextDecoration.none,
         ),
-        bodyText1: TextStyle(
+        bodyLarge: TextStyle(
           color: Colors.white,
           fontSize: Responsive.getResponsiveValue(
             forLargeScreen: 20,
@@ -101,7 +101,7 @@ class AppTheme {
           fontWeight: FontWeight.normal,
           decoration: TextDecoration.none,
         ),
-        bodyText2: TextStyle(
+        bodyMedium: TextStyle(
           color: Colors.white.withOpacity(0.6),
           fontSize: Responsive.getResponsiveValue(
             forLargeScreen: 20,

diff --git a/lib/main.dart b/lib/main.dart
@@ -30,5 +30,5 @@ Future<void> main() async {
     setWindowMinSize(const Size(1024, 768));
   }
 
-  runApp(const ProviderScope(child: SkyleApp()));
+  runApp(GazeContext(sharedPreferences: AppState().sharedPreferences, child: const SkyleApp()));
 }
diff --git a/lib/ui/calibration/calibration_view.dart b/lib/ui/calibration/calibration_view.dart
@@ -69,7 +69,17 @@ class _CalibrationViewState extends ConsumerState<CalibrationView> with SingleTi
 
           return AppState().et.calibration.calibrate(
                 calibrationPoints,
-                screenSizes: skyle.ScreenSizes(resolution: skyle.Size(width: mediaQuery.size.width, height: mediaQuery.size.height)),
+                screenSizes: skyle.ScreenSizes(
+                  resolution: skyle.Size(
+                    width: mediaQuery.size.width,
+                    height: mediaQuery.size.height,
+                  ),
+                  dimensions: const skyle.Size(
+                    width: 1920,
+                    height: 1080,
+                  ),
+                ),
+                stepped: true,
               );
         });
         setState(() {
@@ -134,6 +144,10 @@ class _CalibrationViewState extends ConsumerState<CalibrationView> with SingleTi
       pointerPosition = message.data!.point!.coordinates;
       pointervisible = true;
       print(message.data!.point!.coordinates);
+      SchedulerBinding.instance.addPostFrameCallback((_) async {
+        await Future.delayed(const Duration(milliseconds: 400));
+        AppState().et.calibration.next();
+      });
     }
 
     return Scaffold(