diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate
index 3bef600..76ad8e0 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 1db2ebd..bd9cb35 100644
--- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -467,8 +467,8 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "385"
- endingLineNumber = "385"
+ startingLineNumber = "413"
+ endingLineNumber = "413"
landmarkName = "notification_didActiveNotification(notification:)"
landmarkType = "7">
@@ -642,8 +642,8 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "629"
- endingLineNumber = "629"
+ startingLineNumber = "657"
+ endingLineNumber = "657"
landmarkName = "navgationButtonClick2(sender:)"
landmarkType = "7">
@@ -677,6 +677,21 @@
endingLineNumber = "626"
offsetFromSymbolStart = "920">
+
+
@@ -690,8 +705,8 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "667"
- endingLineNumber = "667"
+ startingLineNumber = "695"
+ endingLineNumber = "695"
landmarkName = "selectedSpatialType(selectedIndex:)"
landmarkType = "7">
@@ -725,6 +740,21 @@
endingLineNumber = "664"
offsetFromSymbolStart = "52">
+
+
@@ -773,6 +803,21 @@
endingLineNumber = "171"
offsetFromSymbolStart = "4340">
+
+
@@ -821,6 +866,21 @@
endingLineNumber = "170"
offsetFromSymbolStart = "4008">
+
+
@@ -834,10 +894,42 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "606"
- endingLineNumber = "606"
+ startingLineNumber = "634"
+ endingLineNumber = "634"
landmarkName = "navgationButtonClick2(sender:)"
landmarkType = "7">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift
index ce34059..df6da2f 100644
--- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift
+++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift
@@ -84,6 +84,9 @@ class CCSpatialVideoDisplayController: BaseController {
}
}
+ //增加一个瞳距、缩放的调节按钮
+ var edBtn:UIButton?
+
var selectedIndex:SpatialType = .parallelEyes//记录当前选择的菜单选项
{
didSet{
@@ -190,12 +193,12 @@ class CCSpatialVideoDisplayController: BaseController {
return popMenu
}()
- lazy var progressView: UIProgressView = {
- var view = UIProgressView (progressViewStyle:.default)
- view.frame = CGRect(x: 24, y: SCREEN_Height - KStatusBarHeight - 20, width: SCREEN_Width-48, height: 36)
- view.progress = 0.0 //默认进度50%
- return view
- }()
+// lazy var progressView: UIProgressView = {
+// var view = UIProgressView (progressViewStyle:.default)
+// view.frame = CGRect(x: 24, y: SCREEN_Height - KStatusBarHeight - 20, width: SCREEN_Width-48, height: 36)
+// view.progress = 0.0 //默认进度50%
+// return view
+// }()
lazy var tipsButton: UIButton = {
@@ -208,7 +211,7 @@ class CCSpatialVideoDisplayController: BaseController {
let img2:UIImage = UIImage.init(named: NSLocalizedString("displayvc_desc", comment: ""))!
button.setImage(img2, for: UIControl.State.normal)
button.frame = CGRect(x: 0, y: 0, width: 173, height: 42)
- button.centerY = progressView.top - 70
+ button.centerY = KScreenHeight - 120
button.centerX = self.view.centerX
return button
@@ -289,6 +292,10 @@ class CCSpatialVideoDisplayController: BaseController {
menuView.dismiss()
let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenWidth*0.5, navtionImgView!.bottom), to: KWindow)
menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen)
+ edBtn!.snp.updateConstraints { make in
+ make.centerY.equalTo((edBtn?.superview!.snp.bottom)!).offset( -120)
+ }
+ edBtn?.isHidden = false
break
case .landscapeLeft , .landscapeRight:
print("Landscape ...")
@@ -308,6 +315,7 @@ class CCSpatialVideoDisplayController: BaseController {
self.customPlayer.layoutViewWhenScreenLandscape(value: true)
self.navtionBar?.isHidden = true
mTopImgView.isHidden = true
+ edBtn?.isHidden = true
break
default:
print("Other")
@@ -343,6 +351,18 @@ class CCSpatialVideoDisplayController: BaseController {
}
self.view.addSubview(tipsButton)
+
+ edBtn = UIButton()
+ edBtn?.setImage(UIImage(named: "custom_TuningBtn"), for: .normal)
+ edBtn?.addTarget(self, action: #selector(showEDView(sender:)), for: .touchUpInside)
+ self.view.addSubview(edBtn!)
+ edBtn!.snp.makeConstraints { make in
+ make.centerY.equalTo((edBtn?.superview!.snp.bottom)!).offset( -120)
+ make.width.height.equalTo(40)
+ make.right.equalToSuperview().offset(-20)
+ }
+
+
self.view.addSubview(self.customPlayer)
self.customPlayer.snp.makeConstraints { make in
make.left.right.centerY.equalToSuperview()
@@ -374,6 +394,14 @@ class CCSpatialVideoDisplayController: BaseController {
NotificationCenter.default.addObserver(self, selector: #selector(notification_didActiveNotification(notification: )), name: UIApplication.didBecomeActiveNotification, object: nil)
}
+ @objc func showEDView(sender:UIButton) {
+ print("showedview....")
+ customPlayer.showEDView(sender: edBtn!)
+
+ }
+
+
+
//屏幕进入后台
@objc func notification_didEnterBackgroundNotification(notification:Notification) {
// player?.pause()
diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
index 3a466c6..f4ef607 100644
--- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
+++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
@@ -17,7 +17,11 @@ class ZZHCustomPlayer: UIView {
//点击maskview 的回调,主要用于方向旋转
var maskViewTapCallback:CustomMaskViewTapCallback?
//标记是否为横屏
- var isLandscape:Bool = false
+ var isLandscape:Bool = false {
+ didSet {
+ updateEDBtnHeight()
+ }
+ }
//标记是否正在串流中:目前就是用于控制是否显示瞳距调节的slider部分
var isPlayingOnExternalScreen = false
//视频资源
@@ -201,7 +205,7 @@ class ZZHCustomPlayer: UIView {
self.addSubview(edBtn!)
edBtn!.snp.makeConstraints { make in
make.centerY.equalTo(timeSlider!.snp.centerY)
- make.width.height.equalTo(40)
+ make.width.height.equalTo(0)
make.right.equalToSuperview().offset(-10)
make.left.equalTo(timeSlider!.snp.right).offset(24)
}
@@ -209,6 +213,13 @@ class ZZHCustomPlayer: UIView {
}
+ func updateEDBtnHeight() {
+ edBtn?.snp.updateConstraints { make in
+ make.width.height.equalTo(isLandscape ? 40 : 0)
+ }
+ self.layoutIfNeeded()
+ }
+
//屏幕旋转时自动隐藏timeSlider、edBtn,同时将播放layer设置为全屏
func layoutViewWhenScreenLandscape(value:Bool) {
if value {
diff --git a/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift b/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift
index b9e14b7..95c1cd4 100644
--- a/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift
+++ b/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift
@@ -73,7 +73,7 @@ public class CCSpatialDisplayTypeView: UIView {
private var myFrame:CGRect! //tableview frame
private var arrowView : UIView! = nil
var isLandspaceScreen = false {
- willSet{
+ didSet{
print("isLandspaceScreen willset:\(isLandspaceScreen)")
if isLandspaceScreen {
self.frame = CGRect(origin: .zero, size: CGSize(width: KScrH, height: KScrW))