From 8d7aecad87f20a15b19df64dfeab05a1e30d3dec Mon Sep 17 00:00:00 2001 From: bluesea <307723040@qq.com> Date: Tue, 30 Apr 2024 17:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B6=E9=83=A8=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=AE=AD=E5=A4=B4=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95=E5=AE=BD=E5=BA=A6=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=B8=BAclear?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CCSpatialPhotoDisplayController.swift | 2 +- .../CCSpatialVideoDisplayController.swift | 3 +- .../CCSpatialDisplayTypeView.swift | 29 ++++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift index 722a18e..a0877db 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift @@ -175,7 +175,7 @@ class CCSpatialPhotoDisplayController: BaseController { //init (test随机生成点位置，注意：arrow点是基于屏幕的位置) let pointOnScreen = navtionImgView!.convert(CGPointMake(navtionImgView!.centerX, navtionImgView!.bottom), to: KWindow) - let popMenu = CCSpatialDisplayTypeView(menuWidth: SCREEN_Width * 0.4, arrow: pointOnScreen, datas: typeData,configures: parameters){ [weak self] in + let popMenu = CCSpatialDisplayTypeView(menuWidth: mTopCenterTypeButton.width, arrow: pointOnScreen, datas: typeData,configures: parameters){ [weak self] in //dissmiss回调 self?.mTopCenterTypeButton.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal) } diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index df6da2f..c68f397 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -186,7 +186,7 @@ class CCSpatialVideoDisplayController: BaseController { //init (test随机生成点位置，注意：arrow点是基于屏幕的位置) let pointOnScreen = navtionImgView!.convert(CGPointMake(navtionImgView!.centerX, navtionImgView!.bottom), to: KWindow) - let popMenu = CCSpatialDisplayTypeView(menuWidth: SCREEN_Width * 0.4, arrow: pointOnScreen, datas: typeData,configures: parameters){[weak self] in + let popMenu = CCSpatialDisplayTypeView(menuWidth: mTopCenterTypeButton.width, arrow: pointOnScreen, datas: typeData,configures: parameters){[weak self] in //dissmiss回调 self?.mTopCenterTypeButton.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal) } @@ -303,6 +303,7 @@ class CCSpatialVideoDisplayController: BaseController { menuView.isLandspaceScreen = true menuView.dismiss() let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenHeight*0.5, navtionImgView!.bottom), to: KWindow) +// pointOnScreen = CGPoint(x: pointOnScreen.x, y: pointOnScreen.y - 40) menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen) self.customPlayer.snp.updateConstraints { make in make.height.equalTo(KScreenWidth) diff --git a/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift b/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift index 112daa0..6b5f48e 100644 --- a/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift +++ b/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift @@ -229,23 +229,24 @@ public class CCSpatialDisplayTypeView: UIView { self.frame = UIScreen.main.bounds } - self.backgroundColor = UIColor.black.withAlphaComponent(popMenuOutAlpha) + self.backgroundColor = .clear//UIColor.black.withAlphaComponent(popMenuOutAlpha) let arrowPs = getArrowPoints() myFrame.origin = arrowPs.3 - let isarrowUP = arrowPs.4 -// 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() - let path=UIBezierPath() - path.move(to: arrowPs.0) - path.addLine(to: arrowPs.1) - path.addLine(to: arrowPs.2) - layer.path=path.cgPath - layer.fillColor = popMenuBgColor.cgColor - arrowView.layer.addSublayer(layer) - self.addSubview(arrowView) + myFrame.origin.y = myFrame.origin.y //- arrowViewHeight +// let isarrowUP = arrowPs.4 +//// 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() +// let path=UIBezierPath() +// path.move(to: arrowPs.0) +// path.addLine(to: arrowPs.1) +// path.addLine(to: arrowPs.2) +// layer.path=path.cgPath +// layer.fillColor = popMenuBgColor.cgColor +// arrowView.layer.addSublayer(layer) +// self.addSubview(arrowView) tableView=UITableView(frame: CGRect(x: myFrame.origin.x,y: myFrame.origin.y,width: myFrame.width,height: myFrame.height), style: .grouped) tableView.register(CCSpatialDisplayTypeCell.classForCoder(), forCellReuseIdentifier: CCSpatialDisplayTypeView.cellID)