3-group-ios/VPCamera3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

图片浏览，进入首选项改为平行眼

Browse Source
This commit is contained in:
bluesea 2024-03-27 14:28:45 +08:00
parent 8481f8988a
commit 17c88b6222
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController.swift
View File

@ -92,7 +92,7 @@ class CCSpatialPhotoDisplayController: BaseController {
button.layer.cornerRadius = 18 button.layer.cornerRadius = 18
button.layer.borderWidth = 1 button.layer.borderWidth = 1
button.layer.borderColor = UIColor.white.cgColor button.layer.borderColor = UIColor.white.cgColor
button.setTitle("单眼2D", for: UIControl.State.normal) button.setTitle("平行眼", for: UIControl.State.normal)
button.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal) button.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal)
button.updateBtnEdgeInsets(style: .Right, space: 10) button.updateBtnEdgeInsets(style: .Right, space: 10)
button.setTitleColor(UIColor.white, for: UIControl.State.normal) button.setTitleColor(UIColor.white, for: UIControl.State.normal)
@ -111,8 +111,9 @@ class CCSpatialPhotoDisplayController: BaseController {
return imageView return imageView
}() }()
var typeData:[(icon:String,title:String,isHiden:Bool)] = [(icon:"type_check",title:"单眼2D",isHiden:false), var typeData:[(icon:String,title:String,isHiden:Bool)] = [(icon:"type_check",title:"平行眼",isHiden:false),
(icon:"type_check",title:"平行眼",isHiden:false), (icon:"type_check",title:"单眼2D",isHiden:false),
(icon:"type_check",title:"红蓝立体",isHiden:false), (icon:"type_check",title:"红蓝立体",isHiden:false),
(icon:"type_check",title:"交叉眼",isHiden:false)] (icon:"type_check",title:"交叉眼",isHiden:false)]
@ -175,9 +176,9 @@ class CCSpatialPhotoDisplayController: BaseController {
imgData = originalData imgData = originalData
//展示 //展示
let image = UIImage(data: originalData!) let image = UIImage(data: originalData!)
mImgView.image = image // mImgView.image = image
imgOritentation = image?.imageOrientation ?? .left imgOritentation = image?.imageOrientation ?? .left
selectedSpatialType(selectedIndex: 0)
let isSpatial = isSpatialImage(originalData: originalData!) let isSpatial = isSpatialImage(originalData: originalData!)
if !isSpatial { if !isSpatial {
print("这不是一张空间图片") print("这不是一张空间图片")
@ -398,12 +399,12 @@ class CCSpatialPhotoDisplayController: BaseController {
let lciImage = CIImage(cgImage: frames.first!) let lciImage = CIImage(cgImage: frames.first!)
let rciImage = CIImage(cgImage: frames[1]) let rciImage = CIImage(cgImage: frames[1])
if(selectedIndex == 0){ if(selectedIndex == 1){
//空间照片 --- 单眼2D(展示原照片或者广角或者主摄其中一个) //空间照片 --- 单眼2D(展示原照片或者广角或者主摄其中一个)
let image = UIImage(data: photoOriginalData!) let image = UIImage(data: photoOriginalData!)
mImgView.image = image mImgView.image = image
}else if(selectedIndex == 1){ }else if(selectedIndex == 0){
//平行眼 //平行眼
let newpb = joinImages( leftImage: lciImage, rightImage:rciImage ) let newpb = joinImages( leftImage: lciImage, rightImage:rciImage )