taolin/cordova-plugin-cszbar-jsg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #48 from dcousens/patch-2

Browse Source 
wait until viewController is dismissed before callback, fixes #47
This commit is contained in:
Daniel Cousens 2016-04-12 15:38:29 +10:00
commit 8d826e0def
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ios/CsZBar.m
View File

@ -104,29 +104,32 @@
ZBarSymbol *symbol = nil; ZBarSymbol *symbol = nil;
for(symbol in results) break; // get the first result for(symbol in results) break; // get the first result
[self.scanReader dismissModalViewControllerAnimated: YES]; [self.scanReader dismissViewControllerAnimated: YES completion: ^(void) {
self.scanInProgress = NO; self.scanInProgress = NO;
[self sendScanResult: [CDVPluginResult [self sendScanResult: [CDVPluginResult
resultWithStatus: CDVCommandStatus_OK resultWithStatus: CDVCommandStatus_OK
messageAsString: symbol.data]]; messageAsString: symbol.data]];
}];
} }
- (void) imagePickerControllerDidCancel:(UIImagePickerController*)picker - (void) imagePickerControllerDidCancel:(UIImagePickerController*)picker
{ {
[self.scanReader dismissModalViewControllerAnimated: YES]; [self.scanReader dismissViewControllerAnimated: YES completion: ^(void) {
self.scanInProgress = NO; self.scanInProgress = NO;
[self sendScanResult: [CDVPluginResult [self sendScanResult: [CDVPluginResult
resultWithStatus: CDVCommandStatus_ERROR resultWithStatus: CDVCommandStatus_ERROR
messageAsString: @"cancelled"]]; messageAsString: @"cancelled"]];
}];
} }
- (void) readerControllerDidFailToRead:(ZBarReaderController*)reader withRetry:(BOOL)retry - (void) readerControllerDidFailToRead:(ZBarReaderController*)reader withRetry:(BOOL)retry
{ {
[self.scanReader dismissModalViewControllerAnimated: YES]; [self.scanReader dismissViewControllerAnimated: YES completion: ^(void) {
self.scanInProgress = NO; self.scanInProgress = NO;
[self sendScanResult: [CDVPluginResult [self sendScanResult: [CDVPluginResult
resultWithStatus: CDVCommandStatus_ERROR resultWithStatus: CDVCommandStatus_ERROR
messageAsString: @"Failed"]]; messageAsString: @"Failed"]];
}];
} }