非cell播放分辨率bug

renzifeng · renzifeng · commit 00c62aba607e · 2017-03-16T15:50:43.000+08:00
diff --git a/Player/PlayerViewController/MoviePlayerViewController.m b/Player/PlayerViewController/MoviePlayerViewController.m
@@ -122,6 +122,8 @@ - (ZFPlayerModel *)playerModel {
         _playerModel.videoURL         = self.videoURL;
         _playerModel.placeholderImage = [UIImage imageNamed:@"loading_bgView1"];
         _playerModel.fatherView       = self.playerFatherView;
+//        _playerModel.resolutionDic = @{@"高清" : self.videoURL.absoluteString,
+//                                       @"标清" : self.videoURL.absoluteString};
     }
     return _playerModel;
 }
diff --git a/ZFPlayer/Category/UITabBarController+ZFPlayerRotation.m b/ZFPlayer/Category/UITabBarController+ZFPlayerRotation.m
@@ -26,8 +26,7 @@
 
 @implementation UITabBarController (ZFPlayerRotation)
 
-+ (void)load
-{
++ (void)load {
     SEL selectors[] = {
         @selector(selectedIndex)
     };
@@ -45,8 +44,7 @@ + (void)load
     }
 }
 
-- (NSInteger)zf_selectedIndex
-{
+- (NSInteger)zf_selectedIndex {
     NSInteger index = [self zf_selectedIndex];
     if (index > self.viewControllers.count) { return 0; }
     return index;
@@ -58,8 +56,7 @@ - (NSInteger)zf_selectedIndex
  */
 
 // 是否支持自动转屏
-- (BOOL)shouldAutorotate
-{
+- (BOOL)shouldAutorotate {
     UIViewController *vc = self.viewControllers[self.selectedIndex];
     if ([vc isKindOfClass:[UINavigationController class]]) {
         UINavigationController *nav = (UINavigationController *)vc;
@@ -70,8 +67,7 @@ - (BOOL)shouldAutorotate
 }
 
 // 支持哪些屏幕方向
-- (UIInterfaceOrientationMask)supportedInterfaceOrientations
-{
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     UIViewController *vc = self.viewControllers[self.selectedIndex];
     if ([vc isKindOfClass:[UINavigationController class]]) {
         UINavigationController *nav = (UINavigationController *)vc;
diff --git a/ZFPlayer/Category/UIView+CustomControlView.m b/ZFPlayer/Category/UIView+CustomControlView.m
@@ -26,92 +26,90 @@
 
 @implementation UIView (CustomControlView)
 
-- (void)setDelegate:(id<ZFPlayerControlViewDelagate>)delegate
-{
+- (void)setDelegate:(id<ZFPlayerControlViewDelagate>)delegate {
     objc_setAssociatedObject(self, @selector(delegate), delegate, OBJC_ASSOCIATION_ASSIGN);
 }
 
-- (id<ZFPlayerControlViewDelagate>)delegate
-{
+- (id<ZFPlayerControlViewDelagate>)delegate {
    return objc_getAssociatedObject(self, _cmd);
 }
 
 /** 
  * 设置播放模型 
  */
-- (void)zf_playerModel:(ZFPlayerModel *)playerModel{}
+- (void)zf_playerModel:(ZFPlayerModel *)playerModel {}
 
 /**
  * 显示top、bottom、lockBtn
  */
-- (void)zf_playerShowControlView{}
+- (void)zf_playerShowControlView {}
 /**
  * 隐藏top、bottom、lockBtn*/
-- (void)zf_playerHideControlView{}
+- (void)zf_playerHideControlView {}
 
 /**
  * 重置ControlView
  */
-- (void)zf_playerResetControlView{}
+- (void)zf_playerResetControlView {}
 
 /**
  * 切换分辨率时候调用此方法
  */
-- (void)zf_playerResetControlViewForResolution{}
+- (void)zf_playerResetControlViewForResolution {}
 
 /**
  * 取消自动隐藏控制层view
  */
-- (void)zf_playerCancelAutoFadeOutControlView{}
+- (void)zf_playerCancelAutoFadeOutControlView {}
 
 /**
  * 开始播放（隐藏placeholderImageView）
  */
-- (void)zf_playerItemPlaying{}
+- (void)zf_playerItemPlaying {}
 
 /**
  * 播放完了
  */
-- (void)zf_playerPlayEnd{}
+- (void)zf_playerPlayEnd {}
 
 /**
  * 是否有下载功能
  */
-- (void)zf_playerHasDownloadFunction:(BOOL)sender{}
+- (void)zf_playerHasDownloadFunction:(BOOL)sender {}
 
 /**
  * 下载按钮状态
  */
-- (void)zf_playerDownloadBtnState:(BOOL)state{}
+- (void)zf_playerDownloadBtnState:(BOOL)state {}
 
 /**
  * 是否有切换分辨率功能
  * @param resolutionArray 分辨率名称的数组
  */
-- (void)zf_playerResolutionArray:(NSArray *)resolutionArray{}
+- (void)zf_playerResolutionArray:(NSArray *)resolutionArray {}
 
 /**
  * 播放按钮状态 (播放、暂停状态)
  */
-- (void)zf_playerPlayBtnState:(BOOL)state{}
+- (void)zf_playerPlayBtnState:(BOOL)state {}
 
 /**
  * 锁定屏幕方向按钮状态
  */
-- (void)zf_playerLockBtnState:(BOOL)state{}
+- (void)zf_playerLockBtnState:(BOOL)state {}
 
 /**
  * 加载的菊花
  */
-- (void)zf_playerActivity:(BOOL)animated{}
+- (void)zf_playerActivity:(BOOL)animated {}
 
 /**
  * 设置预览图
  
  * @param draggedTime 拖拽的时长
  * @param image       预览图
  */
-- (void)zf_playerDraggedTime:(NSInteger)draggedTime sliderImage:(UIImage *)image{}
+- (void)zf_playerDraggedTime:(NSInteger)draggedTime sliderImage:(UIImage *)image {}
 
 /**
  * 拖拽快进 快退
@@ -121,12 +119,12 @@ - (void)zf_playerDraggedTime:(NSInteger)draggedTime sliderImage:(UIImage *)image
  * @param forawrd     是否是快进
  * @param preview     是否有预览图
  */
-- (void)zf_playerDraggedTime:(NSInteger)draggedTime totalTime:(NSInteger)totalTime isForward:(BOOL)forawrd hasPreview:(BOOL)preview{}
+- (void)zf_playerDraggedTime:(NSInteger)draggedTime totalTime:(NSInteger)totalTime isForward:(BOOL)forawrd hasPreview:(BOOL)preview {}
 
 /**
  * 滑动调整进度结束结束
  */
-- (void)zf_playerDraggedEnd{}
+- (void)zf_playerDraggedEnd {}
 
 /**
  * 正常播放
@@ -135,26 +133,26 @@ - (void)zf_playerDraggedEnd{}
  * @param totalTime   视频总时长
  * @param value       slider的value(0.0~1.0)
  */
-- (void)zf_playerCurrentTime:(NSInteger)currentTime totalTime:(NSInteger)totalTime sliderValue:(CGFloat)value{}
+- (void)zf_playerCurrentTime:(NSInteger)currentTime totalTime:(NSInteger)totalTime sliderValue:(CGFloat)value {}
 
 /**
  * progress显示缓冲进度
  */
-- (void)zf_playerSetProgress:(CGFloat)progress{}
+- (void)zf_playerSetProgress:(CGFloat)progress {}
 
 /**
  * 视频加载失败
  */
-- (void)zf_playerItemStatusFailed:(NSError *)error{}
+- (void)zf_playerItemStatusFailed:(NSError *)error {}
 
 /**
  * 小屏播放
  */
-- (void)zf_playerBottomShrinkPlay{}
+- (void)zf_playerBottomShrinkPlay {}
 
 /**
  * 在cell播放
  */
-- (void)zf_playerCellPlay{}
+- (void)zf_playerCellPlay {}
 
 @end
diff --git a/ZFPlayer/Category/UIViewController+ZFPlayerRotation.m b/ZFPlayer/Category/UIViewController+ZFPlayerRotation.m
@@ -30,20 +30,17 @@ @implementation UIViewController (ZFPlayerRotation)
  */
 
 // 是否支持自动转屏
-- (BOOL)shouldAutorotate
-{
+- (BOOL)shouldAutorotate {
     return NO;
 }
 
 // 支持哪些屏幕方向
-- (UIInterfaceOrientationMask)supportedInterfaceOrientations
-{
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
 // 默认的屏幕方向（当前ViewController必须是通过模态出来的UIViewController（模态带导航的无效）方式展现出来的，才会调用这个方法）
-- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
-{
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
diff --git a/ZFPlayer/Category/UIWindow+CurrentViewController.m b/ZFPlayer/Category/UIWindow+CurrentViewController.m
@@ -25,8 +25,8 @@
 #import "UIWindow+CurrentViewController.h"
 
 @implementation UIWindow (CurrentViewController)
-- (UIViewController*)zf_topMostController
-{
+
+- (UIViewController*)zf_topMostController {
     UIViewController *topController = [self rootViewController];
     
     //  Getting topMost ViewController
@@ -36,13 +36,13 @@ - (UIViewController*)zf_topMostController
     return topController;
 }
 
-- (UIViewController*)zf_currentViewController;
-{
+- (UIViewController*)zf_currentViewController; {
     UIViewController *currentViewController = [self zf_topMostController];
     
     while ([currentViewController isKindOfClass:[UINavigationController class]] && [(UINavigationController*)currentViewController topViewController])
         currentViewController = [(UINavigationController*)currentViewController topViewController];
     
     return currentViewController;
 }
+
 @end
diff --git a/ZFPlayer/ZFPlayerControlView.h b/ZFPlayer/ZFPlayerControlView.h
@@ -25,10 +25,6 @@
 #import "ASValueTrackingSlider.h"
 #import "ZFPlayer.h"
 
-typedef void(^ChangeResolutionBlock)(UIButton *button);
-typedef void(^SliderTapBlock)(CGFloat value);
-
 @interface ZFPlayerControlView : UIView 
 
-
 @end
diff --git a/ZFPlayer/ZFPlayerControlView.m b/ZFPlayer/ZFPlayerControlView.m
@@ -89,8 +89,6 @@ @interface ZFPlayerControlView () <UIGestureRecognizerDelegate>
 /** 分辨率的名称 */
 @property (nonatomic, strong) NSArray                 *resolutionArray;
 
-/** 播放模型 */
-@property (nonatomic, strong) ZFPlayerModel           *playerModel;
 /** 显示控制层 */
 @property (nonatomic, assign, getter=isShowing) BOOL  showing;
 /** 小屏播放 */
@@ -923,7 +921,7 @@ - (void)zf_playerCancelAutoFadeOutControlView {
 
 /** 设置播放模型 */
 - (void)zf_playerModel:(ZFPlayerModel *)playerModel {
-    _playerModel = playerModel;
+
     if (playerModel.title) { self.titleLabel.text = playerModel.title; }
     // 设置网络占位图片
     if (playerModel.placeholderImageURLString) {
diff --git a/ZFPlayer/ZFPlayerModel.h b/ZFPlayer/ZFPlayerModel.h
@@ -35,8 +35,11 @@
  * 如果和本地图片同时设置，则忽略本地图片，显示网络图片
  */
 @property (nonatomic, copy  ) NSString     *placeholderImageURLString;
-/** 视频分辨率 */
-@property (nonatomic, strong) NSDictionary *resolutionDic;
+/**
+ * 视频分辨率字典, 分辨率标题与该分辨率对应的视频URL.
+ * 例如: @{@"高清" : @"https://xx/xx-hd.mp4", @"标清" : @"https://xx/xx-sd.mp4"}
+ */
+@property (nonatomic, strong) NSDictionary<NSString *, NSString *> *resolutionDic;
 /** 从xx秒开始播放视频(默认0) */
 @property (nonatomic, assign) NSInteger    seekTime;
 // cell播放视频，以下属性必须设置值
diff --git a/ZFPlayer/ZFPlayerView.m b/ZFPlayer/ZFPlayerView.m
@@ -1277,7 +1277,6 @@ - (void)setHasDownload:(BOOL)hasDownload {
 
 - (void)setResolutionDic:(NSDictionary *)resolutionDic {
     _resolutionDic = resolutionDic;
-    [self.controlView zf_playerResolutionArray:[resolutionDic allKeys]];
     self.videoURLArray = [resolutionDic allValues];
 }
 
@@ -1298,10 +1297,13 @@ - (void)setPlayerModel:(ZFPlayerModel *)playerModel {
 
     if (playerModel.seekTime) { self.seekTime = playerModel.seekTime; }
     [self.controlView zf_playerModel:playerModel];
+    // 分辨率
+    if (playerModel.resolutionDic) {
+       self.resolutionDic = playerModel.resolutionDic;
+    }
 
     if (playerModel.tableView && playerModel.indexPath && playerModel.videoURL) {
         [self cellVideoWithTableView:playerModel.tableView AtIndexPath:playerModel.indexPath];
-        if (playerModel.resolutionDic) { self.resolutionDic = playerModel.resolutionDic; }
     }
     [self addPlayerToFatherView:playerModel.fatherView];
     self.videoURL = playerModel.videoURL;

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ - (ZFPlayerModel *)playerModel {`
`122`	`122`	`_playerModel.videoURL = self.videoURL;`
`123`	`123`	`_playerModel.placeholderImage = [UIImage imageNamed:@"loading_bgView1"];`
`124`	`124`	`_playerModel.fatherView = self.playerFatherView;`
	`125`	`+// _playerModel.resolutionDic = @{@"高清" : self.videoURL.absoluteString,`
	`126`	`+// @"标清" : self.videoURL.absoluteString};`
`125`	`127`	`}`
`126`	`128`	`return _playerModel;`
`127`	`129`	`}`