部分优化

SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -632,21 +632,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2EE723C5-DE77-4E27-9444-4ED6E6C107FA"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "188"
-            endingLineNumber = "188"
-            landmarkName = "showEDView(sender:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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,6 +190,11 @@ class ZZHCustomPlayer: UIView {
             self?.currentScale = scale
         }, edCallback: {[weak self] ed in
             self?.currentED = ed
+        },resetCallback:{[weak self] in
+            self?.currentScale = 1.0
+            self?.currentED = 0
+        }, dismissCallback:{[weak self] in
+            self?.saveParams()
         },scale: currentScale, ed: currentED)
     }
     

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)
         }
     }
     

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)
+//        let dRect = CGSizeMake(imgWidth, image.size.height)
-        UIGraphicsBeginImageContextWithOptions(dRect, false, 1);
+//
-        image.draw(in: CGRectMake((dRect.width - imgWidth)*0.5, 0, imgWidth, dRect.height))
+//        UIGraphicsBeginImageContextWithOptions(dRect, false, 1);
-        let newImage = UIGraphicsGetImageFromCurrentImageContext()!
+//        image.draw(in: CGRectMake((image.size.width - imgWidth)*0.5, 0, image.size.width, dRect.height))
-        UIGraphicsEndImageContext();
+//        let newImage = UIGraphicsGetImageFromCurrentImageContext()!
-        return newImage
+//        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 {