去掉顶部菜单箭头、修改顶部菜单宽度、修改顶部菜单背景颜色为clear
This commit is contained in:
parent
0fe9e74cec
commit
8d7aecad87
@ -175,7 +175,7 @@ class CCSpatialPhotoDisplayController: BaseController {
|
|||||||
|
|
||||||
//init (test随机生成点位置,注意:arrow点是基于屏幕的位置)
|
//init (test随机生成点位置,注意:arrow点是基于屏幕的位置)
|
||||||
let pointOnScreen = navtionImgView!.convert(CGPointMake(navtionImgView!.centerX, navtionImgView!.bottom), to: KWindow)
|
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回调
|
//dissmiss回调
|
||||||
self?.mTopCenterTypeButton.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal)
|
self?.mTopCenterTypeButton.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -186,7 +186,7 @@ class CCSpatialVideoDisplayController: BaseController {
|
|||||||
|
|
||||||
//init (test随机生成点位置,注意:arrow点是基于屏幕的位置)
|
//init (test随机生成点位置,注意:arrow点是基于屏幕的位置)
|
||||||
let pointOnScreen = navtionImgView!.convert(CGPointMake(navtionImgView!.centerX, navtionImgView!.bottom), to: KWindow)
|
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回调
|
//dissmiss回调
|
||||||
self?.mTopCenterTypeButton.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal)
|
self?.mTopCenterTypeButton.setImage(UIImage.init(named: "type_button_arrow_down"), for: .normal)
|
||||||
}
|
}
|
||||||
@ -303,6 +303,7 @@ class CCSpatialVideoDisplayController: BaseController {
|
|||||||
menuView.isLandspaceScreen = true
|
menuView.isLandspaceScreen = true
|
||||||
menuView.dismiss()
|
menuView.dismiss()
|
||||||
let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenHeight*0.5, navtionImgView!.bottom), to: KWindow)
|
let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenHeight*0.5, navtionImgView!.bottom), to: KWindow)
|
||||||
|
// pointOnScreen = CGPoint(x: pointOnScreen.x, y: pointOnScreen.y - 40)
|
||||||
menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen)
|
menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen)
|
||||||
self.customPlayer.snp.updateConstraints { make in
|
self.customPlayer.snp.updateConstraints { make in
|
||||||
make.height.equalTo(KScreenWidth)
|
make.height.equalTo(KScreenWidth)
|
||||||
|
|||||||
@ -229,23 +229,24 @@ public class CCSpatialDisplayTypeView: UIView {
|
|||||||
self.frame = UIScreen.main.bounds
|
self.frame = UIScreen.main.bounds
|
||||||
}
|
}
|
||||||
|
|
||||||
self.backgroundColor = UIColor.black.withAlphaComponent(popMenuOutAlpha)
|
self.backgroundColor = .clear//UIColor.black.withAlphaComponent(popMenuOutAlpha)
|
||||||
|
|
||||||
let arrowPs = getArrowPoints()
|
let arrowPs = getArrowPoints()
|
||||||
myFrame.origin = arrowPs.3
|
myFrame.origin = arrowPs.3
|
||||||
let isarrowUP = arrowPs.4
|
myFrame.origin.y = myFrame.origin.y //- arrowViewHeight
|
||||||
// print(arrowPs)
|
// 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()
|
// 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 path=UIBezierPath()
|
// let layer=CAShapeLayer()
|
||||||
path.move(to: arrowPs.0)
|
// let path=UIBezierPath()
|
||||||
path.addLine(to: arrowPs.1)
|
// path.move(to: arrowPs.0)
|
||||||
path.addLine(to: arrowPs.2)
|
// path.addLine(to: arrowPs.1)
|
||||||
layer.path=path.cgPath
|
// path.addLine(to: arrowPs.2)
|
||||||
layer.fillColor = popMenuBgColor.cgColor
|
// layer.path=path.cgPath
|
||||||
arrowView.layer.addSublayer(layer)
|
// layer.fillColor = popMenuBgColor.cgColor
|
||||||
self.addSubview(arrowView)
|
// 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=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)
|
tableView.register(CCSpatialDisplayTypeCell.classForCoder(), forCellReuseIdentifier: CCSpatialDisplayTypeView.cellID)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user