mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[iphone][ZXingWidgetController] delegate API changed to conform to standard delagate APIs, bug fixed regarding status bar displaying upon success of scanning

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1448 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
rpechayr 2010-06-19 16:57:05 +00:00
parent b94d44c5a1
commit 32bbefc1d2
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/ZXingWidget/Classes/ZXingWidgetController.h
View file

@ -51,6 +51,6 @@
@end @end
@protocol ZXingDelegate @protocol ZXingDelegate
- (void)scanResult:(NSString *)result; - (void)zxingController:(ZXingWidgetController*)controller didScanResult:(NSString *)result;
- (void)cancelled; - (void)zxingControllerDidCancel:(ZXingWidgetController*)controller;
@end @end

22
iphone/ZXingWidget/Classes/ZXingWidgetController.m
View file

@ -78,6 +78,14 @@ CGImageRef UIGetScreenImage(void);
} }
} }
- (void)unloadImagePicker {
if (self.imagePicker)
{
[imagePicker release];
imagePicker = nil;
}
}
- (id)initWithDelegate:(id<ZXingDelegate>)scanDelegate showCancel:(BOOL)shouldShowCancel OneDMode:(BOOL)shouldUseoOneDMode { - (id)initWithDelegate:(id<ZXingDelegate>)scanDelegate showCancel:(BOOL)shouldShowCancel OneDMode:(BOOL)shouldUseoOneDMode {
if (self = [super init]) { if (self = [super init]) {
[self setDelegate:scanDelegate]; [self setDelegate:scanDelegate];
@ -108,11 +116,10 @@ CGImageRef UIGetScreenImage(void);
} }
- (void)cancelled { - (void)cancelled {
NSLog(@"cancelled called in ZXingWidgetController");
[[UIApplication sharedApplication] setStatusBarHidden:NO]; [[UIApplication sharedApplication] setStatusBarHidden:NO];
wasCancelled = true; wasCancelled = YES;
if (delegate != nil) { if (delegate != nil) {
[delegate cancelled]; [delegate zxingControllerDidCancel:self];
} }
} }
@ -129,8 +136,8 @@ CGImageRef UIGetScreenImage(void);
- (BOOL)fixedFocus { - (BOOL)fixedFocus {
NSString *platform = [self getPlatform]; NSString *platform = [self getPlatform];
if ([platform isEqualToString:@"iPhone1,1"] || if ([platform isEqualToString:@"iPhone1,1"] ||
[platform isEqualToString:@"iPhone1,2"]) return true; [platform isEqualToString:@"iPhone1,2"]) return YES;
return false; return NO;
} }
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
@ -154,7 +161,7 @@ CGImageRef UIGetScreenImage(void);
self.view = imagePicker.view; self.view = imagePicker.view;
[overlayView setPoints:nil]; [overlayView setPoints:nil];
wasCancelled = false; wasCancelled = NO;
if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) { if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
[NSTimer scheduledTimerWithTimeInterval: FIRST_TAKE_DELAY [NSTimer scheduledTimerWithTimeInterval: FIRST_TAKE_DELAY
@ -323,8 +330,9 @@ CGImageRef UIGetScreenImage(void);
} }
- (void)alertDelegate:(id)text { - (void)alertDelegate:(id)text {
[[UIApplication sharedApplication] setStatusBarHidden:NO];
if (delegate != nil) { if (delegate != nil) {
[delegate scanResult:text]; [delegate zxingController:self didScanResult:text];
} }
} }