status-im
/
react-native-camera-kit
mirror of https://github.com/status-im/react-native-camera-kit.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add functionality for reusage animation when app go to background

This commit is contained in:
Dmytro Ponomarenko 2018-03-09 15:43:25 +02:00
parent 2f1a2a673c
commit f83c4de9b8
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/ios/camera-kit.xcodeproj/project.pbxproj
View File

@ -899,7 +899,7 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.camera-kit.camera-kit.dsfgdfgsdf";
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.camera-kit.camera-kit.dummyIdentifier";
PRODUCT_NAME = "camera-kit";
PROVISIONING_PROFILE_SPECIFIER = "";
};
@ -922,7 +922,7 @@
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.camera-kit.camera-kit.dsfgdfgsdf";
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.camera-kit.camera-kit.dummyIdentifier";
PRODUCT_NAME = "camera-kit";
PROVISIONING_PROFILE_SPECIFIER = "";
};

45
ios/lib/ReactNativeCameraKit/CKCamera.m
View File

@ -101,6 +101,7 @@ RCT_ENUM_CONVERTER(CKCameraZoomMode, (@{
@property (nonatomic) CGFloat frameOffset;
@property (nonatomic) CGFloat heightFrame;
@property (nonatomic, strong) UIColor *frameColor;
@property (nonatomic) UIView * dataReadingFrame;
// cameraOptions props
@property (nonatomic) AVCaptureFlashMode flashMode;
@ -837,17 +838,17 @@ RCT_ENUM_CONVERTER(CKCameraZoomMode, (@{
- (void)addFrameForScanner {
CGFloat frameWidth = self.bounds.size.width - 2 * self.frameOffset;
UIView * dataReadingFrame = [[UIView alloc] initWithFrame:CGRectMake(0, 0, frameWidth, self.heightFrame)]; //
dataReadingFrame.backgroundColor = [UIColor clearColor];
[self createCustomFramesForView:dataReadingFrame];
[self addSubview:dataReadingFrame];
self.dataReadingFrame = [[UIView alloc] initWithFrame:CGRectMake(0, 0, frameWidth, self.heightFrame)]; //
self.dataReadingFrame.backgroundColor = [UIColor clearColor];
[self createCustomFramesForView:self.dataReadingFrame];
[self addSubview:self.dataReadingFrame];
//[self.cameraPreviewView.layer addSublayer:self.dataReadingFrame.layer];
dataReadingFrame.center = self.center;
self.dataReadingFrame.center = self.center;
[self addVisualEffects:dataReadingFrame.frame];
[self startAnimatingScanner:dataReadingFrame];
[self startAnimatingScanner:self.dataReadingFrame];
[self addVisualEffects:self.dataReadingFrame.frame];
CGRect visibleRect = [self.previewLayer metadataOutputRectOfInterestForRect:dataReadingFrame.frame];
CGRect visibleRect = [self.previewLayer metadataOutputRectOfInterestForRect:self.dataReadingFrame.frame];
self.metadataOutput.rectOfInterest = visibleRect;
}
@ -915,12 +916,12 @@ RCT_ENUM_CONVERTER(CKCameraZoomMode, (@{
}
- (void)startAnimatingScanner:(UIView *)inputView {
self.greenScanner = [[UIView alloc] initWithFrame:CGRectMake(0, 0, inputView.frame.size.width, 2)];
self.greenScanner = [[UIView alloc] initWithFrame:CGRectMake(2, 0, inputView.frame.size.width - 4, 2)];
self.greenScanner.backgroundColor = [UIColor whiteColor];
[inputView addSubview:self.greenScanner];
[UIView animateWithDuration:3 delay:0 options:(UIViewAnimationOptionAutoreverse | UIViewAnimationOptionRepeat) animations:^{
CGFloat middleX = inputView.frame.size.width / 2;
self.greenScanner.center = CGPointMake(middleX, inputView.frame.size.height);
self.greenScanner.center = CGPointMake(middleX, inputView.frame.size.height - 1);
} completion:^(BOOL finished) {}];
}
@ -928,6 +929,16 @@ RCT_ENUM_CONVERTER(CKCameraZoomMode, (@{
[self.greenScanner removeFromSuperview];
}
//Observer actions
- (void)didEnterBackground:(NSNotification *)notification {
[self stopAnimatingScanner];
}
- (void)willEnterForeground:(NSNotification *)notification {
[self startAnimatingScanner:self.dataReadingFrame];
}
#pragma mark - observers
@ -945,10 +956,21 @@ RCT_ENUM_CONVERTER(CKCameraZoomMode, (@{
// and show a preview is paused message. See the documentation of AVCaptureSessionWasInterruptedNotification for other
// interruption reasons.
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sessionWasInterrupted:) name:AVCaptureSessionWasInterruptedNotification object:self.session];
//Observers for re-usage animation when app go to the background and back
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(didEnterBackground:) name:UIApplicationDidEnterBackgroundNotification
object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(willEnterForeground:)
name:UIApplicationWillEnterForegroundNotification
object:nil];
self.isAddedOberver = YES;
}
}
//UIApplicationDidEnterBackgroundNotification NS_AVAILABLE_IOS(4_0);
//UIKIT_EXTERN NSNotificationName const UIApplicationWillEnterForegroundNotification
- (void)sessionWasInterrupted:(NSNotification *)notification
{
@ -1059,7 +1081,7 @@ didOutputMetadataObjects:(NSArray<__kindof AVMetadataObject *> *)metadataObjects
}
}
- (BOOL)isSupportedBarCodeType:(NSString*)currentType {
- (BOOL)isSupportedBarCodeType:(NSString *)currentType {
BOOL result = NO;
NSArray *supportedBarcodeTypes = @[AVMetadataObjectTypeUPCECode,AVMetadataObjectTypeCode39Code,AVMetadataObjectTypeCode39Mod43Code,
AVMetadataObjectTypeEAN13Code,AVMetadataObjectTypeEAN8Code, AVMetadataObjectTypeCode93Code,
@ -1084,3 +1106,4 @@ const NSString *rgbColor = @"colorWithRGB";
@end