Update andorid return value bug

android/README.md

@@ -1 +1,5 @@
-This is the root folder for the Android implementation.
+This is the root folder for the Android implementation.  
+\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*  
+data：2016-09-01  
+1、Update andorid return value bug  
+\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*  

android/ponto-sample/assets/ponto_sample.html

@@ -48,6 +48,7 @@
                     function (params) {
                         console.log('success with params:');
                         console.log(params);
+                        alert(JSON.stringify(params));
                         alert('success');
                     },
                     function (params) {

android/ponto-sample/src/com/wikia/ponto/sample/modules/Messaging.java

@@ -1,5 +1,8 @@
 package com.wikia.ponto.sample.modules;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -55,8 +58,11 @@ public void sendEmail(String params) {
         mContext.startActivity(Intent.createChooser(emailIntent, subject));
     }
 
-    public void getSomeData() {
+    public JSONObject getSomeData() {
         Log.i("TAG", new Object() {}.getClass().getEnclosingMethod().getName());
+        Map<String, String> paramsMap = new HashMap<String, String>();
+        paramsMap.put("msg", "this is some data");
+        return new JSONObject(paramsMap);
     }
 
 }

android/ponto/src/com/wikia/ponto/Ponto.java

@@ -130,10 +130,12 @@ public void request(String execContext, String className, String methodName, Str
                 Object object = constructor.newInstance(mWebView.getContext());
                 if (params != null && !params.equalsIgnoreCase(NULL_STRING)) {
                     Method method = cls.getDeclaredMethod(methodName, String.class);
-                    method.invoke(object, params);
+                    Object retObject = method.invoke(object, params);
+                    if(retObject!=null)responseParams = (JSONObject)retObject;
                 } else {
                     Method method = cls.getDeclaredMethod(methodName);
-                    method.invoke(object);
+                    Object retObject = method.invoke(object);
+                    if(retObject!=null)responseParams = (JSONObject)retObject;
                 }
                 responseType = RESPONSE_COMPLETE;
             } catch (InstantiationException e) {

ios/Ponto/Ponto.xcodeproj/project.pbxproj

@@ -258,14 +258,15 @@
 			name = PontoTests;
 			productName = PontoTests;
 			productReference = 6BE468BAA200487C0A00CFAF /* PontoTests.octest */;
-			productType = "com.apple.product-type.bundle";
+			productType = "com.apple.product-type.bundle.ocunit-test";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		6BE46A497320EB524FF754F6 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastTestingUpgradeCheck = 0700;
 			};
 			buildConfigurationList = 6BE46E9490E9050BBD4C5957 /* Build configuration list for PBXProject "Ponto" */;
 			compatibilityVersion = "Xcode 3.2";

ios/Ponto/Ponto/PontoDEMOMessaging.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "PontoBaseHandler.h"
+#import "PontoDEMOViewController.h"
 
 @interface PontoDEMOMessaging : PontoBaseHandler
 

ios/Ponto/Ponto/PontoDEMOMessaging.m

@@ -9,7 +9,6 @@
 #import "PontoDEMOMessaging.h"
 #import "PontoDEMOAppDelegate.h"
 
-
 @implementation PontoDEMOMessaging {
 
 }
@@ -47,4 +46,14 @@ - (NSDictionary *)getSomeDataFromHandler {
     ];
 }
 
+- (void)webViewAlertCallback {
+
+    // try to call JS method
+    [[PontoDEMOViewController getPontoDispatcher] invokeMethod:@"show" onTarget:@"Alert" withParams:[NSDictionary dictionaryWithObjectsAndKeys: @"this is callback text",@"text",nil] successBlock:^(id params) {
+        NSLog(@"success block with params: %@", params);
+    } errorBlock:^(id params) {
+        NSLog(@"error block with params: %@", params);
+    }];
+}
+
 @end

ios/Ponto/Ponto/PontoDEMOViewController.h

@@ -12,4 +12,6 @@
 @interface PontoDEMOViewController : UIViewController <PontoDispatcherCallbackDelegate>
 
 @property (strong, nonatomic) IBOutlet UIWebView *webView;
+
++ (PontoDispatcher *)getPontoDispatcher;
 @end

ios/Ponto/Ponto/PontoDEMOViewController.m

@@ -14,15 +14,20 @@ @interface PontoDEMOViewController ()
 
 @end
 
+static PontoDispatcher *_tempPontoDispatcher = nil;
+
 @implementation PontoDEMOViewController
 
-- (void)viewDidLoad
-{
 
++ (PontoDispatcher *)getPontoDispatcher
+{
+    return _tempPontoDispatcher;
+}
 
+- (void)viewDidLoad
+{
     [super viewDidLoad];
 
-
     // Create Ponto Dispatcher
     self.title = @"Ponto DEMO WebView";
     self.pontoDispatcher = [[PontoDispatcher alloc] initWithHandlerClassesPrefix:@"PontoDEMO" andWebView:self.webView];
@@ -34,12 +39,13 @@ - (void)viewDidLoad
         NSLog(@"error block with params: %@", params);
     }];
 
-
     // Load local HTML file
     NSString *pathToLocalFile = [[NSBundle mainBundle] pathForResource:@"pontoDemo" ofType:@"html"];
     NSURL *localFileURL = [[NSURL alloc] initFileURLWithPath:pathToLocalFile];
     NSURLRequest *localFileRequest = [[NSURLRequest alloc] initWithURL:localFileURL];
     [self.webView loadRequest:localFileRequest];
+
+    _tempPontoDispatcher = self.pontoDispatcher;
 }
 
 

ios/Ponto/Resources/html/pontoDemo.html

@@ -7,6 +7,21 @@
     <script src="web/src/ponto.js" type="text/javascript"></script>
 
     <script type="text/javascript">
+
+        function Alert() {
+            this.show = function(params) {
+                console.log('show');
+                console.log(params.text);
+                alert(params.text);
+            };
+        }
+
+        Ponto.PontoBaseHandler.derive(Alert);
+
+        Alert.getInstance = function(){
+            return new Alert();
+        };
+
         function sendMessage() {
             Ponto.invoke(
                     "Messaging",
@@ -16,7 +31,6 @@
                     null);
         }
 
-
         function getSomeDataFromHandler() {
             Ponto.invoke(
                     "Messaging",
@@ -25,6 +39,7 @@
                     function (params) {
                         console.log('success with params:');
                         console.log(params);
+                         alert(JSON.stringify(params));
                         alert('success');
                     },
                     function (params) {
@@ -33,8 +48,7 @@
                         alert('error');
                     });
         }
-
-
+
         function testNotExistentMethodInHandler() {
             Ponto.invoke(
                     "Messaging",
@@ -48,7 +62,6 @@
                     });
         }
 
-
         function testNotExistentHandler() {
             Ponto.invoke(
                     "NotExistClass",
@@ -76,6 +89,16 @@
                         alert(params.message);
                     });
         }
+
+
+        function webViewAlertCallback() {
+            Ponto.invoke(
+                    "Messaging",
+                    "webViewAlertCallback",
+                    null,
+                    null,
+                    null);
+        }
     </script>
 </head>
 <body>
@@ -100,6 +123,10 @@ <h1>Ponto DEMO HTML</h1>
         <li>
             <button onclick="testNotExistentHandlerWithoutSuccessHandler()">Test not existent handler 2.</button>
         </li>
+
+        <li>
+            <button onclick="webViewAlertCallback()">WebView Alert Callback</button>
+        </li>
     </ul>
 </body>
 </html>

ios/README.md

@@ -1 +1,5 @@
 This is the root folder for the iOS implementation.
+\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*  
+data：2016-09-04  
+1、Add iOS Demo WebView Alert Callback. 
+\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*