3-group-ios/VPCamera3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整视频播放更多按钮的的位置

Browse Source
This commit is contained in:
bluesea 2024-04-29 18:16:19 +08:00
parent 5aa1a39a31
commit 57349ab719
5 changed files with 213 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

172
SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -467,8 +467,8 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "385" startingLineNumber = "413"
endingLineNumber = "385" endingLineNumber = "413"
landmarkName = "notification_didActiveNotification(notification:)" landmarkName = "notification_didActiveNotification(notification:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@ -642,8 +642,8 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "629" startingLineNumber = "657"
endingLineNumber = "629" endingLineNumber = "657"
landmarkName = "navgationButtonClick2(sender:)" landmarkName = "navgationButtonClick2(sender:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@ -677,6 +677,21 @@
endingLineNumber = "626" endingLineNumber = "626"
offsetFromSymbolStart = "920"> offsetFromSymbolStart = "920">
</Location> </Location>
<Location
uuid = "A1C134FD-F27C-4C32-9835-E1C81C6ADB12 - 43f01c3bc010fc56"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #2 (Swift.Int) -&gt; () in SwiftProject.CCSpatialVideoDisplayController.navgationButtonClick2(sender: __C.UIButton) -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "657"
endingLineNumber = "657"
offsetFromSymbolStart = "920">
</Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
@ -690,8 +705,8 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "667" startingLineNumber = "695"
endingLineNumber = "667" endingLineNumber = "695"
landmarkName = "selectedSpatialType(selectedIndex:)" landmarkName = "selectedSpatialType(selectedIndex:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@ -725,6 +740,21 @@
endingLineNumber = "664" endingLineNumber = "664"
offsetFromSymbolStart = "52"> offsetFromSymbolStart = "52">
</Location> </Location>
<Location
uuid = "C570719E-63A4-43FF-B822-56E182D55F24 - 6adcab4b43049994"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialVideoDisplayController.selectedSpatialType(selectedIndex: Swift.Int) -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "695"
endingLineNumber = "695"
offsetFromSymbolStart = "52">
</Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
@ -773,6 +803,21 @@
endingLineNumber = "171" endingLineNumber = "171"
offsetFromSymbolStart = "4340"> offsetFromSymbolStart = "4340">
</Location> </Location>
<Location
uuid = "2332D3C8-7CB7-4C2D-9D3C-D9A7D05737DE - 14547669f585fb72"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialDisplayTypeView.init(menuWidth: CoreGraphics.CGFloat, arrow: __C.CGPoint, datas: Swift.Array&lt;(icon: Swift.String, title: Swift.String, isHiden: Swift.Bool)&gt;, configures: Swift.Array&lt;SwiftProject.CCSpatialDisplayTypeConfigure&gt;, dissMissCallback: () -&gt; ()) -&gt; SwiftProject.CCSpatialDisplayTypeView"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "172"
endingLineNumber = "172"
offsetFromSymbolStart = "4340">
</Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
@ -821,6 +866,21 @@
endingLineNumber = "170" endingLineNumber = "170"
offsetFromSymbolStart = "4008"> offsetFromSymbolStart = "4008">
</Location> </Location>
<Location
uuid = "02F226A8-01C1-4FB7-8724-3FB114CBBC79 - 14547669f585fb1d"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialDisplayTypeView.init(menuWidth: CoreGraphics.CGFloat, arrow: __C.CGPoint, datas: Swift.Array&lt;(icon: Swift.String, title: Swift.String, isHiden: Swift.Bool)&gt;, configures: Swift.Array&lt;SwiftProject.CCSpatialDisplayTypeConfigure&gt;, dissMissCallback: () -&gt; ()) -&gt; SwiftProject.CCSpatialDisplayTypeView"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "171"
endingLineNumber = "171"
offsetFromSymbolStart = "4008">
</Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
@ -834,10 +894,42 @@
filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "606" startingLineNumber = "634"
endingLineNumber = "606" endingLineNumber = "634"
landmarkName = "navgationButtonClick2(sender:)" landmarkName = "navgationButtonClick2(sender:)"
landmarkType = "7"> landmarkType = "7">
<Locations>
<Location
uuid = "D98F3857-4C19-43E5-BF3F-36E1A8B7C5C1 - dd02be51299e6dbf"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialVideoDisplayController.navgationButtonClick2(sender: __C.UIButton) -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "603"
endingLineNumber = "603"
offsetFromSymbolStart = "2144">
</Location>
<Location
uuid = "D98F3857-4C19-43E5-BF3F-36E1A8B7C5C1 - dd02be51299e5180"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialVideoDisplayController.navgationButtonClick2(sender: __C.UIButton) -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "634"
endingLineNumber = "634"
offsetFromSymbolStart = "2144">
</Location>
</Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@ -854,6 +946,38 @@
endingLineNumber = "225" endingLineNumber = "225"
landmarkName = "screenOrientationRotate()" landmarkName = "screenOrientationRotate()"
landmarkType = "7"> landmarkType = "7">
<Locations>
<Location
uuid = "3EC02902-D13D-4894-8E99-D225CFD60753 - 7be2dad2210924a5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialPhotoDisplayController.screenOrientationRotate() -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "225"
endingLineNumber = "225"
offsetFromSymbolStart = "1672">
</Location>
<Location
uuid = "3EC02902-D13D-4894-8E99-D225CFD60753 - 7be2dad2210924a5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialPhotoDisplayController.screenOrientationRotate() -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "225"
endingLineNumber = "225"
offsetFromSymbolStart = "1848">
</Location>
</Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@ -870,6 +994,38 @@
endingLineNumber = "233" endingLineNumber = "233"
landmarkName = "screenOrientationRotate()" landmarkName = "screenOrientationRotate()"
landmarkType = "7"> landmarkType = "7">
<Locations>
<Location
uuid = "A656010D-92B9-41AF-AFCD-DFA1C59CBBE3 - 7be2dad2210925e3"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialPhotoDisplayController.screenOrientationRotate() -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "231"
endingLineNumber = "231"
offsetFromSymbolStart = "2008">
</Location>
<Location
uuid = "A656010D-92B9-41AF-AFCD-DFA1C59CBBE3 - 7be2dad22109265d"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SwiftProject.CCSpatialPhotoDisplayController.screenOrientationRotate() -&gt; ()"
moduleName = "SwiftProject"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialPhotoDisplayController/CCSpatialPhotoDisplayController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "233"
endingLineNumber = "233"
offsetFromSymbolStart = "3100">
</Location>
</Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
</Breakpoints> </Breakpoints>

42
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift
View File

@ -84,6 +84,9 @@ class CCSpatialVideoDisplayController: BaseController {
} }
} }
//增加一个瞳距、缩放的调节按钮
var edBtn:UIButton?
var selectedIndex:SpatialType = .parallelEyes//记录当前选择的菜单选项 var selectedIndex:SpatialType = .parallelEyes//记录当前选择的菜单选项
{ {
didSet{ didSet{
@ -190,12 +193,12 @@ class CCSpatialVideoDisplayController: BaseController {
return popMenu return popMenu
}() }()
lazy var progressView: UIProgressView = { // lazy var progressView: UIProgressView = {
var view = UIProgressView (progressViewStyle:.default) // var view = UIProgressView (progressViewStyle:.default)
view.frame = CGRect(x: 24, y: SCREEN_Height - KStatusBarHeight - 20, width: SCREEN_Width-48, height: 36) // view.frame = CGRect(x: 24, y: SCREEN_Height - KStatusBarHeight - 20, width: SCREEN_Width-48, height: 36)
view.progress = 0.0 //默认进度50% // view.progress = 0.0 //默认进度50%
return view // return view
}() // }()
lazy var tipsButton: UIButton = { lazy var tipsButton: UIButton = {
@ -208,7 +211,7 @@ class CCSpatialVideoDisplayController: BaseController {
let img2:UIImage = UIImage.init(named: NSLocalizedString("displayvc_desc", comment: ""))! let img2:UIImage = UIImage.init(named: NSLocalizedString("displayvc_desc", comment: ""))!
button.setImage(img2, for: UIControl.State.normal) button.setImage(img2, for: UIControl.State.normal)
button.frame = CGRect(x: 0, y: 0, width: 173, height: 42) 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 button.centerX = self.view.centerX
return button return button
@ -289,6 +292,10 @@ class CCSpatialVideoDisplayController: BaseController {
menuView.dismiss() menuView.dismiss()
let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenWidth*0.5, navtionImgView!.bottom), to: KWindow) let pointOnScreen = navtionImgView!.convert(CGPointMake(KScreenWidth*0.5, navtionImgView!.bottom), to: KWindow)
menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen) menuView.exUpdateArrowPointWithIsLandspace(pointOnScreen)
edBtn!.snp.updateConstraints { make in
make.centerY.equalTo((edBtn?.superview!.snp.bottom)!).offset( -120)
}
edBtn?.isHidden = false
break break
case .landscapeLeft , .landscapeRight: case .landscapeLeft , .landscapeRight:
print("Landscape ...") print("Landscape ...")
@ -308,6 +315,7 @@ class CCSpatialVideoDisplayController: BaseController {
self.customPlayer.layoutViewWhenScreenLandscape(value: true) self.customPlayer.layoutViewWhenScreenLandscape(value: true)
self.navtionBar?.isHidden = true self.navtionBar?.isHidden = true
mTopImgView.isHidden = true mTopImgView.isHidden = true
edBtn?.isHidden = true
break break
default: default:
print("Other") print("Other")
@ -343,6 +351,18 @@ class CCSpatialVideoDisplayController: BaseController {
} }
self.view.addSubview(tipsButton) 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.view.addSubview(self.customPlayer)
self.customPlayer.snp.makeConstraints { make in self.customPlayer.snp.makeConstraints { make in
make.left.right.centerY.equalToSuperview() 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) 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) { @objc func notification_didEnterBackgroundNotification(notification:Notification) {
// player?.pause() // player?.pause()

15
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
View File

@ -17,7 +17,11 @@ class ZZHCustomPlayer: UIView {
//点击maskview 的回调,主要用于方向旋转 //点击maskview 的回调,主要用于方向旋转
var maskViewTapCallback:CustomMaskViewTapCallback? var maskViewTapCallback:CustomMaskViewTapCallback?
//标记是否为横屏 //标记是否为横屏
var isLandscape:Bool = false var isLandscape:Bool = false {
didSet {
updateEDBtnHeight()
}
}
//标记是否正在串流中:目前就是用于控制是否显示瞳距调节的slider部分 //标记是否正在串流中:目前就是用于控制是否显示瞳距调节的slider部分
var isPlayingOnExternalScreen = false var isPlayingOnExternalScreen = false
//视频资源 //视频资源
@ -201,7 +205,7 @@ class ZZHCustomPlayer: UIView {
self.addSubview(edBtn!) self.addSubview(edBtn!)
edBtn!.snp.makeConstraints { make in edBtn!.snp.makeConstraints { make in
make.centerY.equalTo(timeSlider!.snp.centerY) make.centerY.equalTo(timeSlider!.snp.centerY)
make.width.height.equalTo(40) make.width.height.equalTo(0)
make.right.equalToSuperview().offset(-10) make.right.equalToSuperview().offset(-10)
make.left.equalTo(timeSlider!.snp.right).offset(24) 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设置为全屏 //屏幕旋转时自动隐藏timeSlider、edBtn,同时将播放layer设置为全屏
func layoutViewWhenScreenLandscape(value:Bool) { func layoutViewWhenScreenLandscape(value:Bool) {
if value { if value {

2
SwiftProject/SwiftProject/Project/View/CCSpatialDisplayTypeView/CCSpatialDisplayTypeView.swift
View File

@ -73,7 +73,7 @@ public class CCSpatialDisplayTypeView: UIView {
private var myFrame:CGRect! //tableview frame private var myFrame:CGRect! //tableview frame
private var arrowView : UIView! = nil private var arrowView : UIView! = nil
var isLandspaceScreen = false { var isLandspaceScreen = false {
willSet{ didSet{
print("isLandspaceScreen willset:\(isLandspaceScreen)") print("isLandspaceScreen willset:\(isLandspaceScreen)")
if isLandspaceScreen { if isLandspaceScreen {
self.frame = CGRect(origin: .zero, size: CGSize(width: KScrH, height: KScrW)) self.frame = CGRect(origin: .zero, size: CGSize(width: KScrH, height: KScrW))