diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index 97abac5..775cbd9 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -1048,7 +1048,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.0; + CURRENT_PROJECT_VERSION = 1.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; @@ -1077,7 +1077,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.6; OTHER_CFLAGS = ""; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS"; PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo; @@ -1101,7 +1101,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.0; + CURRENT_PROJECT_VERSION = 1.1; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1129,7 +1129,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.5.1; + MARKETING_VERSION = 1.6; OTHER_CFLAGS = ""; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS"; PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo; diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate index ffb224f..73c15df 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift index 2ed7980..41afb77 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift @@ -114,6 +114,8 @@ class ZZHCustomPlayer: UIView { avPlayerLayer = AVPlayerLayer(player: avPlayer) avPlayerLayer?.frame = CGRect(x: 0, y: 0, width: Int(playerWidth), height: playerHeight) +// avPlayerLayer?.backgroundColor = UIColor.red.cgColor + avPlayerLayer?.videoGravity = .resizeAspectFill playerLayerBgView!.layer.addSublayer(avPlayerLayer!) playerLayerBgView?.backgroundColor = UIColor.clear @@ -156,8 +158,8 @@ class ZZHCustomPlayer: UIView { playerIsSeeking = true self.avPlayer?.seek(to: ct,toleranceBefore:.zero,toleranceAfter: .zero) if(!isMoving) {//结束拖动时,再进行播放 -// self.play(true) - self.avPlayer?.play() + self.play(true) +// self.avPlayer?.play() self.playerIsSeeking = false }