|
@@ -38,6 +38,7 @@
|
|
|
|
|
|
|
|
+ (instancetype)viewControllerFromStoryboard {
|
|
+ (instancetype)viewControllerFromStoryboard {
|
|
|
RACameraViewController *cameraVC = [[UIStoryboard storyboardWithName:@"Camera" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
|
|
RACameraViewController *cameraVC = [[UIStoryboard storyboardWithName:@"Camera" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
|
|
|
|
|
+ cameraVC.takeMode = RACameraTakeModeTakeOnce;
|
|
|
return cameraVC;
|
|
return cameraVC;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -331,8 +332,10 @@
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
preVC.preImage = image;
|
|
preVC.preImage = image;
|
|
|
- preVC.popTo = weakSelf.fromVC;
|
|
|
|
|
- preVC.barHidden = weakSelf.barHidden;
|
|
|
|
|
|
|
+ if (weakSelf.takeMode == RACameraTakeModeTakeOnce) {
|
|
|
|
|
+ preVC.popTo = weakSelf.fromVC;
|
|
|
|
|
+ preVC.barHidden = weakSelf.barHidden;
|
|
|
|
|
+ }
|
|
|
[weakSelf.navigationController pushViewController:preVC animated:YES];
|
|
[weakSelf.navigationController pushViewController:preVC animated:YES];
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|