|
@@ -2602,7 +2602,23 @@
|
|
|
|
|
|
- (void)discardPhotoResultButtonTouchUpInside:(id)sender{
|
|
|
self.panGesture.enabled = YES;
|
|
|
- NSString *title = @"返回会清空已拍摄数据,请确认!";
|
|
|
+
|
|
|
+ NSMutableString *showCountString = [NSMutableString stringWithString:@"已拍摄:"];
|
|
|
+ if (self.resourceModel.continousArray.count > 0) {
|
|
|
+ [showCountString appendString:[NSString stringWithFormat:@" 连拍:%ld张", self.resourceModel.continousArray.count]];
|
|
|
+ }
|
|
|
+ if (self.resourceModel.movieArray.count > 0) {
|
|
|
+ [showCountString appendString:[NSString stringWithFormat:@" 视频:%ld条", self.resourceModel.movieArray.count]];
|
|
|
+ }
|
|
|
+
|
|
|
+ if (self.resourceModel.panoramArray.count > 0) {
|
|
|
+ [showCountString appendString:[NSString stringWithFormat:@" 全景:%ld张", self.resourceModel.panoramArray.count]];
|
|
|
+ }
|
|
|
+ if (self.resourceModel.aiPanoramArray.count > 0) {
|
|
|
+ [showCountString appendString:[NSString stringWithFormat:@" 智能全景:%ld张", self.resourceModel.aiPanoramArray.count]];
|
|
|
+ }
|
|
|
+
|
|
|
+ NSString *title = [NSString stringWithFormat:@"返回会清空已拍摄数据,请确认!\n%@", showCountString];
|
|
|
[QuitMultipleModeAlertViewController show:self title:@"确认提醒" text:title leftBtnTitle:@"取消" rightBtnTitle:@"确定" withLeftButtonCallBack:^(QuitMultipleModeAlertViewController * _Nonnull alertController) {
|
|
|
[alertController dismissViewControllerAnimated:NO completion:^{}];
|
|
|
} rightButtonCallBack:^(QuitMultipleModeAlertViewController * _Nonnull alertController) {
|
|
@@ -3188,11 +3204,7 @@
|
|
|
return;
|
|
|
}
|
|
|
if (result == LenVideoStitchResultFail || result == LenVideoStitchResultStitchFail) {
|
|
|
- if (result == LenVideoStitchResultFail) {
|
|
|
- [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"拼接失败,流程结束"];
|
|
|
- } else {
|
|
|
- [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"拼接大图失败,流程结束"];
|
|
|
- }
|
|
|
+ [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"拼接失败"];
|
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
[base takePhotoButtonTouched];
|