diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 0b46cac..a6019dc 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 d31f9a4..0dbb94d 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/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" - endingLineNumber = "256" + startingLineNumber = "260" + endingLineNumber = "260" landmarkName = "getImgWithScale(image:scale:)" landmarkType = "7"> + + + + + + diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift index 0569162..240b12a 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift +++ b/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 } //显示调节瞳距、缩放的界面 diff --git a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift index 2177781..dfe6c00 100644 --- a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift +++ b/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 - if let iv = imageView { - iv.image = image +// var imageView = KWindow?.viewWithTag(9988) as? UIImageView +// if let iv = imageView { +// 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)) - imageView?.tag = 9988 - imageView?.backgroundColor = .red - imageView?.contentMode = .scaleAspectFit - imageView?.clipsToBounds = true - imageView?.image = image - KWindow?.addSubview(imageView!) + + line = UIView() + KWindow?.addSubview(line!) + line?.backgroundColor = .red + line!.snp.makeConstraints { make in + make.centerX.equalToSuperview() + make.width.equalTo(2) + make.top.bottom.equalToSuperview() } }