diff --git a/.idea/kplayer.iml b/.idea/kplayer.iml index ac25654..4cf9904 100644 --- a/.idea/kplayer.iml +++ b/.idea/kplayer.iml @@ -1,16 +1,25 @@ + + + + + + + + + - - + + @@ -21,56 +30,57 @@ - + + + - - - - - + + - + + - + - - + + + + - - + - + - + - - - - - - - - + + + + + + + + @@ -96,8 +106,8 @@ - + @@ -107,47 +117,47 @@ - + - + - - + + - - + - + + - - + + - + - - - + + - + + @@ -159,22 +169,22 @@ - - + + - - + + + - - - - + + + @@ -182,6 +192,12 @@ + + + + + + @@ -198,22 +214,16 @@ - - - - - - - - - + + + + - @@ -238,7 +248,7 @@ - + @@ -250,6 +260,7 @@ + @@ -300,11 +311,10 @@ - + - @@ -329,7 +339,7 @@ - + @@ -341,6 +351,7 @@ + @@ -391,7 +402,7 @@ - + diff --git a/kplayer/core/NetworkManager.swift b/kplayer/core/NetworkManager.swift index 35eaa5f..541f037 100644 --- a/kplayer/core/NetworkManager.swift +++ b/kplayer/core/NetworkManager.swift @@ -192,7 +192,7 @@ class NetworkManager { var j = 0 for i in item.children { loadItem(i, index: j) - j++ + j+=1 } NSNotificationCenter.defaultCenter().postNotificationName("loadedItems", object: nil) } diff --git a/kplayer/detail/DetailViewController.swift b/kplayer/detail/DetailViewController.swift index b4c2483..92b8c20 100644 --- a/kplayer/detail/DetailViewController.swift +++ b/kplayer/detail/DetailViewController.swift @@ -32,7 +32,7 @@ class DetailViewController: UIViewController, UICollectionViewDelegateFlowLayout required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) - NSNotificationCenter.defaultCenter().addObserver(self, selector: Selector("refreshItems:"), name: "loadedItems", object: nil) + NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(refreshItems(_:)), name: "loadedItems", object: nil) } deinit { @@ -65,13 +65,13 @@ class DetailViewController: UIViewController, UICollectionViewDelegateFlowLayout collectionView.reloadData() // attach long press gesture to collectionView - let lpgr = UILongPressGestureRecognizer(target: self, action: Selector("handleLongPress:")) + let lpgr = UILongPressGestureRecognizer(target: self, action: #selector(handleLongPress(_:))) lpgr.minimumPressDuration = 3; //seconds lpgr.delaysTouchesBegan = true self.collectionView.addGestureRecognizer(lpgr); - let overviewButton = UIBarButtonItem(barButtonSystemItem: .Action, target: self, action: Selector("overview")); - let favButton = UIBarButtonItem(barButtonSystemItem: .Bookmarks, target: self, action: Selector("favorites")); + let overviewButton = UIBarButtonItem(barButtonSystemItem: .Action, target: self, action: #selector(overview)); + let favButton = UIBarButtonItem(barButtonSystemItem: .Bookmarks, target: self, action: #selector(favorites)); navigationItem.rightBarButtonItems = [favButton, overviewButton] if detailItem != nil { print("Details \(detailItem!.children)") @@ -140,7 +140,7 @@ class DetailViewController: UIViewController, UICollectionViewDelegateFlowLayout if j >= 1 { newItems.append(NSIndexPath(forItem: j, inSection: index)) } - j++ + j+=1 } self.collectionView.insertItemsAtIndexPaths(newItems) } diff --git a/kplayer/detail/VideoPlayerController.swift b/kplayer/detail/VideoPlayerController.swift index b9c43ef..bcd5cbf 100644 --- a/kplayer/detail/VideoPlayerController.swift +++ b/kplayer/detail/VideoPlayerController.swift @@ -35,13 +35,13 @@ class VideoPlayerController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - barbutton = UIBarButtonItem(barButtonSystemItem: .Action, target: self, action: Selector("twoFingersTwoTaps")); + barbutton = UIBarButtonItem(barButtonSystemItem: .Action, target: self, action: #selector(VideoPlayerController.twoFingersTwoTaps)); navigationItem.rightBarButtonItems = [barbutton!] - backButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: Selector("back:")) - speedButton = UIBarButtonItem(title:"1.0", style:UIBarButtonItemStyle.Plain, target: self, action: Selector("speed:")) - playButton = UIBarButtonItem(barButtonSystemItem: .Play, target: self, action: Selector("startstop:")) - reviewButton = UIBarButtonItem(title:"Edit ", style:UIBarButtonItemStyle.Plain, target: self, action: Selector("doEdit:")) + backButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: #selector(VideoPlayerController.back(_:))) + speedButton = UIBarButtonItem(title:"1.0", style:UIBarButtonItemStyle.Plain, target: self, action: #selector(VideoPlayerController.speed(_:))) + playButton = UIBarButtonItem(barButtonSystemItem: .Play, target: self, action: #selector(VideoPlayerController.startstop(_:))) + reviewButton = UIBarButtonItem(title:"Edit ", style:UIBarButtonItemStyle.Plain, target: self, action: #selector(VideoPlayerController.doEdit(_:))) navigationItem.leftBarButtonItems = [backButton!, playButton!, speedButton!, reviewButton!] @@ -78,7 +78,8 @@ print("play") } func speed(sender: AnyObject) { - if ++speedOption > 3 { + speedOption += 1 + if speedOption > 3 { speedOption = 0 } @@ -104,9 +105,9 @@ print("play") player.controls = movieControls movieControls.style = ALMoviePlayerControlsStyleEmbedded - NSNotificationCenter.defaultCenter().addObserver(self, selector: Selector("exitedFullscreen"), name: MPMoviePlayerDidExitFullscreenNotification, object: nil); - NSNotificationCenter.defaultCenter().addObserver(self, selector: Selector("enteredFullscreen"), name: MPMoviePlayerDidEnterFullscreenNotification, object: nil); - NSNotificationCenter.defaultCenter().addObserver(self, selector: Selector("showThumbnail:"), name: MPMoviePlayerThumbnailImageRequestDidFinishNotification, object: nil); + NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(VideoPlayerController.exitedFullscreen), name: MPMoviePlayerDidExitFullscreenNotification, object: nil); + NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(VideoPlayerController.enteredFullscreen), name: MPMoviePlayerDidEnterFullscreenNotification, object: nil); + NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(VideoPlayerController.showThumbnail(_:)), name: MPMoviePlayerThumbnailImageRequestDidFinishNotification, object: nil); player.view.frame = CGRect(x: 0, y: 0, width: self.view.frame.size.width, height: self.view.frame.size.height) player.view.sizeToFit() @@ -143,7 +144,7 @@ print("play") let button = UIButton(frame: frame) button.showsTouchWhenHighlighted = true - button.addTarget(self, action: "thumbnailClicked:", forControlEvents: .TouchDown) + button.addTarget(self, action: #selector(thumbnailClicked(_:)), forControlEvents: .TouchDown) if newItem.image != nil { let icon = newItem.image!.scaleToSize(66.0, height: 44.0) @@ -184,7 +185,7 @@ print("play") if !(player.duration > 0.0) { print("again") - NSTimer.scheduledTimerWithTimeInterval(0.3, target: self, selector: Selector("update"), userInfo: nil, repeats: false) + NSTimer.scheduledTimerWithTimeInterval(0.3, target: self, selector: #selector(update), userInfo: nil, repeats: false) return } @@ -231,27 +232,27 @@ print("play") } func installGestures(moviePlayer: UIView) { - let twoFingersTwoTaps = UITapGestureRecognizer(target: self, action: "twoFingersTwoTaps") - twoFingersTwoTaps.numberOfTapsRequired = 2 - twoFingersTwoTaps.numberOfTouchesRequired = 2 - moviePlayer.addGestureRecognizer(twoFingersTwoTaps) + let twoFingersTwoTapsGesture = UITapGestureRecognizer(target: self, action: #selector(twoFingersTwoTaps)) + twoFingersTwoTapsGesture.numberOfTapsRequired = 2 + twoFingersTwoTapsGesture.numberOfTouchesRequired = 2 + moviePlayer.addGestureRecognizer(twoFingersTwoTapsGesture) - let sR = UISwipeGestureRecognizer(target: self, action: "swipeRight") + let sR = UISwipeGestureRecognizer(target: self, action: #selector(swipeRight)) sR.direction = UISwipeGestureRecognizerDirection.Right sR.numberOfTouchesRequired = 1 moviePlayer.addGestureRecognizer(sR) - let sL = UISwipeGestureRecognizer(target: self, action: "swipeLeft") + let sL = UISwipeGestureRecognizer(target: self, action: #selector(swipeLeft)) sL.direction = UISwipeGestureRecognizerDirection.Left sL.numberOfTouchesRequired = 1 moviePlayer.addGestureRecognizer(sL) - let sR2 = UISwipeGestureRecognizer(target: self, action: "swipeDown") + let sR2 = UISwipeGestureRecognizer(target: self, action: #selector(swipeDown)) sR2.direction = UISwipeGestureRecognizerDirection.Down sR2.numberOfTouchesRequired = 1 moviePlayer.addGestureRecognizer(sR2) - let sR3 = UISwipeGestureRecognizer(target: self, action: "swipeUp") + let sR3 = UISwipeGestureRecognizer(target: self, action: #selector(swipeUp)) sR3.direction = UISwipeGestureRecognizerDirection.Up sR3.numberOfTouchesRequired = 1 moviePlayer.addGestureRecognizer(sR3) @@ -278,7 +279,7 @@ print("play") index = 0 player.contentURL = currentItem!.playerURL player.play() - NSTimer.scheduledTimerWithTimeInterval(1.2, target: self, selector: Selector("update"), userInfo: nil, repeats: false) + NSTimer.scheduledTimerWithTimeInterval(1.2, target: self, selector: #selector(update), userInfo: nil, repeats: false) return } @@ -286,7 +287,7 @@ print("play") if !(currentItem!.children.isEmpty) { print ("switch internal") if index < currentItem!.children.count - 1 { - index++; + index+=1; } else { index = 0; } @@ -321,7 +322,7 @@ print("play") player.contentURL = currentItem!.playerURL player.play() - NSTimer.scheduledTimerWithTimeInterval(1.2, target: self, selector: Selector("update"), userInfo: nil, repeats: false) + NSTimer.scheduledTimerWithTimeInterval(1.2, target: self, selector: #selector(update), userInfo: nil, repeats: false) return } diff --git a/kplayer/master/MasterViewController.swift b/kplayer/master/MasterViewController.swift index 77ca848..2a74dc3 100644 --- a/kplayer/master/MasterViewController.swift +++ b/kplayer/master/MasterViewController.swift @@ -189,7 +189,8 @@ class MasterViewController: UITableViewController { var j = 0 for i in item.children { - i.index = j++ + i.index = j + j += 1 } NetworkManager.sharedInstance.loadItems(item) diff --git a/kplayer/photo/MediaPhotoController.swift b/kplayer/photo/MediaPhotoController.swift index 8d9297a..5810933 100644 --- a/kplayer/photo/MediaPhotoController.swift +++ b/kplayer/photo/MediaPhotoController.swift @@ -21,7 +21,7 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView var timer: NSTimer? - var currentIndex = 100 + var currentIndex = 80 var urlSession: NSURLSession? @@ -64,20 +64,22 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView imageCache.totalCostLimit = 1024 * 1024 * 1024 - let backButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: Selector("back")) - let slideButton = UIBarButtonItem(barButtonSystemItem: .FastForward, target: self, action: Selector("slideShow")) + let backButton = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: #selector(MediaPhotoController.back)) + let slideButton = UIBarButtonItem(barButtonSystemItem: .FastForward, target: self, action: #selector(MediaPhotoController.slideShow)) navigationItem.leftBarButtonItems = [backButton, slideButton] - let playButton = UIBarButtonItem(barButtonSystemItem: .Play, target: self, action: Selector("play")) - let shotButton = UIBarButtonItem(barButtonSystemItem: .Camera, target: self, action: Selector("shot")) + let playButton = UIBarButtonItem(barButtonSystemItem: .Play, target: self, action: #selector(MediaPhotoController.play)) + let shotButton = UIBarButtonItem(barButtonSystemItem: .Camera, target: self, action: #selector(MediaPhotoController.shot)) navigationItem.rightBarButtonItems = [playButton, shotButton] setChromeVisibility(true, animated: true) self.photoAlbumView.reloadData(); - preload(0, count: 50) - preload(50, count: 50) + preload(0, count: 20) + preload(20, count: 20) + preload(40, count: 20) + preload(60, count: 20) } func loadData(d: NSData, start: Int, end: Int) { @@ -85,16 +87,17 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView let string1 = NSString(data: d, encoding: NSUTF8StringEncoding) print(string1) var index = 0 - let fHi = (Int(bytes[index++]) << 24) + (Int(bytes[index++]) << 16) - let f = fHi + (Int(bytes[index++]) << 8) + Int(bytes[index++]) + let fHi = (Int(bytes[index]) << 24) + (Int(bytes[index+1]) << 16) + let f = fHi + (Int(bytes[index+2]) << 8) + Int(bytes[index+3]) // let f = (bytes[index++] << 24)+(bytes[index++] << 16)+(bytes[index++] << 8) + bytes[index++] + index += 4 let time = dateFormatter.stringFromDate(NSDate()) print("\(time) start \(start) count \(f) size \(d.length)") var rest = self.items.count - self.currentIndex - if rest > 50 { - rest = 50 + if rest > 20 { + rest = 20 } if rest > 0 { @@ -108,16 +111,15 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView } for var bild = start; bild < end; bild++ { - let sizeHi = (Int(bytes[index++]) << 24) + (Int(bytes[index++]) << 16) - let size = (Int(bytes[index++]) << 8) + Int(bytes[index++]) + sizeHi + let sizeHi = (Int(bytes[index]) << 24) + (Int(bytes[index+1]) << 16) + let size = (Int(bytes[index+2]) << 8) + Int(bytes[index+3]) + sizeHi + index += 4 if size > 0 { // var buf = //UnsafeMutablePointer(&bytes[index]) let part = d.subdataWithRange(NSMakeRange(index, size)) if let img = UIImage(data: part) { let imageRef = img.CGImage; - let bytesPerPixel = CGImageGetBitsPerPixel(imageRef) / 8; - let cost = CGImageGetWidth(imageRef) * CGImageGetHeight(imageRef) * bytesPerPixel; self.total += d.length let i = self.items[bild] @@ -200,7 +202,8 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView } func slideShow() { - if (++slide > 2) { + slide += 1 + if (slide > 2) { slide = 0 } @@ -220,7 +223,7 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView photoScrubberView.setSelectedPhotoIndex(nextItem, animated: true) if (slide > 0) { - timer = NSTimer.scheduledTimerWithTimeInterval(Double(slide) / 2.0, target: self, selector: Selector("showItem"), userInfo: nil, repeats: false) + timer = NSTimer.scheduledTimerWithTimeInterval(Double(slide) / 2.0, target: self, selector: #selector(showItem), userInfo: nil, repeats: false) } else { timer = nil } @@ -374,8 +377,6 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView if let i = UIImage(data: d) { // println("thumb preload image loaded \(newItem.imageUrlAbsolute)") let imageRef = i.CGImage; - let bytesPerPixel = CGImageGetBitsPerPixel(imageRef) / 8; - let cost = CGImageGetWidth(imageRef) * CGImageGetHeight(imageRef) * bytesPerPixel; self.imageCache.setObject(d, forKey: newItem.thumbUrlAbsolute, cost: d.length) size = NIPhotoScrollViewPhotoSizeThumbnail self.photoAlbumView.didLoadPhoto(i, atIndex: photoAtIndex, photoSize: size) @@ -464,9 +465,6 @@ class MediaPhotoController: NIToolbarPhotoViewController, NIPhotoAlbumScrollView if let i = UIImage(data: d) { // println("thumb image loaded \(newItem.thumbUrlAbsolute)") let imageRef = i.CGImage; - let bytesPerPixel = CGImageGetBitsPerPixel(imageRef) / 8; - let cost = CGImageGetWidth(imageRef) * CGImageGetHeight(imageRef) * bytesPerPixel; - self.imageCache.setObject(i, forKey: newItem.thumbUrlAbsolute, cost: d.length) self.photoScrubberView.didLoadThumbnail(i, atIndex: thumbnailIndex); diff --git a/kplayer/util/DataLoadOperation.swift b/kplayer/util/DataLoadOperation.swift index 6c0b370..27c99f8 100644 --- a/kplayer/util/DataLoadOperation.swift +++ b/kplayer/util/DataLoadOperation.swift @@ -37,7 +37,7 @@ class DataLoadOperation: NSOperation { // var configuration = NSURLSessionConfiguration.defaultSessionConfiguration(); // backgroundSessionConfigurationWithIdentifier("imageLoad"); // configuration.HTTPMaximumConnectionsPerHost = 100; // var backgroundSession = NSURLSession(configuration: configuration, delegate: nil, delegateQueue: nil); - var url = NSURLRequest(URL: imageURL); + let url = NSURLRequest(URL: imageURL); downloadTask = backgroundSession.dataTaskWithRequest(url, completionHandler: { data,response,error in @@ -58,7 +58,7 @@ class DataLoadOperation: NSOperation { } }) - let time = dateFormatter.stringFromDate(NSDate()) +// let time = dateFormatter.stringFromDate(NSDate()) // print("\(time) preload image \(imageURL)") downloadTask!.resume(); diff --git a/kplayer/util/LayoutTools.swift b/kplayer/util/LayoutTools.swift index 0f75228..bd0a3f7 100644 --- a/kplayer/util/LayoutTools.swift +++ b/kplayer/util/LayoutTools.swift @@ -37,7 +37,7 @@ public extension UIView { addConstraints(constr as! [NSLayoutConstraint]) } } - index++ + index+=1 } }