ios 项目结构兼容

caven775 · caven775 · commit 2f9c7ec68339 · 2020-12-07T16:17:51.000+08:00
diff --git a/example/ios/Runner/DStackTestCase.m b/example/ios/Runner/DStackTestCase.m
@@ -22,6 +22,7 @@ - (instancetype)init
                 @"text": @"打开SecondViewController",
                 @"clicked": ^(UIViewController *controller) {
                     SecondViewController *secondVC = [[SecondViewController alloc] init];
+                    secondVC.hidesBottomBarWhenPushed = YES;
                     [controller.navigationController pushViewController:secondVC animated:YES];
                 }
             },
diff --git a/ios/Classes/Node/DActionManager.m b/ios/Classes/Node/DActionManager.m
@@ -59,6 +59,7 @@ + (void)gesture:(DNode *)node willRemovedList:(NSArray<DNode *> *)nodeList
             [self sendMessageToFlutterWithFlutterNodes:nodeList
                                                   node:popNode];
         }
+        [self _checkTabBarWithNode:node popNodeList:nodeList];
     }
 }
 
@@ -74,8 +75,8 @@ + (NSDictionary *)getPageTypeNodeList:(NSArray<DNode *> *)nodeList
 + (void)enterPageWithNode:(DNode *)node
 {
     if (node.fromFlutter) {
-       // 只处理来自Flutter消息通道的Node，并且是打开Native页面
        if (node.pageType == DNodePageTypeNative) {
+           // 处理来自Flutter消息通道的Node，并且是打开Native页面
            // flutter打开naive页面
            DStackNode *stackNode = [self stackNodeFromNode:node];
            if (node.action == DNodeActionTypePush) {
@@ -87,6 +88,10 @@ + (void)enterPageWithNode:(DNode *)node
                    [stack.delegate dStack:stack presentWithNode:stackNode];
                }];
            }
+       } else if (node.pageType == DNodePageTypeFlutter) {
+           // flutter打开flutter页面，检查tabBar是否隐藏
+           [[NSNotificationCenter defaultCenter] postNotificationName:DStackNotificationNameChangeBottomBarVisible
+                                                               object:nil];
        }
     } else {
         // 来自Native的Node，并且是需要打开Flutter页面的，发消息至flutter，打开页面
@@ -152,6 +157,7 @@ + (void)closePageWithNode:(DNode *)node willRemovedList:(nullable NSArray<DNode
     } else if (currentNode.pageType == DNodePageTypeNative) {
         DStackLog(@"当前页面是Native，直接返回上一个页面，不需要处理");
     }
+    [self _checkTabBarWithNode:node popNodeList:nodeList];
 }
 
 /// 关闭一组页面
@@ -185,29 +191,55 @@ + (void)closePageListWithNode:(DNode *)node willRemovedList:(nullable NSArray<DN
         [self sendMessageToFlutterWithFlutterNodes:flutterNodes node:node];
     }
     if (!node.fromFlutter) { return;}
-    
     UINavigationController *navigation = [self currentNavigationControllerWithNode:node];
     if (node.action == DNodeActionTypePopToRoot ||
         node.action == DNodeActionTypePopToNativeRoot) {
         [navigation setValue:@(YES) forKey:@"dStackFlutterNodeMessage"];
         [navigation popToRootViewControllerAnimated:YES];
         [navigation setValue:@(NO) forKey:@"dStackFlutterNodeMessage"];
+        [self _checkTabBarWithNode:node popNodeList:nodeList];
         return;
     }
 
     NSInteger index = navigation.viewControllers.count - boundaryCount - nativeNodes.count - 1;
     index = index < 0 ? 0 : index;
     UIViewController *target = navigation.viewControllers[index];
     if (target) {
-        if (target == navigation.topViewController) {return;}
+        if (target == navigation.topViewController) {
+            [self _checkTabBarWithNode:node popNodeList:nodeList];
+            return;
+        }
         [navigation setValue:@(YES) forKey:@"dStackFlutterNodeMessage"];
         [navigation popToViewController:target animated:NO];
         [navigation setValue:@(NO) forKey:@"dStackFlutterNodeMessage"];
+        [self _checkTabBarWithNode:node popNodeList:nodeList];
     } else {
         DStackError(@"%@", @"没有找到需要关闭的controller");
     }
 }
 
+/// 检查tabBar 的显示状态
+/// @param node node消息
+/// @param nodeList 节点列表
++ (void)_checkTabBarWithNode:(DNode *)node popNodeList:(NSArray <DNode *>*)nodeList
+{
+    DNode *preNode = nil;
+    DNode *target = nodeList.lastObject;
+    if (node.action == DNodeActionTypePopToRoot ||
+        node.action == DNodeActionTypePopToNativeRoot) {
+        target = nodeList.firstObject;
+    }
+    NSInteger index = [[DNodeManager sharedInstance].currentNodeList indexOfObject:target];
+    if (index >= 1) {
+        preNode = [[DNodeManager sharedInstance].currentNodeList objectAtIndex:index - 1];
+    }
+    if (preNode && preNode.isRootPage) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:DStackNotificationNameChangeBottomBarVisible
+                                                            object:nil
+                                                          userInfo:@{@"hidden": @(NO)}];
+    }
+}
+
 /// 发消息至Flutter
 /// @param flutterNodes 需要发送至flutter的节点信息
 /// @param node 目标节点信息
diff --git a/ios/Classes/Stack/DFlutterViewController.m b/ios/Classes/Stack/DFlutterViewController.m
@@ -17,7 +17,7 @@ - (instancetype)init
     if(self = [super initWithEngine:[DStack sharedInstance].engine
                             nibName:nil
                              bundle:nil]) {
-        self.view.backgroundColor = [UIColor whiteColor];
+        [self config];
     }
     return self;
 }
@@ -27,11 +27,17 @@ - (instancetype)initWithCoder:(NSCoder *)coder
     if(self = [super initWithEngine:[DStack sharedInstance].engine
                             nibName:nil
                              bundle:nil]) {
-        self.view.backgroundColor = [UIColor whiteColor];
+        [self config];
     }
     return self;
 }
 
+- (void)config
+{
+    self.view.backgroundColor = [UIColor whiteColor];
+    [self addNotification];
+}
+
 - (void)viewWillAppear:(BOOL)animated
 {
     // 必须在页面显示之前判断engine是否存在FlutterViewController
@@ -70,4 +76,32 @@ - (void)_surfaceUpdated:(BOOL)appeared
     }
 }
 
+- (void)addNotification
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(changeBottomBarVisible:)
+                                                 name:DStackNotificationNameChangeBottomBarVisible
+                                               object:nil];
+}
+
+- (void)changeBottomBarVisible:(NSNotification *)notification
+{
+    NSDictionary *userInfo = notification.userInfo;
+    if (!userInfo) {
+        if (self.tabBarController.tabBar.hidden == NO) {
+            [self.tabBarController.tabBar setHidden:YES];
+        }
+    } else {
+        BOOL hidden = [userInfo[@"hidden"] boolValue];
+        if (self.tabBarController.tabBar.hidden) {
+            [self.tabBarController.tabBar setHidden:hidden];
+        }
+    }
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 @end
diff --git a/ios/Classes/Stack/DNavigator.m b/ios/Classes/Stack/DNavigator.m
@@ -594,7 +594,9 @@ - (void)d_stackPushViewController:(UIViewController *)controller animated:(BOOL)
         }
         
         if ([controller isFlutterViewController]) {
-            controller.hidesBottomBarWhenPushed = YES;
+            if (self.dStackRootViewController != controller && self.viewControllers.count == 1) {
+                controller.hidesBottomBarWhenPushed = YES;
+            }
         }
         
         if (!controller.isFlutterViewController && self.dStackRootViewController != controller) {
diff --git a/ios/Classes/Stack/DStack.h b/ios/Classes/Stack/DStack.h
@@ -289,5 +289,11 @@ applicationState:(DStackApplicationState)state
 
 @end
 
+
+#pragma mark -DStackNotificationName
+
+typedef NSString *DStackNotificationName;
+UIKIT_EXTERN DStackNotificationName const DStackNotificationNameChangeBottomBarVisible; // tabBar显示状态
+
 NS_ASSUME_NONNULL_END
 
diff --git a/ios/Classes/Stack/DStack.m b/ios/Classes/Stack/DStack.m
@@ -543,3 +543,9 @@ static void _dstack_engine_dyld_callback(const struct mach_header * mhp, intptr_
 __attribute__((constructor)) void _dstack_registerDyldCallback() {
     _dyld_register_func_for_add_image(_dstack_engine_dyld_callback);
 }
+
+
+
+#pragma mark -DStackNotificationName
+
+DStackNotificationName const DStackNotificationNameChangeBottomBarVisible = @"__DStackNotificationNameChangeBottomBarVisible";

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ - (instancetype)init`
`22`	`22`	`@"text": @"打开SecondViewController",`
`23`	`23`	`@"clicked": ^(UIViewController *controller) {`
`24`	`24`	`SecondViewController *secondVC = [[SecondViewController alloc] init];`
	`25`	`+ secondVC.hidesBottomBarWhenPushed = YES;`
`25`	`26`	`[controller.navigationController pushViewController:secondVC animated:YES];`
`26`	`27`	`}`
`27`	`28`	`},`
Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,9 @@ - (void)d_stackPushViewController:(UIViewController *)controller animated:(BOOL)`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`if ([controller isFlutterViewController]) {`
`597`		`- controller.hidesBottomBarWhenPushed = YES;`
	`597`	`+ if (self.dStackRootViewController != controller && self.viewControllers.count == 1) {`
	`598`	`+ controller.hidesBottomBarWhenPushed = YES;`
	`599`	`+ }`
`598`	`600`	`}`
`599`	`601`
`600`	`602`	`if (!controller.isFlutterViewController && self.dStackRootViewController != controller) {`