解决iOS字dismiss手势返回时flutterEngine被暂停的问题

caven775 · caven775 · commit da32b26f612f · 2020-12-09T17:03:07.000+08:00
diff --git a/example/ios/Runner/AppDelegate.m b/example/ios/Runner/AppDelegate.m
@@ -84,7 +84,7 @@ - (void)dStack:(nonnull DStack *)stack presentWithNode:(nonnull DStackNode *)nod
     UINavigationController *navi = [self dStack:stack navigationControllerForNode:node];
     if ([node.route isEqualToString:@"NativePage2"]) {
         didPushController = [[FourViewController alloc] init];
-        [navi.topViewController presentViewController:didPushController animated:node.animated completion:nil];
+        [[self currentController] presentViewController:didPushController animated:node.animated completion:nil];
     }
 }
 //navi = 0x000000016d5720b0
diff --git a/example/ios/Runner/DStackTestCase.m b/example/ios/Runner/DStackTestCase.m
@@ -10,6 +10,7 @@
 #import "SecondViewController.h"
 #import "FiveViewController.h"
 #import "DStackViewController.h"
+#import "DemoFlutterViewController.h"
 
 @implementation DStackTestCase
 {
@@ -42,14 +43,14 @@ - (void)initData
         @{
             @"text": @"打开Flutter page4",
             @"clicked": ^(UIViewController *controller) {
-                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DFlutterViewController.class
+                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DemoFlutterViewController.class
                                                                    route:@"page4"];
             }
         },
         @{
             @"text": @"打开Flutter page1 有参数",
             @"clicked": ^(UIViewController *controller) {
-                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DFlutterViewController.class
+                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DemoFlutterViewController.class
                                                                    route:@"page1"
                                                                   params:@{@"fromNative": @"来自原生"}];
             }
@@ -66,7 +67,7 @@ - (void)initData
         @{
             @"text": @"打开Flutter page5",
             @"clicked": ^(UIViewController *controller) {
-                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DFlutterViewController.class
+                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DemoFlutterViewController.class
                                                                    route:@"page5"];
             }
         },
@@ -92,7 +93,7 @@ - (void)initData
         @{
             @"text": @"打开Flutter page6",
             @"clicked": ^(UIViewController *controller) {
-                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DFlutterViewController.class
+                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DemoFlutterViewController.class
                                                                    route:@"page6"];
             }
         },
@@ -137,13 +138,17 @@ - (void)initData
         @{
             @"text": @"返回",
             @"clicked": ^(UIViewController *controller) {
-                [controller dismissViewControllerAnimated:YES completion:nil];
+                if (controller.navigationController.viewControllers.count > 1) {
+                    [controller.navigationController popViewControllerAnimated:YES];
+                } else {
+                    [controller dismissViewControllerAnimated:YES completion:nil];
+                }
             }
         },
         @{
             @"text": @"打开Flutter page6",
             @"clicked": ^(UIViewController *controller) {
-                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DFlutterViewController.class
+                [[DStack sharedInstance] pushFlutterPageWithFlutterClass:DemoFlutterViewController.class
                                                                    route:@"page6"];
             }
         },
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -24,6 +24,18 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    print("didChangeAppLifecycleState ==== $state");
   }
 
   @override
diff --git a/ios/Classes/Stack/DFlutterViewController.h b/ios/Classes/Stack/DFlutterViewController.h
@@ -13,6 +13,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// 当需要打开一个Flutter页面时，必须是DFlutterViewController或者是它的子类
 @interface DFlutterViewController : FlutterViewController
 
+- (void)willUpdateView;
+- (void)didUpdateView;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ios/Classes/Stack/DFlutterViewController.m b/ios/Classes/Stack/DFlutterViewController.m
@@ -14,7 +14,10 @@ @implementation DFlutterViewController
 
 - (instancetype)init
 {
-    if(self = [super initWithEngine:[DStack sharedInstance].engine
+    if (self.dStackFlutterEngine.viewController) {
+        self.dStackFlutterEngine.viewController = nil;
+    }
+    if(self = [super initWithEngine:self.dStackFlutterEngine
                             nibName:nil
                              bundle:nil]) {
         [self config];
@@ -24,7 +27,10 @@ - (instancetype)init
 
 - (instancetype)initWithCoder:(NSCoder *)coder
 {
-    if(self = [super initWithEngine:[DStack sharedInstance].engine
+    if (self.dStackFlutterEngine.viewController) {
+        self.dStackFlutterEngine.viewController = nil;
+    }
+    if(self = [super initWithEngine:self.dStackFlutterEngine
                             nibName:nil
                              bundle:nil]) {
         [self config];
@@ -42,8 +48,9 @@ - (void)viewWillAppear:(BOOL)animated
 {
     // 必须在页面显示之前判断engine是否存在FlutterViewController
     // 否则会因为FlutterViewController不存在而崩溃
-    if ([DStack sharedInstance].engine.viewController != self) {
-        [DStack sharedInstance].engine.viewController = self;
+    if (self.dStackFlutterEngine.viewController != self) {
+        self.dStackFlutterEngine.viewController = nil;
+        self.dStackFlutterEngine.viewController = self;
     }
     [super viewWillAppear:animated];
 }
@@ -61,6 +68,26 @@ - (void)viewDidDisappear:(BOOL)animated
     [super viewDidDisappear:animated];
 }
 
+/// dismiss手势不会触发页面的viewWillAppear
+/// viewDidDisappear里面，flutter会让Engine暂停，不会渲染flutter页面
+/// 在dismiss的某些情况下，主动调用viewWillAppear，使Engine进入inactive状态
+- (void)willUpdateView
+{
+    [self viewWillAppear:YES];
+}
+
+/// dismiss手势不会触发页面的viewDidAppear
+/// viewDidDisappear里面，flutter会让Engine暂停，不会渲染flutter页面
+/// 在dismiss的某些情况下，主动调用viewDidAppear，使Engine进入resumed状态
+- (void)didUpdateView
+{
+    [self viewDidAppear:YES];
+    /// 调用这个是为了重新计算页面的布局
+    /// 因为在非全屏present页面时，该页面是没有状态栏的
+    /// 所以在dismiss的时候，需要重新展示状态栏，就需要刷新flutter的页面
+    [super viewDidLayoutSubviews];
+}
+
 - (void)_surfaceUpdated:(BOOL)appeared
 {
     SEL sel = NSSelectorFromString(@"surfaceUpdated:");
@@ -99,6 +126,11 @@ - (void)changeBottomBarVisible:(NSNotification *)notification
     }
 }
 
+- (FlutterEngine *)dStackFlutterEngine
+{
+    return [DStack sharedInstance].engine;
+}
+
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
diff --git a/ios/Classes/Stack/DNavigator.m b/ios/Classes/Stack/DNavigator.m
@@ -9,6 +9,8 @@
 #import "DNavigator.h"
 #import "DNodeManager.h"
 #import "DActionManager.h"
+#import "DStack.h"
+#import "DFlutterViewController.h"
 
 typedef void (^_DStackViewControllerWillAppearInjectBlock)(UIViewController *viewController, BOOL animated);
 
@@ -232,6 +234,26 @@ - (BOOL)presentationControllerShouldDismiss:(UIPresentationController *)presenta
 
 - (void)presentationControllerWillDismiss:(UIPresentationController *)presentationController API_AVAILABLE(ios(13.0))
 {
+    UIViewController *presented = presentationController.presentedViewController;
+    if ([presented isKindOfClass:UINavigationController.class]) {
+        presented = [(UINavigationController *)presented topViewController];
+    }
+    UIViewController *willAppear = presented.presentingViewController;
+    if ([willAppear isKindOfClass:UITabBarController.class]) {
+        willAppear = [(UITabBarController *)willAppear selectedViewController];
+        if ([willAppear isKindOfClass:UINavigationController.class]) {
+            willAppear = [(UINavigationController *)willAppear topViewController];
+        }
+    } else if ([willAppear isKindOfClass:UINavigationController.class]) {
+        willAppear = [(UINavigationController *)willAppear topViewController];
+    }
+    if ([willAppear isKindOfClass:DFlutterViewController.class]) {
+        DStack *stack = [DStack sharedInstance];
+        if (!stack.engine.viewController) {
+            DFlutterViewController *flutterVC = (DFlutterViewController *)willAppear;
+            [flutterVC willUpdateView];
+        }
+    }
     [self checkSelectorToDelegate:@selector(presentationControllerWillDismiss:)
                        controller:presentationController
                           forward:^(id<UIAdaptivePresentationControllerDelegate> delegate) {
@@ -247,6 +269,16 @@ - (void)presentationControllerDidDismiss:(UIPresentationController *)presentatio
         target = [[(UINavigationController *)presented viewControllers] firstObject];
         checkNode(target, DNodeActionTypePopTo);
     }
+    
+    DNodeManager *manager = [DNodeManager sharedInstance];
+    DNode *didAppearNode = [manager preNode];
+    if (didAppearNode.pageType == DNodePageTypeFlutter) {
+        DStack *stack = [DStack sharedInstance];
+        if (stack.engine.viewController) {
+            DFlutterViewController *flutterVC = (DFlutterViewController *)stack.engine.viewController;
+            [flutterVC didUpdateView];
+        }
+    }
     checkNode(target, DNodeActionTypeGesture);
     [self checkSelectorToDelegate:@selector(presentationControllerDidDismiss:)
                        controller:presentationController

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ - (void)dStack:(nonnull DStack )stack presentWithNode:(nonnull DStackNode )nod`
`84`	`84`	`UINavigationController *navi = [self dStack:stack navigationControllerForNode:node];`
`85`	`85`	`if ([node.route isEqualToString:@"NativePage2"]) {`
`86`	`86`	`didPushController = [[FourViewController alloc] init];`
`87`		`- [navi.topViewController presentViewController:didPushController animated:node.animated completion:nil];`
	`87`	`+ [[self currentController] presentViewController:didPushController animated:node.animated completion:nil];`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`//navi = 0x000000016d5720b0`