diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 5242ed3..c762307 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 c09dcee..09704fd 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -14,8 +14,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "584" - endingLineNumber = "584" + startingLineNumber = "593" + endingLineNumber = "593" landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)" landmarkType = "7"> @@ -30,8 +30,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "576" - endingLineNumber = "576" + startingLineNumber = "585" + endingLineNumber = "585" landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)" landmarkType = "7"> @@ -94,8 +94,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "540" - endingLineNumber = "540" + startingLineNumber = "549" + endingLineNumber = "549" landmarkName = "photoLibrary()" landmarkType = "7"> @@ -339,8 +339,8 @@ filePath = "SwiftProject/Project/View/Album/CCSpaceAlbumFliterPopView/CCSpaceAlbumFilterPopView2.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "365" - endingLineNumber = "365" + startingLineNumber = "366" + endingLineNumber = "366" landmarkName = "loadMoreData(offset:)" landmarkType = "7"> @@ -393,84 +393,6 @@ landmarkType = "7"> - - - - - - - - - - - - - - @@ -545,8 +467,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "373" - endingLineNumber = "373" + startingLineNumber = "375" + endingLineNumber = "375" landmarkName = "notification_didActiveNotification(notification:)" landmarkType = "7"> @@ -641,8 +563,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "266" - endingLineNumber = "266" + startingLineNumber = "267" + endingLineNumber = "267" landmarkName = "touchesCancelled(_:with:)" landmarkType = "7"> @@ -676,6 +598,21 @@ endingLineNumber = "266" offsetFromSymbolStart = "560"> + + @@ -695,5 +632,37 @@ landmarkType = "7"> + + + + + + + + diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift index 6b6125a..123023a 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift @@ -491,54 +491,50 @@ class CCSpatialPhotoDisplayController: BaseController { // 处理分段选择器值改变事件 currentSpatialType = selectedIndex // print("选中了第 \(selectedIndex) 个选项") -// mImgView.frame = CGRect.init(x: 0, y: 200, width: self.view.frame.size.width, height: 240) - - guard let imageSource = CGImageSourceCreateWithData(imgData! as CFData, nil) else { - return - } - let frameCount = CGImageSourceGetCount(imageSource) - var frames: [CGImage] = [] - for index in 0.. (UIImage,CGSize) { if drawSize.width <= drawImgWidth { - print("瞳距返回,不用处理") +// print("瞳距返回,不用处理") return (image,drawSize) } - print("瞳距要处理") +// print("瞳距要处理") let newImageWidth = drawImgWidth * image.size.height / drawSize.height let dRect = CGRectMake((image.size.width - newImageWidth) * 0.5, 0, newImageWidth, image.size.height) let newImage = image.imageAtRect(rect: dRect) diff --git a/SwiftProject/SwiftProject/Project/Util/ZZHImageExtension.swift b/SwiftProject/SwiftProject/Project/Util/ZZHImageExtension.swift index 38c346c..a42712b 100644 --- a/SwiftProject/SwiftProject/Project/Util/ZZHImageExtension.swift +++ b/SwiftProject/SwiftProject/Project/Util/ZZHImageExtension.swift @@ -23,7 +23,7 @@ extension UIImage { let final = EXImageContext.createCGImage(imageRef, from:imageRef.extent) return UIImage(cgImage: final!) } - print("cgimage.....>>>>>>>>>>>>>.") +// print("cgimage.....>>>>>>>>>>>>>.") let imageRef = cgImage.cropping(to: rect) return imageRef == nil ? nil : UIImage(cgImage: imageRef!) } @@ -80,7 +80,7 @@ extension UIImage { } func getRotateFrom(_ imgOrigOritentation:UIImage.Orientation) ->CGFloat { - print("..or:\(imgOrigOritentation.rawValue)") +// print("..or:\(imgOrigOritentation.rawValue)") if imgOrigOritentation == .left { return -.pi/2 } else if imgOrigOritentation == .right{