准备处理横竖屏

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

@@ -657,10 +657,42 @@
             filePath = "SwiftProject/Project/Util/PlayByTransferConvertor.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
+            startingLineNumber = "260"
-            endingLineNumber = "256"
+            endingLineNumber = "260"
             landmarkName = "getImgWithScale(image:scale:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "33963580-0C7F-4FE4-AE70-F6DF35741254 - 93a5385675665f6e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "SwiftProject.PlayByTransferConvertor.getImgWithScale(image: __C.UIImage, scale: CoreGraphics.CGFloat) -&gt; (__C.UIImage, __C.CGSize)"
+                  moduleName = "SwiftProject"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "256"
+                  endingLineNumber = "256"
+                  offsetFromSymbolStart = "1056">
+               </Location>
+               <Location
+                  uuid = "33963580-0C7F-4FE4-AE70-F6DF35741254 - e6cd3874189e0e8a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "SwiftProject.PlayByTransferConvertor.joinImages_backup(leftImage: __C.CIImage, rightImage: __C.CIImage) -&gt; __C.CIImage"
+                  moduleName = "SwiftProject"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "256"
+                  endingLineNumber = "256"
+                  offsetFromSymbolStart = "572">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift

@@ -169,7 +169,7 @@ class ZZHCustomPlayer: UIView {
             make.left.equalToSuperview().offset(24)
 //            make.right.equalToSuperview().offset(-24)
             make.bottom.equalToSuperview().offset(0)
-            make.height.equalTo(120)
+            make.height.equalTo(114)
         }
         
         edBtn = UIButton()
@@ -179,9 +179,11 @@ class ZZHCustomPlayer: UIView {
         edBtn!.snp.makeConstraints { make in
             make.centerY.equalTo(timeSlider!.snp.centerY)
             make.width.height.equalTo(40)
-            make.right.equalToSuperview().offset(-24)
+            make.right.equalToSuperview().offset(-10)
             make.left.equalTo(timeSlider!.snp.right).offset(24)
         }
+        
+        self.backgroundColor = .orange
     }
     
     //显示调节瞳距、缩放的界面

SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift

@@ -204,10 +204,13 @@ class PlayByTransferConvertor {
         if (ed > 0) {//左视图宽度减小,同时x点的坐标值为0;右视图宽度减小,同时x点的坐标值增加
             ed_left.draw(in: CGRect(x:0, y:(imageHeight - n_left_size.height) * 0.5, width:last_left_size.width, height:last_left_size.height))
             ed_right.draw(in: CGRect(x:left.size.width*0.5 + x_offset, y:(imageHeight - n_right_size.height) * 0.5, width:last_right_size.width, height:last_right_size.height))
+            
+            print("ed>>>>> 0....")
         }
         else if (ed  < 0) {
             ed_left.draw(in: CGRect(x:x_offset, y:(imageHeight - n_left_size.height) * 0.5, width:last_left_size.width, height:last_left_size.height))
             ed_right.draw(in: CGRect(x:left.size.width*0.5, y:(imageHeight - n_right_size.height) * 0.5, width:last_right_size.width, height:last_right_size.height))
+            print("ed < 0....")
         }
         else {//瞳距没有改变的情况
             let leftRect = CGRect(x:(imageWidth - n_left_size.width) * 0.5, y:(imageHeight - n_left_size.height) * 0.5 , width:n_left_size.width, height:n_left_size.height)
@@ -216,7 +219,7 @@ class PlayByTransferConvertor {
             let rightRect = CGRect(x:imageWidth + (imageWidth - n_right_size.width) * 0.5 , y:(imageHeight - n_right_size.height) * 0.5, width:n_right_size.width, height:n_right_size.height)
             ed_right.draw(in:rightRect )
             
-            print("imageWidth:\(imageWidth) \ned_left.size:\(ed_left.size) \nl:\(leftRect) \nr:\(rightRect)")
+            print("newImageSize:\(newImageSize)  \nimageWidth:\(imageWidth) \ned_left.size:\(ed_left.size) \nleftRect:\(leftRect) \nrightRect:\(rightRect)")
         }
         
         
@@ -251,8 +254,9 @@ class PlayByTransferConvertor {
         else if scale < 1 {//图片不会被裁减,但size会被缩小
             //计算被等比缩小的size
             newSize = CGSizeMake(scale*originSize.width, scale*originSize.height)
+//            newImage = image.imageAtRect(rect: CGRect(origin: .zero, size: image.size))!
         }
-        
+        testImageUi(image: newImage)
         return (newImage,newSize)
     }
     
@@ -273,18 +277,31 @@ class PlayByTransferConvertor {
     
     func testImageUi(image:UIImage) {
         DispatchQueue.main.async {
-            var imageView = KWindow?.viewWithTag(9988) as? UIImageView
+//            var imageView = KWindow?.viewWithTag(9988) as? UIImageView
-            if let iv = imageView {
+//            if let iv = imageView {
-                iv.image = image
+//                iv.image = image
+//            }
+//            else {
+//                imageView = UIImageView(frame: CGRect(x: 20, y: 100, width: KScreenWidth*0.5, height: 260))
+//                imageView?.tag = 9988
+//                imageView?.backgroundColor = .red
+//                imageView?.contentMode = .scaleAspectFit
+//                imageView?.clipsToBounds = true
+//                imageView?.image = image
+//                KWindow?.addSubview(imageView!)
+//            }
+            var line = KWindow?.viewWithTag(9981 ) as? UIView
+            guard line == nil else {
+                return
             }
-            else {
+            
-                imageView = UIImageView(frame: CGRect(x: 20, y: 100, width: KScreenWidth*0.5, height: 260))
+            line = UIView()
-                imageView?.tag = 9988
+            KWindow?.addSubview(line!)
-                imageView?.backgroundColor = .red
+            line?.backgroundColor = .red
-                imageView?.contentMode = .scaleAspectFit
+            line!.snp.makeConstraints { make in
-                imageView?.clipsToBounds = true
+                make.centerX.equalToSuperview()
-                imageView?.image = image
+                make.width.equalTo(2)
-                KWindow?.addSubview(imageView!)
+                make.top.bottom.equalToSuperview()
             }
         }