From c26908cfacc2d4c0fe5f241863788977b544eeec Mon Sep 17 00:00:00 2001 From: bluesea <307723040@qq.com> Date: Tue, 26 Mar 2024 11:33:54 +0800 Subject: [PATCH] =?UTF-8?q?ccspatialphotodisplaycontroller=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=9B=E5=B9=B6=E4=B8=94=E5=9C=A8=E5=B1=95=E7=A4=BA2d?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=97=A0=E9=A1=BB=E8=BF=9B=E8=A1=8C=E5=9B=BE?= =?UTF-8?q?=E5=83=8F=E9=80=89=E6=8B=A9=EF=BC=8Cuiimageview=E4=BC=9A?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A0=B9=E6=8D=AE=E5=9B=BE=E7=89=87=E6=96=B9?= =?UTF-8?q?=E5=90=91=E8=BF=9B=E8=A1=8C=E6=A0=A1=E6=AD=A3=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=96=B9=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CCSpatialPhotoDisplayController.swift | 49 ++----------------- 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift index 330d2f2..759f097 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift @@ -29,13 +29,13 @@ class CCSpatialPhotoDisplayController: BaseController { var externalImageView:UIImageView? - var player:AVPlayer = AVPlayer() +// var player:AVPlayer = AVPlayer() var outputVideoURL:URL? var dvc:UIDocumentViewController? //图片源数据 - var photoOriginalURL:URL? +// var photoOriginalURL:URL? var photoOriginalData:Data? var imageAsset:PHAsset? @@ -102,16 +102,9 @@ class CCSpatialPhotoDisplayController: BaseController { let imageView = UIImageView() imageView.frame = CGRect.init(x: 0, y: 250, width: self.view.frame.size.width, height: 240) imageView.contentMode = .scaleAspectFit -// imageView.backgroundColor = UIColor.hexStringToColor(hexString: "#383739") imageView.backgroundColor = UIColor.clear - - // let image = UIImage(contentsOfFile: photoOriginalURL!.path) - // imageView.image = image imageView.isUserInteractionEnabled = true - // let tapGesture = UITapGestureRecognizer(target: self, action: #selector(imageTapped(_:))) - // imageView.addGestureRecognizer(tapGesture) - return imageView }() @@ -171,20 +164,11 @@ class CCSpatialPhotoDisplayController: BaseController { //获取图片源数据 var originalData:Data? - if photoOriginalURL != nil { - do { - originalData = try Data(contentsOf: photoOriginalURL!) - }catch let error as NSError { - print(error) - } - }else if photoOriginalData != nil { - originalData = photoOriginalData - } - + originalData = photoOriginalData + imgData = originalData //展示 var image = UIImage(data: originalData!) - image = image?.getUpImg() mImgView.image = image @@ -332,7 +316,7 @@ class CCSpatialPhotoDisplayController: BaseController { // 处理分段选择器值改变事件 print("选中了第 \(selectedIndex) 个选项") - player.pause() +// player.pause() NotificationCenter.default.removeObserver(self) mImgView.frame = CGRect.init(x: 0, y: 200, width: self.view.frame.size.width, height: 240) @@ -356,7 +340,6 @@ class CCSpatialPhotoDisplayController: BaseController { if(selectedIndex == 0){ //空间照片 --- 单眼2D(展示原照片或者广角或者主摄其中一个) var image = UIImage(data: photoOriginalData!) - image = image?.getUpImg() mImgView.image = image }else if(selectedIndex == 1){ @@ -370,7 +353,6 @@ class CCSpatialPhotoDisplayController: BaseController { }else if(selectedIndex == 2){ //红蓝立体 - // mImgView.frame = CGRect.init(x: 0, y: 180, width: self.view.frame.size.width, height: 380) let redColorMatrix: [CGFloat] = [ 0.0, 0.0, 0.0, 0.0, 0.0, // 红色通道 0.0, 0.0, 0.0, 0.0, 0.0, // 绿色通道 @@ -409,15 +391,6 @@ class CCSpatialPhotoDisplayController: BaseController { let compositeFilter = CIFilter(name: "CIScreenBlendMode")! compositeFilter.setValue(redOutputImage, forKey: kCIInputImageKey) compositeFilter.setValue(blueOutputImage, forKey: kCIInputBackgroundImageKey) - - // let sharpenedFilter = CIFilter(name: "CISharpenLuminance")! - // sharpenedFilter.setValue(compositeFilter.outputImage, forKey: kCIInputImageKey) - // sharpenedFilter.setValue(2, forKey: kCIInputSharpnessKey) - - // let colorControlsFilter = CIFilter(name: "CIColorControls")! - // colorControlsFilter.setValue(sharpenedFilter.outputImage, forKey: kCIInputImageKey) - // colorControlsFilter.setValue(0.7, forKey: kCIInputSaturationKey) - let lastImg = compositeFilter.outputImage! DispatchQueue.main.async { [weak self] in var ri = UIImage(ciImage: lastImg) @@ -428,24 +401,12 @@ class CCSpatialPhotoDisplayController: BaseController { }else if(selectedIndex == 3){ //交叉眼 - let newpb = joinImages( leftImage:rciImage , rightImage:lciImage ) let lastImg = convertCIImageToUIImage(ciImage: newpb)! DispatchQueue.main.async { [weak self] in self!.mImgView.image = lastImg } } - -// if selectedIndex != 0 { -// SVProgressHUD.showInfo(withStatus: "串流VR眼镜建设中") -// } -// if let imv = externalImageView { -// imv.image = mImgView.image -// imv.image = mImgView.image -// self.externalWindow.layoutIfNeeded() -// self.externalWindow.viewController()?.view.setNeedsDisplay() -// -// } } //MARK: - 判断是不是空间照片