add other controller

CarGuo · CarGuo · commit c4359dc2fda8 · 2019-06-03T10:36:18.000+08:00
diff --git a/lib/widget/pull/gsy_flare_mutli_pull_controller.dart b/lib/widget/pull/gsy_flare_mutli_pull_controller.dart
@@ -0,0 +1,67 @@
+import 'package:flare_dart/math/mat2d.dart';
+import 'package:flare_flutter/flare.dart';
+import 'package:flare_flutter/flare_controller.dart';
+
+mixin GSYFlarePullMutliController implements FlareController {
+
+  ActorAnimation _loadingAnimation;
+  ActorAnimation _successAnimation;
+  ActorAnimation _pullAnimation;
+  ActorAnimation _cometAnimation;
+
+  double pulledExtentFlare = 0;
+  bool _isSurround = false;
+
+
+  double _refreshTriggerPullDistance = 140;
+
+  double _successTime = 0.0;
+  double _loadingTime = 0.0;
+  double _cometTime = 0.0;
+
+  @override
+  void initialize(FlutterActorArtboard artboard) {
+    _pullAnimation = artboard.getAnimation("pull");
+    _successAnimation = artboard.getAnimation("success");
+    _loadingAnimation = artboard.getAnimation("loading");
+    _cometAnimation = artboard.getAnimation("idle comet");
+  }
+
+  @override
+  void setViewTransform(Mat2D viewTransform) {}
+
+  @override
+  bool advance(FlutterActorArtboard artboard, double elapsed) {
+    double animationPosition = pulledExtentFlare / _refreshTriggerPullDistance;
+    animationPosition *= animationPosition;
+    _cometTime += elapsed;
+    _cometAnimation.apply(_cometTime % _cometAnimation.duration, artboard, 1.0);
+    _pullAnimation.apply(
+        _pullAnimation.duration * animationPosition, artboard, 1.0);
+    if (_isSurround) {
+      _successTime += elapsed;
+      if (_successTime >= _successAnimation.duration) {
+        _loadingTime += elapsed;
+      }
+    } else {
+      _successTime = _loadingTime = 0.0;
+    }
+    if (_successTime >= _successAnimation.duration) {
+      _loadingAnimation.apply(
+          _loadingTime % _loadingAnimation.duration, artboard, 1.0);
+    } else if (_successTime > 0.0) {
+      _successAnimation.apply(_successTime, artboard, 1.0);
+    }
+    return true;
+  }
+
+  void onRefreshing() {
+    _isSurround = true;
+  }
+
+  void onRefreshEnd() {
+    _isSurround = false;
+  }
+
+  bool get getPlayAuto;
+}
diff --git a/lib/widget/pull/gsy_pull_new_load_widget.dart b/lib/widget/pull/gsy_pull_new_load_widget.dart
@@ -7,6 +7,7 @@ import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
 import 'dart:math';
 
 import 'custom_bouncing_scroll_physics.dart';
+import 'gsy_flare_mutli_pull_controller.dart';
 import 'gsy_flare_pull_controller.dart';
 
 const double iosRefreshHeight = 140;
@@ -43,6 +44,7 @@ class GSYPullLoadWidget extends StatefulWidget {
 
 class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget>
     with GSYFlarePullController {
+    //with GSYFlarePullMutliController {
   ScrollController _scrollController;
 
   bool isRefreshing = false;
@@ -307,6 +309,11 @@ class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget>
   ) {
     pulledExtentFlare = pulledExtent * 0.6;
     playAuto = refreshState == IOS.RefreshIndicatorMode.refresh;
+    /*if(refreshState == IOS.RefreshIndicatorMode.refresh) {
+      onRefreshing();
+    } else {
+      onRefreshEnd();
+    }*/
     return Align(
       alignment: Alignment.bottomCenter,
       child: new Container(
@@ -316,11 +323,15 @@ class _GSYPullLoadWidgetState extends State<GSYPullLoadWidget>
         ///动态大小处理
         height:
             pulledExtent > iosRefreshHeight ? pulledExtent : iosRefreshHeight,
-        child: FlareActor("static/file/loading_world_now.flr",
+        child: FlareActor(
+            //"static/file/Space-Demo.flr",
+            "static/file/loading_world_now.flr",
             alignment: Alignment.topCenter,
             fit: BoxFit.cover,
             controller: this,
-            animation: "Earth Moving"),
+            animation: "Earth Moving"
+            //animation: "idle"
+        ),
       ),
     );
   }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -103,6 +103,7 @@ flutter:
     - static/file/rejection2.json
     - static/file/flare_flutter_logo_.flr
     - static/file/loading_world_now.flr
+    - static/file/Space-Demo.flr
 
   fonts:
     - family: wxcIconFont
diff --git a/static/file/Space-Demo.flr b/static/file/Space-Demo.flr
