diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 0a59f68..3bef600 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 55249c6..1db2ebd 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -46,8 +46,8 @@ filePath = "SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "140" - endingLineNumber = "140" + startingLineNumber = "141" + endingLineNumber = "141" landmarkName = "init(menuWidth:arrow:datas:configures:dissMissCallback:)" landmarkType = "7"> @@ -467,8 +467,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "375" - endingLineNumber = "375" + startingLineNumber = "385" + endingLineNumber = "385" landmarkName = "notification_didActiveNotification(notification:)" landmarkType = "7"> @@ -642,10 +642,42 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "619" - endingLineNumber = "619" + startingLineNumber = "629" + endingLineNumber = "629" landmarkName = "navgationButtonClick2(sender:)" landmarkType = "7"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift index 7957f8e..7203395 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift @@ -223,13 +223,16 @@ class CCSpatialPhotoDisplayController: BaseController { mTopImgView.isHidden = false edBtn?.isHidden = false menuView.isLandspaceScreen = false - menuView.dismiss() + let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenWidth*0.5, navtionImgView!.bottom), to: KWindow) + menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen) break case .landscapeLeft , .landscapeRight: isLandscape = true menuView.isLandspaceScreen = true menuView.dismiss() + let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenHeight*0.5, navtionImgView!.bottom), to: KWindow) + menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen) print("Landscape ...") navtionBar?.snp.updateConstraints { make in make.top.equalToSuperview().offset(-30) @@ -251,8 +254,7 @@ class CCSpatialPhotoDisplayController: BaseController { print("Other") } - let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenHeight*0.5, navtionImgView!.bottom), to: KWindow) - menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen) + } diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index ad3427a..ce34059 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -285,10 +285,18 @@ class CCSpatialVideoDisplayController: BaseController { self.navtionBar?.isHidden = false self.customPlayer.isLandscape = false mTopImgView.isHidden = false + menuView.isLandspaceScreen = false + menuView.dismiss() + let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenWidth*0.5, navtionImgView!.bottom), to: KWindow) + menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen) break case .landscapeLeft , .landscapeRight: print("Landscape ...") self.customPlayer.isLandscape = true + menuView.isLandspaceScreen = true + menuView.dismiss() + let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenHeight*0.5, navtionImgView!.bottom), to: KWindow) + menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen) self.customPlayer.snp.updateConstraints { make in make.height.equalTo(KScreenWidth) } @@ -304,6 +312,8 @@ class CCSpatialVideoDisplayController: BaseController { default: print("Other") } + + } func configureUI(){ diff --git a/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift b/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift index 8156a87..b9e14b7 100644 --- a/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift +++ b/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift @@ -73,7 +73,8 @@ public class CCSpatialDisplayTypeView: UIView { private var myFrame:CGRect! //tableview frame private var arrowView : UIView! = nil var isLandspaceScreen = false { - didSet{ + willSet{ + print("isLandspaceScreen willset:\(isLandspaceScreen)") if isLandspaceScreen { self.frame = CGRect(origin: .zero, size: CGSize(width: KScrH, height: KScrW)) } @@ -205,12 +206,15 @@ public class CCSpatialDisplayTypeView: UIView { //MARK: - 设置UI func initViews() { + self.subviews.forEach { v in + v.removeFromSuperview() + } self.backgroundColor = UIColor.black.withAlphaComponent(popMenuOutAlpha) let arrowPs = getArrowPoints() myFrame.origin = arrowPs.3 let isarrowUP = arrowPs.4 - print(arrowPs) +// print(arrowPs) //箭头 arrowView=UIView(frame: CGRect(x: myFrame.origin.x, y: isarrowUP ? myFrame.origin.y-arrowViewHeight : myFrame.origin.y+myFrame.height, width: myFrame.width, height: arrowViewHeight)) let layer=CAShapeLayer()