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

[iphone/ZxingWidget] widget now respects statusBarHidden or not instaed or always displaying it when controller is dismissed

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1726 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
rpechayr 2011-03-16 08:25:50 +00:00
parent 10262e8bf1
commit 13403613bc
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,7 @@
AVCaptureVideoPreviewLayer *prevLayer;
#endif
BOOL decoding;
BOOL isStatusBarHidden;
}
#if HAS_AVFF

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

@ -34,6 +34,7 @@
@property BOOL showCancel;
@property BOOL oneDMode;
@property BOOL isStatusBarHidden;
- (void)initCapture;
- (void)stopCapture;
@ -48,7 +49,7 @@
#endif
@synthesize result, delegate, soundToPlay;
@synthesize overlayView;
@synthesize oneDMode, showCancel;
@synthesize oneDMode, showCancel, isStatusBarHidden;
@synthesize readers;
@ -87,7 +88,10 @@
- (void)cancelled {
[self stopCapture];
[[UIApplication sharedApplication] setStatusBarHidden:NO];
if (!self.isStatusBarHidden) {
[[UIApplication sharedApplication] setStatusBarHidden:NO];
}
wasCancelled = YES;
if (delegate != nil) {
[delegate zxingControllerDidCancel:self];
@ -124,7 +128,9 @@
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[[UIApplication sharedApplication] setStatusBarHidden:YES];
self.isStatusBarHidden = [[UIApplication sharedApplication] isStatusBarHidden];
if (!isStatusBarHidden)
[[UIApplication sharedApplication] setStatusBarHidden:YES];
decoding = YES;
@ -137,7 +143,8 @@
- (void)viewDidDisappear:(BOOL)animated {
[super viewDidDisappear:animated];
[[UIApplication sharedApplication] setStatusBarHidden:NO];
if (!isStatusBarHidden)
[[UIApplication sharedApplication] setStatusBarHidden:NO];
[self.overlayView removeFromSuperview];
[self stopCapture];
}
@ -257,8 +264,9 @@
decoder.delegate = nil;
}
- (void)alertDelegate:(id)text {
[[UIApplication sharedApplication] setStatusBarHidden:NO];
- (void)alertDelegate:(id)text {
if (!isStatusBarHidden)
[[UIApplication sharedApplication] setStatusBarHidden:NO];
if (delegate != nil) {
[delegate zxingController:self didScanResult:text];
}