diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index 7dca973..840a84e 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -984,7 +984,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.2; + CURRENT_PROJECT_VERSION = 1.3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; @@ -1037,7 +1037,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.2; + CURRENT_PROJECT_VERSION = 1.3; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index e33e133..d35a322 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index b6c8e21..9404341 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -611,8 +611,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "371" - endingLineNumber = "371" + startingLineNumber = "387" + endingLineNumber = "387" landmarkName = "viewDidAppear(_:)" landmarkType = "7"> @@ -627,8 +627,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "535" - endingLineNumber = "535" + startingLineNumber = "551" + endingLineNumber = "551" landmarkName = "displayUpdate(caDisplayLink:)" landmarkType = "7"> diff --git a/SwiftProject/SwiftProject/AppDelegate.swift b/SwiftProject/SwiftProject/AppDelegate.swift index cb147b6..228e2bd 100644 --- a/SwiftProject/SwiftProject/AppDelegate.swift +++ b/SwiftProject/SwiftProject/AppDelegate.swift @@ -19,6 +19,7 @@ import SVProgressHUD import Firebase import FirebaseCore import AVFoundation +import FacebookCore @main @@ -30,7 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { FirebaseApp.configure() - + do { try AVAudioSession.sharedInstance().setActive(true) try AVAudioSession.sharedInstance().setCategory(.playback,options: .allowAirPlay) diff --git a/SwiftProject/SwiftProject/Info.plist b/SwiftProject/SwiftProject/Info.plist index 8686edd..4ffd80f 100644 --- a/SwiftProject/SwiftProject/Info.plist +++ b/SwiftProject/SwiftProject/Info.plist @@ -3,7 +3,7 @@ FacebookAutoLogAppEventsEnabled - + FirebaseAutomaticScreenReportingEnabled NSAppTransportSecurity @@ -48,7 +48,7 @@ CFBundleURLSchemes - com.nsk.tdvideo + fb349630657543828 diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index 805d519..f962e80 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -232,7 +232,7 @@ class CCSpatialVideoDisplayController: BaseController { print("PlayerEndTime....") player?.seek(to: .zero) player?.play() - +// // self.playerController?.view.layer.sublayers?.forEach({ clayer in // print("clayer.......\(clayer.self)") // clayer.backgroundColor = UIColor.red.cgColor @@ -298,7 +298,6 @@ class CCSpatialVideoDisplayController: BaseController { playerController!.view.backgroundColor = .clear playerController?.view.frame = CGRect.init(x: 0, y: 170, width: self.view.frame.size.width, height: 400) - self.addChild(playerController!) self.view.addSubview(playerController!.view)