From 8a5890e026a4d43f0fcb63e3e5eb64e7dca96c2b Mon Sep 17 00:00:00 2001 From: nixzhu Date: Thu, 7 May 2015 00:04:23 +0800 Subject: [PATCH] fix thumbnail uploadFileToS3 --- Yep/Services/YepService.swift | 2 +- .../MessageMedia/MessageMediaViewController.swift | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift index f8ec70da..ad7184a5 100644 --- a/Yep/Services/YepService.swift +++ b/Yep/Services/YepService.swift @@ -1082,7 +1082,7 @@ func sendMessageWithMediaType(mediaType: MessageMediaType, inFilePath filePath: } s3PrivateUploadParams(failureHandler: nil) { thumbnailS3UploadParams in - uploadFileToS3(inFilePath: nil, orFileData: thumbnailData, mimeType: MessageMediaType.Image.mineType(), s3UploadParams: s3UploadParams) { (result, error) in + uploadFileToS3(inFilePath: nil, orFileData: thumbnailData, mimeType: MessageMediaType.Image.mineType(), s3UploadParams: thumbnailS3UploadParams) { (result, error) in if let metaData = metaData { let attachments = [ diff --git a/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift b/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift index 3b1d0d3e..b78c637b 100644 --- a/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift +++ b/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift @@ -37,7 +37,6 @@ class MessageMediaViewController: UIViewController { let x = NSFileManager.defaultManager().fileExistsAtPath(videoFileURL.path!) - mediaView.videoPlayerLayer.frame = mediaView.bounds playerItem.seekToTime(kCMTimeZero) //mediaView.videoPlayerLayer.player.replaceCurrentItemWithPlayerItem(playerItem) mediaView.videoPlayerLayer.player = AVPlayer(playerItem: playerItem)