ccspatialphotodisplaycontroller中,去掉无用代码;并且在展示2d时,无须进行图像选择,uiimageview会自动根据图片方向进行校正图片方向
This commit is contained in:
parent
c517a6ede6
commit
c26908cfac
@ -29,13 +29,13 @@ class CCSpatialPhotoDisplayController: BaseController {
|
|||||||
|
|
||||||
var externalImageView:UIImageView?
|
var externalImageView:UIImageView?
|
||||||
|
|
||||||
var player:AVPlayer = AVPlayer()
|
// var player:AVPlayer = AVPlayer()
|
||||||
|
|
||||||
var outputVideoURL:URL?
|
var outputVideoURL:URL?
|
||||||
var dvc:UIDocumentViewController?
|
var dvc:UIDocumentViewController?
|
||||||
|
|
||||||
//图片源数据
|
//图片源数据
|
||||||
var photoOriginalURL:URL?
|
// var photoOriginalURL:URL?
|
||||||
var photoOriginalData:Data?
|
var photoOriginalData:Data?
|
||||||
var imageAsset:PHAsset?
|
var imageAsset:PHAsset?
|
||||||
|
|
||||||
@ -102,16 +102,9 @@ class CCSpatialPhotoDisplayController: BaseController {
|
|||||||
let imageView = UIImageView()
|
let imageView = UIImageView()
|
||||||
imageView.frame = CGRect.init(x: 0, y: 250, width: self.view.frame.size.width, height: 240)
|
imageView.frame = CGRect.init(x: 0, y: 250, width: self.view.frame.size.width, height: 240)
|
||||||
imageView.contentMode = .scaleAspectFit
|
imageView.contentMode = .scaleAspectFit
|
||||||
// imageView.backgroundColor = UIColor.hexStringToColor(hexString: "#383739")
|
|
||||||
imageView.backgroundColor = UIColor.clear
|
imageView.backgroundColor = UIColor.clear
|
||||||
|
|
||||||
|
|
||||||
// let image = UIImage(contentsOfFile: photoOriginalURL!.path)
|
|
||||||
// imageView.image = image
|
|
||||||
imageView.isUserInteractionEnabled = true
|
imageView.isUserInteractionEnabled = true
|
||||||
// let tapGesture = UITapGestureRecognizer(target: self, action: #selector(imageTapped(_:)))
|
|
||||||
// imageView.addGestureRecognizer(tapGesture)
|
|
||||||
|
|
||||||
return imageView
|
return imageView
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@ -171,20 +164,11 @@ class CCSpatialPhotoDisplayController: BaseController {
|
|||||||
|
|
||||||
//获取图片源数据
|
//获取图片源数据
|
||||||
var originalData:Data?
|
var originalData:Data?
|
||||||
if photoOriginalURL != nil {
|
originalData = photoOriginalData
|
||||||
do {
|
|
||||||
originalData = try Data(contentsOf: photoOriginalURL!)
|
|
||||||
}catch let error as NSError {
|
|
||||||
print(error)
|
|
||||||
}
|
|
||||||
}else if photoOriginalData != nil {
|
|
||||||
originalData = photoOriginalData
|
|
||||||
}
|
|
||||||
|
|
||||||
imgData = originalData
|
imgData = originalData
|
||||||
//展示
|
//展示
|
||||||
var image = UIImage(data: originalData!)
|
var image = UIImage(data: originalData!)
|
||||||
image = image?.getUpImg()
|
|
||||||
mImgView.image = image
|
mImgView.image = image
|
||||||
|
|
||||||
|
|
||||||
@ -332,7 +316,7 @@ class CCSpatialPhotoDisplayController: BaseController {
|
|||||||
// 处理分段选择器值改变事件
|
// 处理分段选择器值改变事件
|
||||||
|
|
||||||
print("选中了第 \(selectedIndex) 个选项")
|
print("选中了第 \(selectedIndex) 个选项")
|
||||||
player.pause()
|
// player.pause()
|
||||||
NotificationCenter.default.removeObserver(self)
|
NotificationCenter.default.removeObserver(self)
|
||||||
mImgView.frame = CGRect.init(x: 0, y: 200, width: self.view.frame.size.width, height: 240)
|
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){
|
if(selectedIndex == 0){
|
||||||
//空间照片 --- 单眼2D(展示原照片或者广角或者主摄其中一个)
|
//空间照片 --- 单眼2D(展示原照片或者广角或者主摄其中一个)
|
||||||
var image = UIImage(data: photoOriginalData!)
|
var image = UIImage(data: photoOriginalData!)
|
||||||
image = image?.getUpImg()
|
|
||||||
mImgView.image = image
|
mImgView.image = image
|
||||||
|
|
||||||
}else if(selectedIndex == 1){
|
}else if(selectedIndex == 1){
|
||||||
@ -370,7 +353,6 @@ class CCSpatialPhotoDisplayController: BaseController {
|
|||||||
|
|
||||||
}else if(selectedIndex == 2){
|
}else if(selectedIndex == 2){
|
||||||
//红蓝立体
|
//红蓝立体
|
||||||
// mImgView.frame = CGRect.init(x: 0, y: 180, width: self.view.frame.size.width, height: 380)
|
|
||||||
let redColorMatrix: [CGFloat] = [
|
let redColorMatrix: [CGFloat] = [
|
||||||
0.0, 0.0, 0.0, 0.0, 0.0, // 红色通道
|
0.0, 0.0, 0.0, 0.0, 0.0, // 红色通道
|
||||||
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")!
|
let compositeFilter = CIFilter(name: "CIScreenBlendMode")!
|
||||||
compositeFilter.setValue(redOutputImage, forKey: kCIInputImageKey)
|
compositeFilter.setValue(redOutputImage, forKey: kCIInputImageKey)
|
||||||
compositeFilter.setValue(blueOutputImage, forKey: kCIInputBackgroundImageKey)
|
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!
|
let lastImg = compositeFilter.outputImage!
|
||||||
DispatchQueue.main.async { [weak self] in
|
DispatchQueue.main.async { [weak self] in
|
||||||
var ri = UIImage(ciImage: lastImg)
|
var ri = UIImage(ciImage: lastImg)
|
||||||
@ -428,24 +401,12 @@ class CCSpatialPhotoDisplayController: BaseController {
|
|||||||
|
|
||||||
}else if(selectedIndex == 3){
|
}else if(selectedIndex == 3){
|
||||||
//交叉眼
|
//交叉眼
|
||||||
|
|
||||||
let newpb = joinImages( leftImage:rciImage , rightImage:lciImage )
|
let newpb = joinImages( leftImage:rciImage , rightImage:lciImage )
|
||||||
let lastImg = convertCIImageToUIImage(ciImage: newpb)!
|
let lastImg = convertCIImageToUIImage(ciImage: newpb)!
|
||||||
DispatchQueue.main.async { [weak self] in
|
DispatchQueue.main.async { [weak self] in
|
||||||
self!.mImgView.image = lastImg
|
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: - 判断是不是空间照片
|
//MARK: - 判断是不是空间照片
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user