diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 1b56be5..fa1f137 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 3dddf4b..76d78a0 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -387,8 +387,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1223" - endingLineNumber = "1223" + startingLineNumber = "1237" + endingLineNumber = "1237" landmarkName = "compositeSpatialPhoto()" landmarkType = "7"> @@ -662,6 +662,21 @@ endingLineNumber = "551" offsetFromSymbolStart = "56"> + + diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift index 42ff8f0..46bc216 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift @@ -40,7 +40,7 @@ class CCSpatialShootController: BaseController { var outputVideoURL: URL? let motionManager = CMMotionManager() var imgs:NSMutableArray = NSMutableArray() //存放广角、主摄照片数组 - + let spatialVideoWriter = SpatialVideoWriter() //================================ //当前相机模式 @@ -729,6 +729,8 @@ class CCSpatialShootController: BaseController { let time = Date().timeIntervalSince1970 let name1 = "wideAngleVideo" + String(time) + ".mov" let name2 = "ultraWideVideo" + String(time) + ".mov" + leftEyeVideoURL = nil + rightEyeVideoURL = nil let wideAngleCameraOutputURL = URL.documentsDirectory.appending(path:name1) let fultraWideCameraOutputURL = URL.documentsDirectory.appending(path:name2) @@ -1044,6 +1046,7 @@ extension CCSpatialShootController: AVCaptureFileOutputRecordingDelegate { DispatchQueue.main.async { SVProgressHUD.show(withStatus: NSLocalizedString("处理中...", comment: "")) + print("....................................\n..................................") } @@ -1081,7 +1084,11 @@ extension CCSpatialShootController: AVCaptureFileOutputRecordingDelegate { print("ultra Wide video recorded: \(outputFileURL)") rightEyeVideoURL = outputFileURL } - createSpVideo() + if let leftEyeVideoURL, + let rightEyeVideoURL { + createSpVideo() + } + } } } @@ -1090,25 +1097,32 @@ extension CCSpatialShootController: AVCaptureFileOutputRecordingDelegate { func createSpVideo(){ if(rightEyeVideoURL != nil && leftEyeVideoURL != nil){ - let spatialVideoWriter = SpatialVideoWriter() + Task { - spatialVideoWriter.writeSpatialVideo(leftEyeVideoURL: leftEyeVideoURL!, rightEyeVideoURL: rightEyeVideoURL!, outputVideoURL: outputVideoURL!) {[self] success, error in + spatialVideoWriter.writeSpatialVideo(leftEyeVideoURL: leftEyeVideoURL!, rightEyeVideoURL: rightEyeVideoURL!, outputVideoURL: outputVideoURL!) {[weak self] success, error in DispatchQueue.main.async { SVProgressHUD.dismiss() + print("SVProgressHUD.dismiss..2222.....") } if success { print("空间视频生成成功") - saveVideoToLibrary(videoURL:outputVideoURL!) + if let ovrul = self?.outputVideoURL{ + self?.saveVideoToLibrary(videoURL:ovrul) + } + // DispatchQueue.main.async { // SVProgressHUD.showSuccess(withStatus: "空间视频成功保存到相册") // } } else if let error = error { - + print(".怎么失败了呢.....error\(error)") DispatchQueue.main.async { SVProgressHUD.showInfo(withStatus: "\(NSLocalizedString("空间视频保存失败", comment: "")):\(error.localizedDescription)") } } + else { + print("not success......") + } } } } @@ -1252,6 +1266,7 @@ extension CCSpatialShootController: AVCaptureFileOutputRecordingDelegate { DispatchQueue.main.async { SVProgressHUD.dismiss() + print("SVProgressHUD.dismiss..1111.....") } if let error = error {