统一安卓和iOS的didPop消息

Author: caven775

example/ios/Runner/AppDelegate.m

@@ -13,7 +13,7 @@ @interface AppDelegate () <DStackDelegate>
 
 @end
 
-static BOOL isFlutterProject = YES;
+static BOOL isFlutterProject = NO;
 
 @implementation AppDelegate
 
@@ -32,9 +32,14 @@ - (BOOL)application:(UIApplication *)application
     } else {
         HomeViewController *home = [[HomeViewController alloc] init];
         UITabBarController *tab = [[UITabBarController alloc] init];
-        DStackViewController *navi = [[DStackViewController alloc] initWithRootViewController:home];
-        navi.tabBarItem.title = @"home";
-        [tab setViewControllers:@[navi]];
+        DStackViewController *navi0 = [[DStackViewController alloc] initWithRootViewController:home];
+        navi0.tabBarItem.title = @"home";
+        
+        DemoFlutterViewController *flutter = [[DemoFlutterViewController alloc] init];
+        DStackViewController *navi1 = [[DStackViewController alloc] initWithRootViewController:flutter];
+        navi1.tabBarItem.title = @"flutter";
+        
+        [tab setViewControllers:@[navi0, navi1]];
         rootVC = tab;
     }
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];

ios/Classes/Node/DActionManager.m

@@ -170,7 +170,7 @@ + (void)closePageListWithNode:(DNode *)node willRemovedList:(nullable NSArray<DN
             [nativeNodes addObject:obj];
         } else if (obj.pageType == DNodePageTypeFlutter) {
             [flutterNodes addObject:obj];
-            if (obj.isFlutterClass) {
+            if (obj.boundary) {
                 boundaryCount += 1;
             }
         }
@@ -234,8 +234,8 @@ + (void)sendMessageToFlutterWithFlutterNodes:(NSArray <DNode *>*)flutterNodes
         [nodeList addObject:wrap(flutterNodes.firstObject)];
     } else {
         for (DNode *x in flutterNodes) {
-            if (!x.isFlutterHomePage) {
-                // homePage 页面不能pop，不然会黑屏
+            // homePage 页面不能pop，不然会黑屏
+            if (!(x.isFlutterHomePage && x.boundary)) {
                 [nodeList addObject:wrap(x)];
             }
         }

ios/Classes/Node/DNode.h

@@ -49,9 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// DFlutterViewController_0x28268d1d0
 @property (nonatomic, copy) NSString *identifier;
 
-/// 是否是flutterVC
-@property (nonatomic, assign) BOOL isFlutterClass;
-
 /// 是否是根页面F
 @property (nonatomic, assign) BOOL isRootPage;
 

ios/Classes/Node/DNodeManager.h

@@ -68,9 +68,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param state 应用的生命周期
 - (void)sendAppliccationLifeCicleToFlutter:(DStackApplicationState)state;
 
-/// 更新根节点信息为flutter的信息
-- (void)updateRootNodeWithFlutter;
-
 @end
 
 NS_ASSUME_NONNULL_END

ios/Classes/Node/DNodeManager.m

@@ -371,16 +371,6 @@ - (void)sendPageLifeCicleToFlutterWithAppearNode:(DNode *)appear
                                          result:nil];
 }
 
-- (void)updateRootNodeWithFlutter
-{
-    DNode *rootNode = self.nodeList.firstObject;
-    if (rootNode && rootNode.isRootPage) {
-        rootNode.isFlutterHomePage = YES;
-        rootNode.pageType = DNodePageTypeFlutter;
-        rootNode.fromFlutter = YES;
-    }
-}
-
 
 #pragma mark -- private
 

ios/Classes/Stack/DStack.m

@@ -303,7 +303,6 @@ - (void)openFlutterPageWithRoute:(NSString *)route
     node.identifier = identifier;
     node.boundary = YES;
     node.animated = animated;
-    node.isFlutterClass = YES;
     [[DNodeManager sharedInstance] checkNode:node];
 }
 
@@ -394,12 +393,6 @@ - (void)sendNodeListToFlutter:(FlutterResult)result
     }
 }
 
-/// 设置根节点为flutter的信息
-- (void)setFlutterRootNode
-{
-    [[DNodeManager sharedInstance] updateRootNodeWithFlutter];
-}
-
 - (FlutterEngine *)engine
 {
     if (!_engine) {

ios/Classes/Stack/DStackPlugin.h

@@ -16,7 +16,6 @@ UIKIT_EXTERN DStackMethodChannelName const DStackMethodChannelSendActionToFlutte
 UIKIT_EXTERN DStackMethodChannelName const DStackMethodChannelSendRemoveFlutterPageNode;  // flutter发送移除节点的指令到native
 UIKIT_EXTERN DStackMethodChannelName const DStackMethodChannelSendLifeCircle; // 生命周期通道
 UIKIT_EXTERN DStackMethodChannelName const DStackMethodChannelSendNodeList; // 节点列表
-UIKIT_EXTERN DStackMethodChannelName const DStackMethodChannelSendFlutterRootNode; // 设置flutter根节点
 
 @interface DStackPlugin : NSObject<FlutterPlugin>
 

ios/Classes/Stack/DStackPlugin.m

@@ -14,7 +14,6 @@
 DStackMethodChannelName const DStackMethodChannelSendRemoveFlutterPageNode = @"sendRemoveFlutterPageNode";
 DStackMethodChannelName const DStackMethodChannelSendLifeCircle = @"sendLifeCycle";
 DStackMethodChannelName const DStackMethodChannelSendNodeList = @"sendNodeList";
-DStackMethodChannelName const DStackMethodChannelSendFlutterRootNode = @"sendFlutterRootNode";
 
 
 @interface DStackPlugin ()
@@ -52,11 +51,6 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
       if ([stack respondsToSelector:@selector(sendNodeListToFlutter:)]) {
           [stack sendNodeListToFlutter:result];
       }
-  } else if ([DStackMethodChannelSendFlutterRootNode isEqualToString:call.method]) {
-      DStack *stack = [DStack sharedInstance];
-      if ([stack respondsToSelector:@selector(setFlutterRootNode)]) {
-          [stack setFlutterRootNode];
-      }
   } else {
       result(FlutterMethodNotImplemented);
   }

ios/Classes/Stack/DStackProvider.h

@@ -73,8 +73,6 @@ typedef NS_ENUM(NSInteger, DStackApplicationState) {
 /// @param result result
 - (void)sendNodeListToFlutter:(FlutterResult)result;
 
-/// 设置根节点为flutter的信息
-- (void)setFlutterRootNode;
 
 @end
 

lib/channel/dchannel.dart

@@ -46,11 +46,6 @@ class DChannel {
     return _methodChannel.invokeMethod(DStackConstant.checkRemoved, arguments);
   }
 
-  /// 设置flutter根节点
-  Future sendFlutterRootNode() async {
-    return _methodChannel.invokeMethod(DStackConstant.sendFlutterRootNode);
-  }
-
   Future<List<DStackNode>> getNodeList() async {
     return _methodChannel
         .invokeMethod(DStackConstant.nodeList, null)

lib/constant/constant_config.dart

@@ -24,7 +24,6 @@ class DStackConstant {
   static const String checkRemoved = "sendRemoveFlutterPageNode";
   static const String lifeCycle = "sendLifeCycle";
   static const String nodeList = "sendNodeList";
-  static const String sendFlutterRootNode = "sendFlutterRootNode";
 
   /// 其他标识
   static const String nativeDidPopGesture = "nativeDidPopGesture";

lib/d_stack.dart

@@ -58,11 +58,6 @@ class DStack {
   bool get hasHomePage => _hasHomePage;
   set homePage(bool page) {
     _hasHomePage = page;
-    if (_hasHomePage) {
-      /// 如果设置了homePage，说明是以flutter为入口的工程
-      /// 根节点设置为flutter页面的信息
-      channel.sendFlutterRootNode();
-    }
   }
 
   final Map<String, DStackWidgetBuilder> _pageBuilders =

lib/navigator/dnavigator_manager.dart

@@ -7,7 +7,6 @@
  * tartget: flutter侧用户调用入口
  */
 
-import 'dart:io';
 import 'dart:ui';
 
 import 'package:d_stack/constant/constant_config.dart';
@@ -258,11 +257,10 @@ class DNavigatorManager {
 
   /// 移除flutter的节点
   static void removeFlutterNode(String target, {String identifier}) {
-    String actionType = (Platform.isAndroid ? 'pop' : 'didPop');
     Map arguments = {
       'target': target,
       'pageType': 'flutter',
-      'actionType': actionType,
+      'actionType': 'didPop',
       'identifier': identifier
     };
     DStack.instance.channel.sendRemoveFlutterPageNode(arguments);