|
@@ -330,15 +330,7 @@
|
|
|
self.modeList.mode = [SDKParameters shared].modeIndex;
|
|
|
self.mode = [SDKParameters shared].modeIndex;
|
|
|
[self modeDidChange:[SDKParameters shared].modeIndex oldIndex:0lu];
|
|
|
-
|
|
|
-// UIVisualEffectView* effectView = [[UIVisualEffectView alloc] initWithEffect: [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]];
|
|
|
-// effectView.alpha = 0.8;
|
|
|
-// effectView.effect = nil;
|
|
|
-// self.effectView = effectView;
|
|
|
-// [self.view insertSubview:self.effectView belowSubview:self.backButton];
|
|
|
-// [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
-// make.edges.equalTo(self.view);
|
|
|
-// }];
|
|
|
+
|
|
|
|
|
|
if(!self.cameraPrepared){
|
|
|
[self prepareCamera];
|
|
@@ -499,11 +491,6 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
-- (void)viewWillDisappear:(BOOL)animated{
|
|
|
- [super viewWillDisappear:animated];
|
|
|
- [self stopCaptureSession];
|
|
|
- [[PCSMotionManager shared] stopAccelerometerUpdates];
|
|
|
-}
|
|
|
|
|
|
- (void)updateFlashButton {
|
|
|
__block SDKFlashModeIndex flashModel = SDK_FLASH_MODE_AUTO;
|
|
@@ -1005,6 +992,8 @@
|
|
|
return;
|
|
|
}
|
|
|
if(self.mode == SDK_CAPTURE_MODE_SINGLE){
|
|
|
+ [self stopCaptureSession];
|
|
|
+ [[PCSMotionManager shared] stopAccelerometerUpdates];
|
|
|
[self dismissViewControllerAnimated:YES completion:^{}];
|
|
|
}
|
|
|
else{
|
|
@@ -1990,7 +1979,11 @@
|
|
|
}];
|
|
|
}];
|
|
|
} else {
|
|
|
- [self dismissViewControllerAnimated:YES completion:^{}];
|
|
|
+ [self stopCaptureSession];
|
|
|
+ [[PCSMotionManager shared] stopAccelerometerUpdates];
|
|
|
+ [self dismissViewControllerAnimated:YES completion:^{
|
|
|
+
|
|
|
+ }];
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -2081,6 +2074,8 @@
|
|
|
dict[@"code"] = @(200);
|
|
|
dict[@"message"] = @"成功";
|
|
|
dict[@"data"] = res;
|
|
|
+ [self stopCaptureSession];
|
|
|
+ [[PCSMotionManager shared] stopAccelerometerUpdates];
|
|
|
self.completeBlock(dict);
|
|
|
[self dismissViewControllerAnimated:YES completion:^{
|
|
|
|
|
@@ -2099,6 +2094,8 @@
|
|
|
[self.resourceModel.panoramArray removeAllObjects];
|
|
|
[self.resourceModel.aiPanoramArray removeAllObjects];
|
|
|
[alertController dismissViewControllerAnimated:NO completion:^{
|
|
|
+ [self stopCaptureSession];
|
|
|
+ [[PCSMotionManager shared] stopAccelerometerUpdates];
|
|
|
[self dismissViewControllerAnimated:YES completion:^{}];
|
|
|
}];
|
|
|
}];
|