change iOS callback logic; update README;

Author: DNVA

README.md

@@ -16,14 +16,19 @@ The plugin aims to be used with iOS version >= 7.
 
 ## Usage
 The plugin offers two functions `isDetecting` and `setPattern`.
-`isDetecting` callback on success function if detecting, on error function if it's not.
-`setPattern` sets the new pattern target to be detected. Calls on success if the pattern is set on error if no pattern set.
- 
+`isDetecting` - the plugin will callback on success function if detecting the pattern or on error function if it's not.
+```javascript
+isDetecting(successCallback, errorCallback);
+```
+
+`setPattern` - sets the new pattern target to be detected. Calls on success if the pattern is set and on error if no pattern set. The input pattern must be a base64 image.
+```javascript
+setPattern(base64image, successCallback, errorCallback);
+```
+
 ## Usage example
 ```javascript
-setInterval(function(){
-  ImageDetectionPlugin.isDetecting(function(success){console.log(success);}, function(error){console.log(error);});
-}, 1000);
+ImageDetectionPlugin.isDetecting(function(success){console.log(success);}, function(error){console.log(error);});
 
 var img = new Image();
 img.crossOrigin = "Anonymous";

src/ios/ImageDetectionPlugin.mm

@@ -10,8 +10,9 @@ @interface ImageDetectionPlugin()
 {
     Mat patt, desc1;
     vector<KeyPoint> kp1;
-    bool debug, thread_over;
+    bool debug, thread_over, called_success_detection, called_failed_detection;
     NSMutableArray *detection;
+    NSString *callbackID;
 }
 
 @end
@@ -39,20 +40,23 @@ - (void)greet:(CDVInvokedUrlCommand*)command
 
 -(void)isDetecting:(CDVInvokedUrlCommand*)command
 {
-    [self.commandDelegate runInBackground:^{
-        CDVPluginResult* plugin_result = nil;
-        NSString* msg;
-
-        if ([self getState]) {
-            msg = @"pattern detected";
-            plugin_result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:msg];
-        } else {
-            msg = @"pattern not detected";
-            plugin_result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:msg];
-        }
-
-        [self.commandDelegate sendPluginResult:plugin_result callbackId:command.callbackId];
-    }];
+    callbackID = command.callbackId;
+//    [self.commandDelegate runInBackground:^{
+//        CDVPluginResult* plugin_result = nil;
+//        NSString* msg;
+//
+//        if ([self getState]) {
+//            msg = @"pattern detected";
+//            plugin_result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:msg];
+//            [plugin_result setKeepCallbackAsBool:YES];
+//        } else {
+//            msg = @"pattern not detected";
+//            plugin_result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:msg];
+//            [plugin_result setKeepCallbackAsBool:YES];
+//        }
+//
+//        [self.commandDelegate sendPluginResult:plugin_result callbackId:command.callbackId];
+//    }];
 }
 
 - (void)setPattern:(CDVInvokedUrlCommand*)command;
@@ -126,6 +130,8 @@ - (void)pluginInitialize {
 
     debug = false;
     thread_over = true;
+    called_success_detection = false;
+    called_failed_detection = true;
 
     detection = [[NSMutableArray alloc] init];
 
@@ -291,7 +297,7 @@ - (void)backgroundImageProcessing:(const Mat &)image
 
 -(void)updateState:(BOOL) state
 {
-    if(detection.count > 15)
+    if(detection.count > 3)
     {
         [detection removeObjectAtIndex:0];
     }
@@ -302,6 +308,31 @@ -(void)updateState:(BOOL) state
     } else {
         [detection addObject:[NSNumber numberWithBool:NO]];
     }
+
+    if([self getState] && called_failed_detection && !called_success_detection) {
+        [self.commandDelegate runInBackground:^{
+            CDVPluginResult* plugin_result = nil;
+            NSString* msg = @"pattern detected";
+            plugin_result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:msg];
+            [plugin_result setKeepCallbackAsBool:YES];
+
+            [self.commandDelegate sendPluginResult:plugin_result callbackId:callbackID];
+        }];
+        called_success_detection = true;
+        called_failed_detection = false;
+    }
+    if(![self getState] && !called_failed_detection && called_success_detection) {
+        [self.commandDelegate runInBackground:^{
+            CDVPluginResult* plugin_result = nil;
+            NSString* msg = @"pattern not detected";
+            plugin_result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:msg];
+            [plugin_result setKeepCallbackAsBool:YES];
+
+            [self.commandDelegate sendPluginResult:plugin_result callbackId:callbackID];
+        }];
+        called_success_detection = false;
+        called_failed_detection = true;
+    }
 }
 
 -(BOOL)getState
@@ -316,4 +347,5 @@ -(BOOL)getState
         return false;
     }
 }
+
 @end