diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 1a6ff84..9060bda 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 55b0ef9..33b80ab 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -632,21 +632,5 @@ landmarkType = "7"> - - - - diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift index cd90f36..283cfbd 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift @@ -41,7 +41,7 @@ class ZZHCustomPlayer: UIView { var timerForMaskView:Timer?//标记隐藏倒计时 var temScale:CGFloat = 1.0 var currentScale:CGFloat = 1.0//当前缩放值 - var currentED:Int = 5//当前的瞳距 + var currentED:Int = 0//当前的瞳距 let userdefaultValueKey_scale = "userdefaultValueKey_scale" let userdefaultValueKey_ed = "userdefaultValueKey_ed" @@ -87,15 +87,19 @@ class ZZHCustomPlayer: UIView { deinit { print("zzhcustomplayer deinit......") - UserDefaults.standard.setValue(currentScale, forKey: self.userdefaultValueKey_scale ) - UserDefaults.standard.setValue(currentED, forKey: self.userdefaultValueKey_ed) - UserDefaults.standard.synchronize() + saveParams() releaseVideoComposition() assetReader?.cancelReading() NotificationCenter.default.removeObserver(self) } + func saveParams(){ + UserDefaults.standard.setValue(currentScale, forKey: self.userdefaultValueKey_scale ) + UserDefaults.standard.setValue(currentED, forKey: self.userdefaultValueKey_ed) + UserDefaults.standard.synchronize() + } + func releaseVideoComposition() { self.avPlayer?.currentItem?.videoComposition = nil self.avPlayer?.replaceCurrentItem(with: nil) @@ -186,7 +190,12 @@ class ZZHCustomPlayer: UIView { self?.currentScale = scale }, edCallback: {[weak self] ed in self?.currentED = ed - }, scale: currentScale, ed: currentED) + },resetCallback:{[weak self] in + self?.currentScale = 1.0 + self?.currentED = 0 + }, dismissCallback:{[weak self] in + self?.saveParams() + },scale: currentScale, ed: currentED) } //通过slider进行seek播放时间点 diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift index 4a3a7db..e6ae799 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomSlider.swift @@ -311,11 +311,13 @@ class CCSlider: UIView{ typealias CustomParamBoardViewScaleCallback = (_ scale:CGFloat)->Void typealias CustomParamBoardViewEDCallback = (_ ed:Int)->Void typealias CustomParamBoardViewResetCallback = ()->Void +typealias CustomParamBoardViewDismissCallback = ()->Void class CustomParamBoardView: UIView { var scaleCallback:CustomParamBoardViewScaleCallback? var edCallback:CustomParamBoardViewEDCallback? var resetCallback:CustomParamBoardViewResetCallback? + var dismissCallback:CustomParamBoardViewDismissCallback? var scaleSlider:CCSlider? var scaleTitleLabel:UILabel? @@ -522,6 +524,10 @@ class CustomParamBoardView: UIView { //dismiss @objc func hidenView(sender:UITapGestureRecognizer) { + if let dismissCallback = self.dismissCallback { + dismissCallback() + } + UIView.animate(withDuration: 0.25) {[weak self] in self?.superBgView.snp.updateConstraints({ make in make.bottom.equalToSuperview().offset(self?.bgViewHeight ?? 400) @@ -534,10 +540,12 @@ class CustomParamBoardView: UIView { } - class func showBoard(scaleCallback:@escaping CustomParamBoardViewScaleCallback,edCallback:@escaping CustomParamBoardViewEDCallback,scale:CGFloat,ed:Int) { + class func showBoard(scaleCallback:@escaping CustomParamBoardViewScaleCallback,edCallback:@escaping CustomParamBoardViewEDCallback,resetCallback:@escaping CustomParamBoardViewResetCallback,dismissCallback:@escaping CustomParamBoardViewDismissCallback,scale:CGFloat,ed:Int) { let view = CustomParamBoardView(frame: .zero) view.scaleCallback = scaleCallback view.edCallback = edCallback + view.resetCallback = resetCallback + view.dismissCallback = dismissCallback view.exUpdateEDTitleLabelWith(currED: ed) view.exUpdateScaleTitleWithValue(resultValue: scale) KWindow?.addSubview(view) @@ -560,6 +568,8 @@ class CustomParamBoardView: UIView { @objc func resetParams(sender:UIButton) { if let rc = self.resetCallback { rc() + exUpdateScaleTitleWithValue(resultValue: 1.0) + exUpdateEDTitleLabelWith(currED: 0) } } diff --git a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift index 58b91bc..5057d4e 100644 --- a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift +++ b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift @@ -178,7 +178,7 @@ class PlayByTransferConvertor { func joinImages( leftImage:CIImage, rightImage:CIImage,scale:CGFloat,ed:Int) -> CIImage { //缩放参数,此处必须大于0.5 //瞳距参数,暂定 瞳距与像素点的比例为1:2,瞳距的值范围为 -30 ~ +30 之间的整数 - let edS = 30 //比列 + let edS = 15 //比列 let left = UIImage(ciImage: leftImage ) let right = UIImage(ciImage: rightImage ) @@ -234,12 +234,17 @@ class PlayByTransferConvertor { //图像瞳距 func getImgWithED(image:UIImage,imgWidth:CGFloat) -> UIImage { - let dRect = CGSizeMake(imgWidth, image.size.height) - UIGraphicsBeginImageContextWithOptions(dRect, false, 1); - image.draw(in: CGRectMake((dRect.width - imgWidth)*0.5, 0, imgWidth, dRect.height)) - let newImage = UIGraphicsGetImageFromCurrentImageContext()! - UIGraphicsEndImageContext(); - return newImage +// let dRect = CGSizeMake(imgWidth, image.size.height) +// +// UIGraphicsBeginImageContextWithOptions(dRect, false, 1); +// image.draw(in: CGRectMake((image.size.width - imgWidth)*0.5, 0, image.size.width, dRect.height)) +// let newImage = UIGraphicsGetImageFromCurrentImageContext()! +// UIGraphicsEndImageContext(); +// return newImage +// let dSize = CGSizeMake(imgWidth, image.size.height) + let dRect = CGRectMake((image.size.width - imgWidth) * 0.5, 0, imgWidth, image.size.height) + let newImage = image.imageAtRect(rect: dRect) + return newImage! } func joinImages_backup( leftImage:CIImage, rightImage:CIImage) -> CIImage {