Merge pull request alibaba#2203 from boboning/ios-feature-navigator

* [ios] update navigator module, add open and close interface.

Author: acton393

ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m

@@ -18,9 +18,10 @@ @implementation WXNavigatorModule
 
 @synthesize weexInstance;
 
+WX_EXPORT_METHOD(@selector(open:success:failure:))
+WX_EXPORT_METHOD(@selector(close:success:failure:))
 WX_EXPORT_METHOD(@selector(push:callback:))
 WX_EXPORT_METHOD(@selector(pop:callback:))
-WX_EXPORT_METHOD(@selector(close:callback:))
 WX_EXPORT_METHOD(@selector(setNavBarBackgroundColor:callback:))
 WX_EXPORT_METHOD(@selector(setNavBarLeftItem:callback:))
 WX_EXPORT_METHOD(@selector(clearNavBarLeftItem:callback:))
@@ -40,33 +41,36 @@ @implementation WXNavigatorModule
 
 #pragma mark Weex Application Interface
 
-- (void)push:(NSDictionary *)param callback:(WXModuleCallback)callback
+- (void)open:(NSDictionary *)param success:(WXModuleCallback)success failure:(WXModuleCallback)failure
 {
     id<WXNavigationProtocol> navigator = [self navigator];
     UIViewController *container = self.weexInstance.viewController;
-    [navigator pushViewControllerWithParam:param completion:^(NSString *code, NSDictionary *responseData) {
-        if (callback && code) {
-            callback(code);
-        }
-    } withContainer:container];
+    [navigator open:param success:success failure:failure withContainer:container];
 }
-
-- (void)pop:(NSDictionary *)param callback:(WXModuleCallback)callback
+    
+- (void)close:(NSDictionary *)param success:(WXModuleCallback)success failure:(WXModuleCallback)failure
 {
     id<WXNavigationProtocol> navigator = [self navigator];
     UIViewController *container = self.weexInstance.viewController;
-    [navigator popViewControllerWithParam:param completion:^(NSString *code, NSDictionary *responseData) {
+    [navigator close:param success:success failure:failure withContainer:container];
+}
+    
+- (void)push:(NSDictionary *)param callback:(WXModuleCallback)callback
+{
+    id<WXNavigationProtocol> navigator = [self navigator];
+    UIViewController *container = self.weexInstance.viewController;
+    [navigator pushViewControllerWithParam:param completion:^(NSString *code, NSDictionary *responseData) {
         if (callback && code) {
             callback(code);
         }
     } withContainer:container];
 }
 
-- (void)close:(NSDictionary *)param callback:(WXModuleCallback)callback
+- (void)pop:(NSDictionary *)param callback:(WXModuleCallback)callback
 {
     id<WXNavigationProtocol> navigator = [self navigator];
     UIViewController *container = self.weexInstance.viewController;
-    [navigator popToRootViewControllerWithParam:param completion:^(NSString *code, NSDictionary *responseData) {
+    [navigator popViewControllerWithParam:param completion:^(NSString *code, NSDictionary *responseData) {
         if (callback && code) {
             callback(code);
         }

ios/sdk/WeexSDK/Sources/Protocol/WXNavigationProtocol.h

@@ -119,18 +119,39 @@ typedef void (^WXNavigationResultBlock)(NSString *code, NSDictionary * responseD
                         completion:(WXNavigationResultBlock)block
                      withContainer:(UIViewController *)container;
 
+    
+@optional
+    
 /**
- * @abstract Pops all the view controllers on the stack except the root view controller.
+ * @abstract open the resource at the specified URL which supports many common schemes, including the http, https, tel and mailto schemes.
  *
  * @param param The data which is passed to the implementation of the protocol.
  *
- * @param block A block called once the action is completed.
+ * @param block A block called once the action is completed successfully.
+ *
+ * @param block A block called once the action failed to be completed.
  *
  * @param container The target controller.
  *
  */
-- (void)popToRootViewControllerWithParam:(NSDictionary *)param
-                              completion:(WXNavigationResultBlock)block
-                           withContainer:(UIViewController *)container;
+- (void)open:(NSDictionary *)param success:(WXModuleCallback)success
+                                   failure:(WXModuleCallback)failure
+                             withContainer:(UIViewController *)container;
 
+
+/**
+  * @abstract close the current weex page
+  *
+  * @param param The data which is passed to the implementation of the protocol.
+  *
+  * @param block A block called once the action is completed successfully.
+  *
+  * @param block A block called once the action failed to be completed.
+  *
+  * @param container The target controller.
+  *
+  */
+- (void)close:(NSDictionary *)param success:(WXModuleCallback)success
+                                   failure:(WXModuleCallback)failure
+                             withContainer:(UIViewController *)container;
 @end