iOS兼容性

Author: caven775

ios/Classes/Stack/DNavigator.m

@@ -219,6 +219,7 @@ - (BOOL)presentationControllerShouldDismiss:(UIPresentationController *)presenta
 {
     NSString *name = presentationController.oldDismissDelegateName;
     UIViewController *presented = presentationController.presentedViewController;
+    presented.isGesturePoped = YES;
     if ([presented isKindOfClass:UINavigationController.class]) {
         presented = [(UINavigationController *)presented topViewController];
     }
@@ -238,22 +239,7 @@ - (void)presentationControllerWillDismiss:(UIPresentationController *)presentati
     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 willAppearViewController:presented.presentingViewController];
     [self checkSelectorToDelegate:@selector(presentationControllerWillDismiss:)
                        controller:presentationController
                           forward:^(id<UIAdaptivePresentationControllerDelegate> delegate) {
@@ -269,16 +255,7 @@ - (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];
-        }
-    }
+    [self didAppearViewControllerWithGestureDismiss:YES];
     checkNode(target, DNodeActionTypeGesture);
     [self checkSelectorToDelegate:@selector(presentationControllerDidDismiss:)
                        controller:presentationController
@@ -337,6 +314,38 @@ - (BOOL)gestureRecognizerShouldBeginWithNavigationController:(UINavigationContro
     return shouldBegin;
 }
 
+- (void)willAppearViewController:(UIViewController *)willAppear
+{
+    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];
+        }
+    }
+}
+
+- (void)didAppearViewControllerWithGestureDismiss:(BOOL)gesture
+{
+    DNodeManager *manager = [DNodeManager sharedInstance];
+    DNode *didAppearNode = gesture ? [manager preNode] : [manager currentNode];
+    if (didAppearNode.pageType == DNodePageTypeFlutter) {
+        DStack *stack = [DStack sharedInstance];
+        if (stack.engine.viewController) {
+            DFlutterViewController *flutterVC = (DFlutterViewController *)stack.engine.viewController;
+            [flutterVC didUpdateView];
+        }
+    }
+}
+
 - (NSMutableDictionary<NSString *,id> *)dismissDelegateClass
 {
     if (!_dismissDelegateClass) {
@@ -447,6 +456,7 @@ - (void)d_stackDismissViewControllerAnimated:(BOOL)flag completion:(void (^)(voi
             UIViewController *dismiss = _DStackCurrentController(self);
             if (!dismiss.isGesturePoped) {
                 // 不是手势触发的dismiss
+                [[DStackNavigator instance] willAppearViewController:dismiss.presentingViewController];
                 checkNode(dismiss, DNodeActionTypeDismiss);
             }
         }
@@ -473,6 +483,9 @@ - (void)d_stackViewDidDisappear:(BOOL)animated
     if (![self isFlutterViewController]) {
         [self removeGesturePopNode];
     }
+    if (self.beingDismissed && !self.isGesturePoped) {
+        [[DStackNavigator instance] didAppearViewControllerWithGestureDismiss:NO];
+    }
 }
 
 - (void)setIsGesturePoped:(BOOL)isGesturePoped