refactor: remove stream_transform package

Author: AmosHuKe

CHANGELOG.md

@@ -3,6 +3,12 @@
 > [!IMPORTANT]  
 > See the [Migration Guides](https://amoshuke.github.io/flutter_tilt_book/en/docs/migration-guides/) for the details of breaking changes between versions.
 
+## 3.3.3 (Unreleased)
+
+**Improvements**
+
+- Remove stream_transform package.
+
 ## 3.3.2
 
 **Improvements**

example/pubspec.yaml

@@ -36,7 +36,7 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.8
+  cupertino_icons: ^1.0.9
 
 dev_dependencies:
   flutter_test:

lib/src/internal/controllers/tilt_gestures_controller.dart

@@ -3,7 +3,6 @@ import 'package:flutter/services.dart' show DeviceOrientation;
 import 'package:flutter/widgets.dart';
 
 import 'package:sensors_plus/sensors_plus.dart';
-import 'package:stream_transform/stream_transform.dart';
 
 import '../../config/tilt_config.dart';
 import '../../enums.dart';
@@ -56,6 +55,15 @@ class TiltGesturesController {
   /// 手势协调器
   async.Timer? _gesturesHarmonizerTimer;
 
+  /// 陀螺仪采样定时器
+  async.Timer? _gyroscopeSamplingTimer;
+
+  /// 是否已完成传感器订阅初始化
+  bool _sensorsInitialized = false;
+
+  /// 最近一帧可用于补帧/限流的陀螺仪数据
+  TiltStreamModel? _pendingGyroscopeTiltStreamModel;
+
   /// 是否开启 TiltStream
   bool get enableTiltStream => !disable;
 
@@ -65,6 +73,7 @@ class TiltGesturesController {
 
   void dispose() {
     cancelGesturesHarmonizerTimer();
+    cancelGyroscopeSamplingTimer();
     cancelAllSubscriptions();
   }
 
@@ -74,12 +83,20 @@ class TiltGesturesController {
     _gesturesHarmonizerTimer = null;
   }
 
+  /// 取消陀螺仪采样定时器（补帧/限流）
+  void cancelGyroscopeSamplingTimer() {
+    _gyroscopeSamplingTimer?.cancel();
+    _gyroscopeSamplingTimer = null;
+    _pendingGyroscopeTiltStreamModel = null;
+  }
+
   /// 取消所有订阅
   void cancelAllSubscriptions() {
     for (final sub in streamSubscriptions) {
       sub.cancel();
     }
     streamSubscriptions.clear();
+    _sensorsInitialized = false;
   }
 
   /// 过滤 TiltStream
@@ -197,11 +214,14 @@ class TiltGesturesController {
   /// 初始化传感器
   void initSensors(BuildContext context) {
     if (!_canSensorsPlatformSupport ||
+        _sensorsInitialized ||
         !enableTiltStream ||
         !tiltConfig.enableGestureSensors) {
       return;
     }
 
+    _sensorsInitialized = true;
+
     /// 订阅设备方向事件
     subscribeToDeviceOrientation(context);
 
@@ -211,32 +231,46 @@ class TiltGesturesController {
 
   /// 订阅陀螺仪倾斜事件
   void subscribeToGyroscopeTilt() {
+    final frameDuration = Duration(milliseconds: (1000 / fps) ~/ 1);
+
     streamSubscriptions.add(
-      gyroscopeEventStream()
-          .map<TiltStreamModel>(
-            (GyroscopeEvent gyroscopeEvent) => TiltStreamModel(
-              position: Offset(gyroscopeEvent.y, gyroscopeEvent.x),
-              gesturesType: GesturesType.sensors,
-              gestureUse: true,
-            ),
-          )
-          .combineLatest(
-            Stream<void>.periodic(Duration(milliseconds: (1000 / fps) ~/ 1)),
-            (p0, _) => p0,
-          )
-          .throttle(Duration(milliseconds: (1000 / fps) ~/ 1), trailing: true)
-          .listen(
-        (TiltStreamModel tiltStreamModel) {
-          if (tiltStreamController.hasListener) {
-            tiltStreamController.sink.add(tiltStreamModel);
-          }
+      gyroscopeEventStream().listen(
+        (GyroscopeEvent gyroscopeEvent) {
+          _pendingGyroscopeTiltStreamModel = TiltStreamModel(
+            position: Offset(gyroscopeEvent.y, gyroscopeEvent.x),
+            gesturesType: GesturesType.sensors,
+            gestureUse: true,
+          );
+
+          /// 如果陀螺仪存在数据，则开启陀螺仪采样定时器（补帧/限流）
+          _gyroscopeSamplingTimer ??= async.Timer.periodic(
+            frameDuration,
+            (_) => _pushLatestGyroscopeTiltStreamModel(),
+          );
+        },
+        onError: (_) {
+          _canSensorsPlatformSupport = false;
+          cancelGyroscopeSamplingTimer();
         },
-        onError: (_) => _canSensorsPlatformSupport = false,
         cancelOnError: true,
       ),
     );
   }
 
+  /// 按帧推送当前缓存的最新陀螺仪值，用于补帧和限流
+  void _pushLatestGyroscopeTiltStreamModel() {
+    if (!tiltStreamController.hasListener) {
+      cancelGyroscopeSamplingTimer();
+      return;
+    }
+
+    final tiltStreamModel = _pendingGyroscopeTiltStreamModel;
+
+    if (tiltStreamModel != null) {
+      tiltStreamController.sink.add(tiltStreamModel);
+    }
+  }
+
   /// 订阅设备方向事件
   void subscribeToDeviceOrientation(BuildContext context) {
     streamSubscriptions.add(

lib/src/widgets/tilt_stream_builder.dart

@@ -40,6 +40,15 @@ class _TiltStreamBuilderState extends State<TiltStreamBuilder> {
     super.dispose();
   }
 
+  @override
+  void didUpdateWidget(TiltStreamBuilder oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.tiltGesturesController != widget.tiltGesturesController) {
+      oldWidget.tiltGesturesController.dispose();
+      widget.tiltGesturesController.initSensors(context);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<TiltStreamModel>(

pubspec.yaml

@@ -8,7 +8,7 @@ description: Easily apply tilt parallax hover effects for Flutter, which support
 # https://semver.org/spec/v2.0.0-rc.1.html
 # https://dart.dev/tools/pub/versioning#semantic-versions
 # https://dart.dev/tools/pub/dependencies#version-constraints
-version: 3.3.2
+version: 3.3.3
 homepage: https://amoshuke.github.io/flutter_tilt_book
 repository: https://github.com/fluttercandies/flutter_tilt
 issue_tracker: https://github.com/fluttercandies/flutter_tilt/issues
@@ -27,7 +27,6 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  stream_transform: ^2.1.0
   sensors_plus: '>=6.1.0 <8.0.0'
 
 dev_dependencies:

test/internal/controllers/tilt_gestures_controller_test.dart

@@ -21,6 +21,7 @@ void main() {
     late TiltGesturesController controller;
     late TiltConfig tiltConfig;
     late Offset initialPosition;
+    late int frameDurationMs;
 
     setUp(() {
       tiltStreamController = StreamController<TiltStreamModel>.broadcast();
@@ -37,6 +38,7 @@ void main() {
         tiltConfig: tiltConfig,
         initialPosition: initialPosition,
       );
+      frameDurationMs = (1000 / controller.fps) ~/ 1;
     });
 
     tearDown(() {
@@ -55,6 +57,9 @@ void main() {
     testWidgets('Sensors stream subscriptions', (WidgetTester tester) async {
       var currentGesturesType = GesturesType.none;
       var currentPosition = Offset.zero;
+      var sensorFrameCount = 0;
+      var replayedFrameCount = 0;
+      late StreamSubscription<TiltStreamModel> firstSubscription;
 
       debugDefaultTargetPlatformOverride = TargetPlatform.android;
 
@@ -81,28 +86,49 @@ void main() {
 
       await tester.runAsync(
         () async {
+          firstSubscription = tiltStreamController.stream.listen(
+            (TiltStreamModel tiltStreamModel) {
+              currentPosition = tiltStreamModel.position;
+              currentGesturesType = tiltStreamModel.gesturesType;
+              if (tiltStreamModel.gesturesType == GesturesType.sensors) {
+                sensorFrameCount++;
+              }
+            },
+          );
+
           await tester.pumpWidget(
             Builder(
               builder: (BuildContext context) {
-                /// 监听数据
-                tiltStreamController.stream.listen(
-                  (TiltStreamModel tiltStreamModel) {
-                    currentPosition = tiltStreamModel.position;
-                    currentGesturesType = tiltStreamModel.gesturesType;
-                  },
-                );
-
                 /// 初始化传感器
                 controller.initSensors(context);
                 return const SizedBox();
               },
             ),
           );
 
-          /// 延迟 1 帧，等待数据
+          /// 延迟 3 帧，等待数据 sensorFrameCount 累加到 3
           await Future.delayed(
-            Duration(milliseconds: (1000 / controller.fps) ~/ 1),
+            Duration(milliseconds: frameDurationMs * 3),
           );
+
+          /// 取消订阅后，等待 2 帧，确保没有更多数据到达
+          await firstSubscription.cancel();
+          await Future.delayed(
+            Duration(milliseconds: frameDurationMs * 2),
+          );
+
+          /// 由于没有更多陀螺仪数据到达，replayedFrameCount 应该保持为 0
+          final replaySubscription = tiltStreamController.stream.listen(
+            (TiltStreamModel tiltStreamModel) {
+              if (tiltStreamModel.gesturesType == GesturesType.sensors) {
+                replayedFrameCount++;
+              }
+            },
+          );
+          await Future.delayed(
+            Duration(milliseconds: frameDurationMs * 2),
+          );
+          await replaySubscription.cancel();
         },
       );
 
@@ -111,6 +137,8 @@ void main() {
         currentPosition,
         Offset(gyroscopeSensorData.last[1], gyroscopeSensorData.last[0]),
       );
+      expect(sensorFrameCount, 3);
+      expect(replayedFrameCount, 0);
       expect(controller.streamSubscriptions.length, 2);
 
       /// 取消订阅
@@ -120,6 +148,42 @@ void main() {
       debugDefaultTargetPlatformOverride = null;
     });
 
+    testWidgets('initSensors only subscribes once',
+        (WidgetTester tester) async {
+      debugDefaultTargetPlatformOverride = TargetPlatform.android;
+
+      SensorsMock.initMockSensorsMethodChannel([
+        SensorsMock.accelerometerMethodName,
+        SensorsMock.gyroscopeMethodName,
+      ]);
+      final date = DateTime.now();
+      SensorsMock.initMockSensorChannelData(
+        SensorsMock.accelerometerChannelName,
+        <List<double>>[
+          [1.0, 2.0, 3.0, date.microsecondsSinceEpoch.toDouble()],
+        ],
+      );
+      SensorsMock.initMockSensorChannelData(
+        SensorsMock.gyroscopeChannelName,
+        <List<double>>[
+          [3.0, 4.0, 5.0, date.microsecondsSinceEpoch.toDouble()],
+        ],
+      );
+
+      await tester.pumpWidget(
+        Builder(
+          builder: (BuildContext context) {
+            controller.initSensors(context);
+            controller.initSensors(context);
+            return const SizedBox();
+          },
+        ),
+      );
+
+      expect(controller.streamSubscriptions.length, 2);
+      debugDefaultTargetPlatformOverride = null;
+    });
+
     test('Tilt stream updates (sensors)', () async {
       const deviceOrientationList = DeviceOrientation.values;
       const testModel = TiltStreamModel(