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

v1.4

Browse Source
This commit is contained in:
bluesea 2024-04-08 20:05:19 +08:00
parent 684a5f3cf0
commit 57dc907660
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SwiftProject/SwiftProject.xcodeproj/project.pbxproj
View File

@ -1013,7 +1013,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.3; MARKETING_VERSION = 1.4;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS"; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo; PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo;
@ -1065,7 +1065,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.3; MARKETING_VERSION = 1.4;
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS"; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo; PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo;

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

Binary file not shown.

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

@ -611,8 +611,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 = "347" startingLineNumber = "367"
endingLineNumber = "347" endingLineNumber = "367"
landmarkName = "viewDidAppear(_:)" landmarkName = "viewDidAppear(_:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@ -627,8 +627,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 = "634" startingLineNumber = "654"
endingLineNumber = "634" endingLineNumber = "654"
landmarkName = "selectedSpatialType(selectedIndex:)" landmarkName = "selectedSpatialType(selectedIndex:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>

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

@ -63,6 +63,20 @@ class CCSpatialVideoDisplayController: BaseController {
} }
lazy var maskLabel:UILabel = {
let label = UILabel()
label.numberOfLines = 0
label.textColor = .white
label.font = UIFont.systemFont(ofSize: 14)
label.textAlignment = .center
label.layer.cornerRadius = 6
label.layer.masksToBounds = true
label.backgroundColor = UIColor.colorWithRGB(_r: 60.0, _g: 60.0, _b: 60.0, alpha: 0.1)
label.text = NSLocalizedString("外部串流中", comment: "")
label.isHidden = true
return label
}()
var assetReader:AVAssetReader? var assetReader:AVAssetReader?
var assetOutput:AVAssetReaderTrackOutput? var assetOutput:AVAssetReaderTrackOutput?
@ -71,7 +85,11 @@ class CCSpatialVideoDisplayController: BaseController {
let kNowTimeToUserDefaultKey_VideoDisplayController:String = "kNowTimeToUserDefaultKey_VideoDisplayController" let kNowTimeToUserDefaultKey_VideoDisplayController:String = "kNowTimeToUserDefaultKey_VideoDisplayController"
var link = false//是否已连接设备 var link = false//是否已连接设备
var isPlaying = false//是否正在串流播放 var isPlaying = false {//是否正在串流播放
didSet {
maskLabel.isHidden = !isPlaying
}
}
var selectedIndex:SpatialType = .parallelEyes//记录当前选择的菜单选项 var selectedIndex:SpatialType = .parallelEyes//记录当前选择的菜单选项
{ {
@ -297,6 +315,8 @@ class CCSpatialVideoDisplayController: BaseController {
self.view.addSubview(playerController!.view) self.view.addSubview(playerController!.view)
self.view.addSubview(tipsButton) self.view.addSubview(tipsButton)
self.maskLabel.frame = playerController!.view.frame
self.view.addSubview(self.maskLabel)