Merge branch 'flutter_1.5_upgrade_opt' of...

Merge branch 'flutter_1.5_upgrade_opt' of https://github.com/alibaba/flutter_boost into flutter_1.5_upgrade_opt

ios/Classes/Boost/FlutterBoost.h

@@ -29,7 +29,6 @@
 #import "FLBFlutterAppDelegate.h"
 #import "FLBFlutterViewContainer.h"
 #import "FLBPlatform.h"
-
 #import "FLB2FlutterViewContainer.h"
 #import "FLB2Platform.h"
 

ios/Classes/Boost/FlutterBoostPlugin.m

@@ -59,8 +59,6 @@
                                                     completion:^(BOOL r){
                                                         result(@(r));
                                                     }];
-    }else if([@"onFlutterPageResult" isEqualToString:call.method]){
-        //Do nothing
     }else if([@"onShownContainerChanged" isEqualToString:call.method]){
         NSString *newName = call.arguments[@"newName"];
         if(newName){
@@ -120,15 +118,14 @@
 {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        
         if([platform respondsToSelector:@selector(useBoost2)] && platform.useBoost2){
             _factory = FLB2Factory.new;
         }else{
             _factory = FLBFactory.new;
         }
-        
         _application = [_factory createApplication:platform];
-        [_application startFlutterWithPlatform:platform onStart:callback];
+        [_application startFlutterWithPlatform:platform
+                                       onStart:callback];
     });
 }
 

ios/Classes/Messaging/BoostMessageChannel.mm

@@ -26,8 +26,8 @@
 #import "BoostMessageChannel.h"
 #import "FlutterBoostPlugin_private.h"
 
- 
- @implementation BoostMessageChannel
+
+@implementation BoostMessageChannel
 
 + (NSMutableDictionary *)lists{
     static NSMutableDictionary *_list = nil;
@@ -87,8 +87,6 @@
     }
 }
 
-
-
  + (void)onNativePageResult:(void (^)(NSNumber *))result uniqueId:(NSString *)uniqueId key:(NSString *)key resultData:(NSDictionary *)resultData params:(NSDictionary *)params
  {
      NSMutableDictionary *tmp = [NSMutableDictionary dictionary];

lib/flutter_boost.dart

@@ -109,7 +109,7 @@ class FlutterBoost {
     ContainerCoordinator.singleton.registerPageBuilders(builders);
   }
 
-  Future<Map<dynamic,dynamic>> open(String url,{Map<String,dynamic> urlParams,Map<String,dynamic> exts}){
+  Future<Map<dynamic,dynamic>> open(String url,{Map<dynamic,dynamic> urlParams,Map<dynamic,dynamic> exts}){
 
     Map<String, dynamic> properties = new Map<String, dynamic>();
     properties["url"] = url;
@@ -119,7 +119,7 @@ class FlutterBoost {
         'openPage', properties);
   }
 
-  Future<bool> close(String id,{Map<String,dynamic> result,Map<String,dynamic> exts}){
+  Future<bool> close(String id,{Map<dynamic,dynamic> result,Map<dynamic,dynamic> exts}){
 
     assert(id != null);
 
@@ -134,12 +134,12 @@ class FlutterBoost {
     return channel.invokeMethod<bool>('closePage', properties);
   }
 
-  Future<bool> closeCurrent({Map<String,dynamic> result,Map<String,dynamic> exts}) {
+  Future<bool> closeCurrent({Map<dynamic,dynamic> result,Map<dynamic,dynamic> exts}) {
     String id = containerManager?.onstageSettings?.uniqueId;
     return close(id,result: result,exts: exts);
   }
 
-  Future<bool> closeByContext(BuildContext context,{Map<String,dynamic> result,Map<String,dynamic> exts}) {
+  Future<bool> closeByContext(BuildContext context,{Map<dynamic,dynamic> result,Map<dynamic,dynamic> exts}) {
     String id = BoostContainer.of(context)?.settings?.uniqueId;
     return close(id,result: result,exts: exts);
   }

lib/messaging/boost_message_channel.dart

+/*
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2019 Alibaba Group
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+import 'dart:async';
+import 'package:flutter/services.dart';
+
+typedef Future<dynamic> EventListener(String name , Map arguments);
+
+class BoostMessageChannel {
+
+  static MethodChannel methodChannel;
+
+  static Map<String,List<EventListener>> _lists = Map();
+
+  static void sendEvent(String name , Map arguments){
+
+    if(name == null) {
+      return;
+    }
+
+    if(arguments == null){
+      arguments = Map();
+    }
+
+    Map msg = Map();
+    msg["name"] = name;
+    msg["arguments"] = arguments;
+    methodChannel.invokeMethod("__event__",msg);
+  }
+
+  static Function addEventListener(String name , EventListener listener){
+    if(name == null || listener == null){
+      return (){};
+    }
+
+    List<EventListener> list = _lists[name];
+    if(list == null){
+      list = List();
+      _lists[name] = list;
+    }
+
+    list.add(listener);
+
+    return (){
+      list.remove(listener);
+    };
+  }
+
+  static Future<dynamic> handleEventCall(MethodCall call){
+    if(call.method != "__event__"){
+      return Future<dynamic>((){});
+    }
+
+    String name = call.arguments["name"];
+    Map arg = call.arguments["arguments"];
+    List<EventListener> list = _lists[name];
+    if(list != null){
+      for(EventListener l in list){
+        l(name,arg);
+      }
+    }
+
+    return Future<dynamic>((){});
+  }
+
+
+
+ static Future<bool> onShownContainerChanged(String newName,String oldName,Map params) {
+     Map<String,dynamic> properties = new Map<String,dynamic>();
+     properties["newName"]=newName;
+     properties["oldName"]=oldName;
+     properties["params"]=params;
+   return methodChannel.invokeMethod('onShownContainerChanged',properties).then<bool>((value){
+       return (value);
+     });
+ }
+ static Future<bool> onFlutterPageResult(String uniqueId,String key,Map resultData,Map params) {
+     Map<String,dynamic> properties = new Map<String,dynamic>();
+     properties["uniqueId"]=uniqueId;
+     properties["key"]=key;
+     properties["resultData"]=resultData;
+     properties["params"]=params;
+   return methodChannel.invokeMethod('onFlutterPageResult',properties).then<bool>((value){
+       return (value);
+     });
+ }
+ static Future<Map> pageOnStart(Map params) async {
+   Map<String,dynamic> properties = new Map<String,dynamic>();
+   properties["params"]=params;
+   try {
+     return await methodChannel.invokeMethod('pageOnStart',properties).then<Map>((value){
+       return value as Map;
+     });
+   } catch (e) {
+     print('Page on start exception');
+     return Future<Map>((){});
+ }
+ }
+
+ static Future<Map<dynamic,dynamic>> openPage(String url,Map urlParams, Map exts) {
+     Map<String,dynamic> properties = new Map<String,dynamic>();
+     properties["url"]=url;
+     properties["urlParams"]=urlParams;
+     properties["exts"]=exts;
+   return methodChannel.invokeMethod('openPage',properties).then<Map<dynamic,dynamic>>((value){
+       return (value);
+     });
+ }
+
+ static Future<bool> closePage(String uniqueId,{Map<dynamic,dynamic> result,Map<dynamic,dynamic> exts}) {
+     Map<String,dynamic> properties = new Map<String,dynamic>();
+     properties["uniqueId"]=uniqueId;
+     if(result != null){
+       properties["result"]=result;
+     }
+     if(exts != null) {
+       properties["exts"] = exts;
+     }
+     return methodChannel.invokeMethod('closePage',properties).then<bool>((value){
+       return value;
+     });
+ }
+
+ }
\ No newline at end of file

lib/router/router.dart

+/*
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2019 Alibaba Group
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+import 'dart:async';
+
+import 'package:flutter_boost/container/boost_container.dart';
+import 'package:flutter_boost/flutter_boost.dart';
+import 'package:flutter_boost/messaging/boost_message_channel.dart';
+
+class Router {
+
+
+  Future<Map<dynamic,dynamic>> open(String url,{Map<dynamic,dynamic> urlParams,Map<dynamic,dynamic> exts}){
+    return BoostMessageChannel.openPage(url,urlParams, exts);
+  }
+
+  Future<bool> close(String id,{Map<dynamic,dynamic> result,Map<dynamic,dynamic> exts}){
+    return BoostMessageChannel.closePage(id,result:result,exts: exts);
+  }
+
+
+  //Close currentPage page.
+  Future<bool> closeCurPage(Map params) {
+    BoostContainerSettings settings;
+
+    final BoostContainerState container =
+        FlutterBoost.containerManager.onstageContainer;
+
+    if (container != null) {
+      settings = container.settings;
+    } else {
+      settings = FlutterBoost.containerManager.onstageSettings;
+    }
+
+    if (settings == null) {
+      return Future<bool>(() {
+        return false;
+      });
+    }
+
+    bool animated = true;
+    if (params.containsKey("animated")) {
+      animated = params["animated"] as bool;
+    }
+
+    Map<String,dynamic> exts = Map();
+    exts["animated"] = animated;
+
+    return BoostMessageChannel.closePage(settings.uniqueId,result: {} ,exts: exts);
+  }
+}