ccspatialphotodisplaycontroller中,去掉无用代码;并且在展示2d时,无须进行图像选择,uiimageview会自动根据图片方向进行校正图片方向

This commit is contained in:
bluesea 2024-03-26 11:33:54 +08:00
parent c517a6ede6
commit c26908cfac

View File

@ -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: -