iOS Team / CNliveBBASMModule · Commits

Commit d10bf4bee81450bea0fbca7b3d4c6d24437ec86c

Authored by yanglingyu
1 parent 7c6fba31

no message

Inline Side-by-side
Showing 26 changed files with 127 additions and 127 deletions
CNLiveBBASMModule.podspec
  View file @d10bf4b
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveBBASMModule'
11   - s.version = '0.0.5'
  11 + s.version = '0.0.6'
12 12 s.summary = 'CNLive-iOS百度小程序接入'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveBBASMModule/Classes/CNBBASATool/AVPlayer/ZFAVPlayerManager.m
  View file @d10bf4b
... ... @@ -428,9 +428,9 @@ static NSString *const kPresentationSize = @"presentationSize";
428 428  
429 429 #pragma mark - getter
430 430  
431   -- (ZFPlayerView *)view {
  431 +- (CNZFPlayerView *)view {
432 432 if (!_view) {
433   - ZFPlayerView *view = [[ZFPlayerView alloc] init];
  433 + CNZFPlayerView *view = [[CNZFPlayerView alloc] init];
434 434 _view = view;
435 435 }
436 436 return _view;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/ControlView/ZFPlayerControlView.h renamed to CNLiveBBASMModule/Classes/CNBBASATool/ControlView/CNZFPlayerControlView.h
  View file @d10bf4b
... ... @@ -33,7 +33,7 @@
33 33 #import "ZFPlayerMediaControl.h"
34 34 #endif
35 35  
36   -@interface ZFPlayerControlView : UIView <ZFPlayerMediaControl>
  36 +@interface CNZFPlayerControlView : UIView <ZFPlayerMediaControl>
37 37  
38 38 /// 竖屏控制层的View
39 39 @property (nonatomic, strong, readonly) ZFPortraitControlView *portraitControlView;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/ControlView/ZFPlayerControlView.m renamed to CNLiveBBASMModule/Classes/CNBBASATool/ControlView/CNZFPlayerControlView.m
  View file @d10bf4b
... ... @@ -22,7 +22,7 @@
22 22 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 23 // THE SOFTWARE.
24 24  
25   -#import "ZFPlayerControlView.h"
  25 +#import "CNZFPlayerControlView.h"
26 26 #import "ZFLandScapeControlView.h"
27 27 #import <AVKit/AVKit.h>
28 28 #import <AVFoundation/AVFoundation.h>
... ... @@ -39,7 +39,7 @@
39 39 #endif
40 40  
41 41  
42   -@interface ZFPlayerControlView () <ZFSliderViewDelegate>
  42 +@interface CNZFPlayerControlView () <ZFSliderViewDelegate>
43 43 /// 竖屏控制层的View
44 44 @property (nonatomic, strong) ZFPortraitControlView *portraitControlView;
45 45 /// 横屏控制层的View
... ... @@ -79,7 +79,7 @@
79 79  
80 80 @end
81 81  
82   -@implementation ZFPlayerControlView
  82 +@implementation CNZFPlayerControlView
83 83 @synthesize player = _player;
84 84  
85 85 - (instancetype)initWithFrame:(CGRect)frame {
... ... @@ -359,7 +359,7 @@
359 359 }
360 360 }
361 361  
362   -#pragma mark - ZFPlayerControlViewDelegate
  362 +#pragma mark - CNZFPlayerControlViewDelegate
363 363  
364 364 /// 手势筛选，返回NO不响应该手势
365 365 - (BOOL)gestureTriggerCondition:(ZFPlayerGestureControl *)gestureControl gestureType:(ZFPlayerGestureType)gestureType gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer touch:(nonnull UITouch *)touch {
... ... @@ -477,12 +477,12 @@
477 477 }
478 478  
479 479 /// 准备播放
480   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer prepareToPlay:(NSURL *)assetURL {
  480 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer prepareToPlay:(NSURL *)assetURL {
481 481 [self hideControlViewWithAnimated:NO];
482 482 }
483 483  
484 484 /// 播放状态改变
485   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer playStateChanged:(ZFPlayerPlaybackState)state {
  485 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer playStateChanged:(ZFPlayerPlaybackState)state {
486 486 if (state == ZFPlayerPlayStatePlaying) {
487 487 [self.portraitControlView playBtnSelectedState:YES];
488 488 [self.landScapeControlView playBtnSelectedState:YES];
... ... @@ -506,7 +506,7 @@
506 506 }
507 507  
508 508 /// 加载状态改变
509   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer loadStateChanged:(ZFPlayerLoadState)state {
  509 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer loadStateChanged:(ZFPlayerLoadState)state {
510 510 if (state == ZFPlayerLoadStatePrepare) {
511 511 self.coverImageView.hidden = NO;
512 512 [self.portraitControlView playBtnSelectedState:videoPlayer.currentPlayerManager.shouldAutoPlay];
... ... @@ -530,7 +530,7 @@
530 530 }
531 531  
532 532 /// 播放进度改变回调
533   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime {
  533 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime {
534 534 [self.portraitControlView videoPlayer:videoPlayer currentTime:currentTime totalTime:totalTime];
535 535 [self.landScapeControlView videoPlayer:videoPlayer currentTime:currentTime totalTime:totalTime];
536 536 if (!self.bottomPgrogress.isdragging) {
... ... @@ -539,23 +539,23 @@
539 539 }
540 540  
541 541 /// 缓冲改变回调
542   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime {
  542 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime {
543 543 [self.portraitControlView videoPlayer:videoPlayer bufferTime:bufferTime];
544 544 [self.landScapeControlView videoPlayer:videoPlayer bufferTime:bufferTime];
545 545 self.bottomPgrogress.bufferValue = videoPlayer.bufferProgress;
546 546 }
547 547  
548   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size {
  548 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size {
549 549 [self.landScapeControlView videoPlayer:videoPlayer presentationSizeChanged:size];
550 550 }
551 551  
552 552 /// 锁定旋转方向
553   -- (void)lockedVideoPlayer:(ZFPlayerController *)videoPlayer lockedScreen:(BOOL)locked {
  553 +- (void)lockedVideoPlayer:(CNZFPlayerController *)videoPlayer lockedScreen:(BOOL)locked {
554 554 [self showControlViewWithAnimated:YES];
555 555 }
556 556  
557 557 /// 列表滑动时视频view已经显示
558   -- (void)playerDidAppearInScrollView:(ZFPlayerController *)videoPlayer {
  558 +- (void)playerDidAppearInScrollView:(CNZFPlayerController *)videoPlayer {
559 559 if (!self.player.stopWhileNotVisible && !videoPlayer.isFullScreen) {
560 560 self.floatControlView.hidden = YES;
561 561 self.portraitControlView.hidden = NO;
... ... @@ -563,14 +563,14 @@
563 563 }
564 564  
565 565 /// 列表滑动时视频view已经消失
566   -- (void)playerDidDisappearInScrollView:(ZFPlayerController *)videoPlayer {
  566 +- (void)playerDidDisappearInScrollView:(CNZFPlayerController *)videoPlayer {
567 567 if (!self.player.stopWhileNotVisible && !videoPlayer.isFullScreen) {
568 568 self.floatControlView.hidden = NO;
569 569 self.portraitControlView.hidden = YES;
570 570 }
571 571 }
572 572  
573   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer floatViewShow:(BOOL)show {
  573 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer floatViewShow:(BOOL)show {
574 574 self.floatControlView.hidden = !show;
575 575 self.portraitControlView.hidden = show;
576 576 }
... ... @@ -628,7 +628,7 @@
628 628  
629 629 #pragma mark - setter
630 630  
631   -- (void)setPlayer:(ZFPlayerController *)player {
  631 +- (void)setPlayer:(CNZFPlayerController *)player {
632 632 _player = player;
633 633 self.landScapeControlView.player = player;
634 634 self.portraitControlView.player = player;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/ControlView/ZFLandScapeControlView.h
  View file @d10bf4b
... ... @@ -24,10 +24,10 @@
24 24  
25 25 #import <UIKit/UIKit.h>
26 26 #import "ZFSliderView.h"
27   -#if __has_include(<ZFPlayer/ZFPlayerController.h>)
28   -#import <ZFPlayer/ZFPlayerController.h>
  27 +#if __has_include(<ZFPlayer/CNZFPlayerController.h>)
  28 +#import <ZFPlayer/CNZFPlayerController.h>
29 29 #else
30   -#import "ZFPlayerController.h"
  30 +#import "CNZFPlayerController.h"
31 31 #endif
32 32  
33 33 NS_ASSUME_NONNULL_BEGIN
... ... @@ -62,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
62 62 @property (nonatomic, strong, readonly) UIButton *lockBtn;
63 63  
64 64 /// 播放器
65   -@property (nonatomic, weak) ZFPlayerController *player;
  65 +@property (nonatomic, weak) CNZFPlayerController *player;
66 66  
67 67 /// slider滑动中
68 68 @property (nonatomic, copy, nullable) void(^sliderValueChanging)(CGFloat value,BOOL forward);
... ... @@ -89,16 +89,16 @@ NS_ASSUME_NONNULL_BEGIN
89 89 - (void)hideControlView;
90 90  
91 91 /// 设置播放时间
92   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime;
  92 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime;
93 93  
94 94 /// 设置缓冲时间
95   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime;
  95 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime;
96 96  
97 97 /// 是否响应该手势
98 98 - (BOOL)shouldResponseGestureWithPoint:(CGPoint)point withGestureType:(ZFPlayerGestureType)type touch:(nonnull UITouch *)touch;
99 99  
100 100 /// 视频尺寸改变
101   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size;
  101 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size;
102 102  
103 103 /// 标题和全屏模式
104 104 //- (void)showTitle:(NSString *_Nullable)title fullScreenMode:(ZFFullScreenMode)fullScreenMode;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/ControlView/ZFLandScapeControlView.m
  View file @d10bf4b
... ... @@ -321,11 +321,11 @@
321 321 return YES;
322 322 }
323 323  
324   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size {
  324 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size {
325 325 // self.lockBtn.hidden = self.player.orientationObserver.fullScreenMode == ZFFullScreenModePortrait;
326 326 }
327 327  
328   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime {
  328 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime {
329 329 if (!self.slider.isdragging) {
330 330 NSString *currentTimeString = [ZFUtilities convertTimeSecond:currentTime];
331 331 self.currentTimeLabel.text = currentTimeString;
... ... @@ -335,7 +335,7 @@
335 335 }
336 336 }
337 337  
338   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime {
  338 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime {
339 339 self.slider.bufferValue = videoPlayer.bufferProgress;
340 340 }
341 341  
... ...
CNLiveBBASMModule/Classes/CNBBASATool/ControlView/ZFNetworkSpeedMonitor.m
  View file @d10bf4b
... ... @@ -23,10 +23,10 @@
23 23 // THE SOFTWARE.
24 24  
25 25 #import "ZFNetworkSpeedMonitor.h"
26   -#if __has_include(<ZFPlayer/ZFPlayerLogManager.h>)
27   -#import <ZFPlayer/ZFPlayerLogManager.h>
  26 +#if __has_include(<ZFPlayer/CNZFPlayerLogManager.h>)
  27 +#import <ZFPlayer/CNZFPlayerLogManager.h>
28 28 #else
29   -#import "ZFPlayerLogManager.h"
  29 +#import "CNZFPlayerLogManager.h"
30 30 #endif
31 31 #include <arpa/inet.h>
32 32 #include <ifaddrs.h>
... ...
CNLiveBBASMModule/Classes/CNBBASATool/ControlView/ZFPortraitControlView.h
  View file @d10bf4b
... ... @@ -24,10 +24,10 @@
24 24  
25 25 #import <UIKit/UIKit.h>
26 26 #import "ZFSliderView.h"
27   -#if __has_include(<ZFPlayer/ZFPlayerController.h>)
28   -#import <ZFPlayer/ZFPlayerController.h>
  27 +#if __has_include(<ZFPlayer/CNZFPlayerController.h>)
  28 +#import <ZFPlayer/CNZFPlayerController.h>
29 29 #else
30   -#import "ZFPlayerController.h"
  30 +#import "CNZFPlayerController.h"
31 31 #endif
32 32  
33 33 NS_ASSUME_NONNULL_BEGIN
... ... @@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
59 59 @property (nonatomic, strong, readonly) UIButton *fullScreenBtn;
60 60  
61 61 /// 播放器
62   -@property (nonatomic, weak) ZFPlayerController *player;
  62 +@property (nonatomic, weak) CNZFPlayerController *player;
63 63  
64 64 /// slider滑动中
65 65 @property (nonatomic, copy, nullable) void(^sliderValueChanging)(CGFloat value,BOOL forward);
... ... @@ -107,10 +107,10 @@ NS_ASSUME_NONNULL_BEGIN
107 107 - (void)hideOrShowProgress:(BOOL)showProgress;
108 108  
109 109 /// 设置播放时间
110   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime;
  110 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime;
111 111  
112 112 /// 设置缓冲时间
113   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime;
  113 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime;
114 114  
115 115 /// 是否响应该手势
116 116 - (BOOL)shouldResponseGestureWithPoint:(CGPoint)point withGestureType:(ZFPlayerGestureType)type touch:(nonnull UITouch *)touch;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/ControlView/ZFPortraitControlView.m
  View file @d10bf4b
... ... @@ -429,7 +429,7 @@
429 429 return YES;
430 430 }
431 431  
432   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime {
  432 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer currentTime:(NSTimeInterval)currentTime totalTime:(NSTimeInterval)totalTime {
433 433 if (!self.slider.isdragging) {
434 434 NSString *currentTimeString = [ZFUtilities convertTimeSecond:currentTime];
435 435 self.currentTimeLabel.text = currentTimeString;
... ... @@ -439,7 +439,7 @@
439 439 }
440 440 }
441 441  
442   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime {
  442 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer bufferTime:(NSTimeInterval)bufferTime {
443 443 self.slider.bufferValue = videoPlayer.bufferProgress;
444 444 }
445 445  
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerController.h renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerController.h
  View file @d10bf4b
... ... @@ -28,13 +28,13 @@
28 28 #import "ZFOrientationObserver.h"
29 29 #import "ZFPlayerMediaControl.h"
30 30 #import "ZFPlayerGestureControl.h"
31   -#import "ZFPlayerNotification.h"
  31 +#import "CNZFPlayerNotification.h"
32 32 #import "ZFFloatView.h"
33 33 #import "UIScrollView+ZFPlayer.h"
34 34  
35 35 NS_ASSUME_NONNULL_BEGIN
36 36  
37   -@interface ZFPlayerController : NSObject
  37 +@interface CNZFPlayerController : NSObject
38 38  
39 39 /// The video contrainerView in normal model.
40 40 @property (nonatomic, strong) UIView *containerView;
... ... @@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
46 46 @property (nonatomic, strong) UIView<ZFPlayerMediaControl> *controlView;
47 47  
48 48 /// The notification manager class.
49   -@property (nonatomic, strong, readonly) ZFPlayerNotification *notification;
  49 +@property (nonatomic, strong, readonly) CNZFPlayerNotification *notification;
50 50  
51 51 /// The container view type.
52 52 @property (nonatomic, assign, readonly) ZFPlayerContainerType containerType;
... ... @@ -121,7 +121,7 @@ NS_ASSUME_NONNULL_BEGIN
121 121  
122 122 @end
123 123  
124   -@interface ZFPlayerController (ZFPlayerTimeControl)
  124 +@interface CNZFPlayerController (ZFPlayerTimeControl)
125 125  
126 126 /// The player current play time.
127 127 @property (nonatomic, readonly) NSTimeInterval currentTime;
... ... @@ -148,7 +148,7 @@ NS_ASSUME_NONNULL_BEGIN
148 148  
149 149 @end
150 150  
151   -@interface ZFPlayerController (ZFPlayerPlaybackControl)
  151 +@interface CNZFPlayerController (ZFPlayerPlaybackControl)
152 152  
153 153 /// Resume playback record.default is NO.
154 154 /// Memory storage playback records.
... ... @@ -405,7 +405,7 @@ NS_ASSUME_NONNULL_BEGIN
405 405  
406 406 @end
407 407  
408   -@interface ZFPlayerController (ZFPlayerViewGesture)
  408 +@interface CNZFPlayerController (ZFPlayerViewGesture)
409 409  
410 410 /// An instance of ZFPlayerGestureControl.
411 411 @property (nonatomic, readonly) ZFPlayerGestureControl *gestureControl;
... ... @@ -418,7 +418,7 @@ NS_ASSUME_NONNULL_BEGIN
418 418  
419 419 @end
420 420  
421   -@interface ZFPlayerController (ZFPlayerScrollView)
  421 +@interface CNZFPlayerController (ZFPlayerScrollView)
422 422  
423 423 /// The scroll view is `tableView` or `collectionView`.
424 424 @property (nonatomic, readonly, nullable) UIScrollView *scrollView;
... ... @@ -564,7 +564,7 @@ NS_ASSUME_NONNULL_BEGIN
564 564  
565 565 @end
566 566  
567   -@interface ZFPlayerController (ZFPlayerDeprecated)
  567 +@interface CNZFPlayerController (ZFPlayerDeprecated)
568 568  
569 569 /**
570 570 Add the playerView to cell.
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerController.m renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerController.m
  View file @d10bf4b
... ... @@ -22,7 +22,7 @@
22 22 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 23 // THE SOFTWARE.
24 24  
25   -#import "ZFPlayerController.h"
  25 +#import "CNZFPlayerController.h"
26 26 #import <objc/runtime.h>
27 27 #import <MediaPlayer/MediaPlayer.h>
28 28 #import <AVFoundation/AVFoundation.h>
... ... @@ -32,9 +32,9 @@
32 32  
33 33 static NSMutableDictionary <NSString* ,NSNumber *> *_zfPlayRecords;
34 34  
35   -@interface ZFPlayerController ()
  35 +@interface CNZFPlayerController ()
36 36  
37   -@property (nonatomic, strong) ZFPlayerNotification *notification;
  37 +@property (nonatomic, strong) CNZFPlayerNotification *notification;
38 38 @property (nonatomic, weak) UIScrollView *scrollView;
39 39 @property (nonatomic, strong) UISlider *volumeViewSlider;
40 40 @property (nonatomic, assign) NSInteger containerViewTag;
... ... @@ -48,7 +48,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
48 48  
49 49 @end
50 50  
51   -@implementation ZFPlayerController
  51 +@implementation CNZFPlayerController
52 52  
53 53 @dynamic scrollView;
54 54 @dynamic containerViewTag;
... ... @@ -91,22 +91,22 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
91 91 }
92 92  
93 93 + (instancetype)playerWithPlayerManager:(id<ZFPlayerMediaPlayback>)playerManager containerView:(nonnull UIView *)containerView {
94   - ZFPlayerController *player = [[self alloc] initWithPlayerManager:playerManager containerView:containerView];
  94 + CNZFPlayerController *player = [[self alloc] initWithPlayerManager:playerManager containerView:containerView];
95 95 return player;
96 96 }
97 97  
98 98 + (instancetype)playerWithScrollView:(UIScrollView *)scrollView playerManager:(id<ZFPlayerMediaPlayback>)playerManager containerViewTag:(NSInteger)containerViewTag {
99   - ZFPlayerController *player = [[self alloc] initWithScrollView:scrollView playerManager:playerManager containerViewTag:containerViewTag];
  99 + CNZFPlayerController *player = [[self alloc] initWithScrollView:scrollView playerManager:playerManager containerViewTag:containerViewTag];
100 100 return player;
101 101 }
102 102  
103 103 + (instancetype)playerWithScrollView:(UIScrollView *)scrollView playerManager:(id<ZFPlayerMediaPlayback>)playerManager containerView:(UIView *)containerView {
104   - ZFPlayerController *player = [[self alloc] initWithScrollView:scrollView playerManager:playerManager containerView:containerView];
  104 + CNZFPlayerController *player = [[self alloc] initWithScrollView:scrollView playerManager:playerManager containerView:containerView];
105 105 return player;
106 106 }
107 107  
108 108 - (instancetype)initWithPlayerManager:(id<ZFPlayerMediaPlayback>)playerManager containerView:(nonnull UIView *)containerView {
109   - ZFPlayerController *player = [self init];
  109 + CNZFPlayerController *player = [self init];
110 110 player.containerView = containerView;
111 111 player.currentPlayerManager = playerManager;
112 112 player.containerType = ZFPlayerContainerTypeView;
... ... @@ -114,7 +114,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
114 114 }
115 115  
116 116 - (instancetype)initWithScrollView:(UIScrollView *)scrollView playerManager:(id<ZFPlayerMediaPlayback>)playerManager containerViewTag:(NSInteger)containerViewTag {
117   - ZFPlayerController *player = [self init];
  117 + CNZFPlayerController *player = [self init];
118 118 player.scrollView = scrollView;
119 119 player.containerViewTag = containerViewTag;
120 120 player.currentPlayerManager = playerManager;
... ... @@ -123,7 +123,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
123 123 }
124 124  
125 125 - (instancetype)initWithScrollView:(UIScrollView *)scrollView playerManager:(id<ZFPlayerMediaPlayback>)playerManager containerView:(UIView *)containerView {
126   - ZFPlayerController *player = [self init];
  126 + CNZFPlayerController *player = [self init];
127 127 player.scrollView = scrollView;
128 128 player.containerView = containerView;
129 129 player.currentPlayerManager = playerManager;
... ... @@ -264,11 +264,11 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
264 264  
265 265 #pragma mark - getter
266 266  
267   -- (ZFPlayerNotification *)notification {
  267 +- (CNZFPlayerNotification *)notification {
268 268 if (!_notification) {
269   - _notification = [[ZFPlayerNotification alloc] init];
  269 + _notification = [[CNZFPlayerNotification alloc] init];
270 270 @weakify(self)
271   - _notification.willResignActive = ^(ZFPlayerNotification * _Nonnull registrar) {
  271 + _notification.willResignActive = ^(CNZFPlayerNotification * _Nonnull registrar) {
272 272 @strongify(self)
273 273 if (self.isViewControllerDisappear) return;
274 274 if (self.pauseWhenAppResignActive && self.currentPlayerManager.isPlaying) {
... ... @@ -281,13 +281,13 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
281 281 [[AVAudioSession sharedInstance] setActive:YES error:nil];
282 282 }
283 283 };
284   - _notification.didBecomeActive = ^(ZFPlayerNotification * _Nonnull registrar) {
  284 + _notification.didBecomeActive = ^(CNZFPlayerNotification * _Nonnull registrar) {
285 285 @strongify(self)
286 286 if (self.isViewControllerDisappear) return;
287 287 if (self.isPauseByEvent) self.pauseByEvent = NO;
288 288 // self.orientationObserver.lockedScreen = NO;
289 289 };
290   - _notification.oldDeviceUnavailable = ^(ZFPlayerNotification * _Nonnull registrar) {
  290 + _notification.oldDeviceUnavailable = ^(CNZFPlayerNotification * _Nonnull registrar) {
291 291 @strongify(self)
292 292 if (self.currentPlayerManager.isPlaying) {
293 293 [self.currentPlayerManager play];
... ... @@ -358,7 +358,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
358 358  
359 359 @end
360 360  
361   -@implementation ZFPlayerController (ZFPlayerTimeControl)
  361 +@implementation CNZFPlayerController (ZFPlayerTimeControl)
362 362  
363 363 - (NSTimeInterval)currentTime {
364 364 return self.currentPlayerManager.currentTime;
... ... @@ -388,7 +388,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
388 388  
389 389 @end
390 390  
391   -@implementation ZFPlayerController (ZFPlayerPlaybackControl)
  391 +@implementation CNZFPlayerController (ZFPlayerPlaybackControl)
392 392  
393 393 - (void)playTheNext {
394 394 if (self.assetURLs.count > 0) {
... ... @@ -772,7 +772,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
772 772  
773 773 @end
774 774  
775   -@implementation ZFPlayerController (ZFPlayerViewGesture)
  775 +@implementation CNZFPlayerController (ZFPlayerViewGesture)
776 776  
777 777 #pragma mark - getter
778 778  
... ... @@ -857,7 +857,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
857 857  
858 858 @end
859 859  
860   -@implementation ZFPlayerController (ZFPlayerScrollView)
  860 +@implementation CNZFPlayerController (ZFPlayerScrollView)
861 861  
862 862 + (void)initialize {
863 863 static dispatch_once_t onceToken;
... ... @@ -1239,7 +1239,7 @@ static NSMutableDictionary &lt;NSString* ,NSNumber *&gt; *_zfPlayRecords;
1239 1239 #pragma clang diagnostic push
1240 1240 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
1241 1241  
1242   -@implementation ZFPlayerController (ZFPlayerDeprecated)
  1242 +@implementation CNZFPlayerController (ZFPlayerDeprecated)
1243 1243  
1244 1244 - (void)updateScrollViewPlayerToCell {
1245 1245 if (self.currentPlayerManager.view && self.playingIndexPath && self.containerViewTag) {
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerLogManager.h renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerLogManager.h
  View file @d10bf4b
... ... @@ -22,12 +22,12 @@
22 22 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 23 // THE SOFTWARE.
24 24  
25   -#define ZFPlayerLog(format,...) [ZFPlayerLogManager logWithFunction:__FUNCTION__ lineNumber:__LINE__ formatString:[NSString stringWithFormat:format, ##__VA_ARGS__]]
  25 +#define ZFPlayerLog(format,...) [CNZFPlayerLogManager logWithFunction:__FUNCTION__ lineNumber:__LINE__ formatString:[NSString stringWithFormat:format, ##__VA_ARGS__]]
26 26  
27 27 #import <Foundation/Foundation.h>
28 28 #import <UIKit/UIKit.h>
29 29  
30   -@interface ZFPlayerLogManager : NSObject
  30 +@interface CNZFPlayerLogManager : NSObject
31 31  
32 32 // Set the log output status.
33 33 + (void)setLogEnable:(BOOL)enable;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerLogManager.m renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerLogManager.m
  View file @d10bf4b
... ... @@ -22,11 +22,11 @@
22 22 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 23 // THE SOFTWARE.
24 24  
25   -#import "ZFPlayerLogManager.h"
  25 +#import "CNZFPlayerLogManager.h"
26 26  
27 27 static BOOL kLogEnable = NO;
28 28  
29   -@implementation ZFPlayerLogManager
  29 +@implementation CNZFPlayerLogManager
30 30  
31 31 + (void)setLogEnable:(BOOL)enable {
32 32 kLogEnable = enable;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerNotification.h renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerNotification.h
  View file @d10bf4b
... ... @@ -32,19 +32,19 @@ typedef NS_ENUM(NSUInteger, ZFPlayerBackgroundState) {
32 32 ZFPlayerBackgroundStateBackground, // From the foreground to the background.
33 33 };
34 34  
35   -@interface ZFPlayerNotification : NSObject
  35 +@interface CNZFPlayerNotification : NSObject
36 36  
37 37 @property (nonatomic, readonly) ZFPlayerBackgroundState backgroundState;
38 38  
39   -@property (nonatomic, copy, nullable) void(^willResignActive)(ZFPlayerNotification *registrar);
  39 +@property (nonatomic, copy, nullable) void(^willResignActive)(CNZFPlayerNotification *registrar);
40 40  
41   -@property (nonatomic, copy, nullable) void(^didBecomeActive)(ZFPlayerNotification *registrar);
  41 +@property (nonatomic, copy, nullable) void(^didBecomeActive)(CNZFPlayerNotification *registrar);
42 42  
43   -@property (nonatomic, copy, nullable) void(^newDeviceAvailable)(ZFPlayerNotification *registrar);
  43 +@property (nonatomic, copy, nullable) void(^newDeviceAvailable)(CNZFPlayerNotification *registrar);
44 44  
45   -@property (nonatomic, copy, nullable) void(^oldDeviceUnavailable)(ZFPlayerNotification *registrar);
  45 +@property (nonatomic, copy, nullable) void(^oldDeviceUnavailable)(CNZFPlayerNotification *registrar);
46 46  
47   -@property (nonatomic, copy, nullable) void(^categoryChange)(ZFPlayerNotification *registrar);
  47 +@property (nonatomic, copy, nullable) void(^categoryChange)(CNZFPlayerNotification *registrar);
48 48  
49 49 @property (nonatomic, copy, nullable) void(^volumeChanged)(float volume);
50 50  
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerNotification.m renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerNotification.m
  View file @d10bf4b
... ... @@ -22,15 +22,15 @@
22 22 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 23 // THE SOFTWARE.
24 24  
25   -#import "ZFPlayerNotification.h"
  25 +#import "CNZFPlayerNotification.h"
26 26  
27   -@interface ZFPlayerNotification ()
  27 +@interface CNZFPlayerNotification ()
28 28  
29 29 @property (nonatomic, assign) ZFPlayerBackgroundState backgroundState;
30 30  
31 31 @end
32 32  
33   -@implementation ZFPlayerNotification
  33 +@implementation CNZFPlayerNotification
34 34  
35 35 - (void)addNotification {
36 36 [[NSNotificationCenter defaultCenter] addObserver:self
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerView.h renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerView.h
  View file @d10bf4b
... ... @@ -25,7 +25,7 @@
25 25 #import <UIKit/UIKit.h>
26 26 #import "ZFPlayerConst.h"
27 27  
28   -@interface ZFPlayerView : UIView
  28 +@interface CNZFPlayerView : UIView
29 29  
30 30 /// player content view.
31 31 @property (nonatomic, strong) UIView *playerView;
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerView.m renamed to CNLiveBBASMModule/Classes/CNBBASATool/Core/CNZFPlayerView.m
  View file @d10bf4b
... ... @@ -22,10 +22,10 @@
22 22 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 23 // THE SOFTWARE.
24 24  
25   -#import "ZFPlayerView.h"
  25 +#import "CNZFPlayerView.h"
26 26 #import "ZFPlayerConst.h"
27 27  
28   -@implementation ZFPlayerView
  28 +@implementation CNZFPlayerView
29 29 @synthesize presentationSize = _presentationSize;
30 30 @synthesize coverImageView = _coverImageView;
31 31  
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/UIScrollView+ZFPlayer.h
  View file @d10bf4b
... ... @@ -219,10 +219,10 @@ Scroll to indexPath with position.
219 219 @interface UIScrollView (ZFPlayerDeprecated)
220 220  
221 221 /// The block invoked When the player did stop scroll.
222   -@property (nonatomic, copy, nullable) void(^zf_scrollViewDidStopScrollCallback)(NSIndexPath *indexPath) __attribute__((deprecated("use `ZFPlayerController.zf_scrollViewDidEndScrollingCallback` instead.")));
  222 +@property (nonatomic, copy, nullable) void(^zf_scrollViewDidStopScrollCallback)(NSIndexPath *indexPath) __attribute__((deprecated("use `CNZFPlayerController.zf_scrollViewDidEndScrollingCallback` instead.")));
223 223  
224 224 /// The block invoked When the player should play.
225   -@property (nonatomic, copy, nullable) void(^zf_shouldPlayIndexPathCallback)(NSIndexPath *indexPath) __attribute__((deprecated("use `ZFPlayerController.zf_playerShouldPlayInScrollView` instead.")));
  225 +@property (nonatomic, copy, nullable) void(^zf_shouldPlayIndexPathCallback)(NSIndexPath *indexPath) __attribute__((deprecated("use `CNZFPlayerController.zf_playerShouldPlayInScrollView` instead.")));
226 226  
227 227  
228 228 /// Scroll to indexPath position `ZFPlayerScrollViewScrollPositionTop` with animations.
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFOrientationObserver.h
  View file @d10bf4b
... ... @@ -23,8 +23,8 @@
23 23 // THE SOFTWARE.
24 24  
25 25 #import <UIKit/UIKit.h>
26   -#import "ZFPlayerView.h"
27   -#import "ZFPlayerView.h"
  26 +#import "CNZFPlayerView.h"
  27 +#import "CNZFPlayerView.h"
28 28  
29 29 NS_ASSUME_NONNULL_BEGIN
30 30  
... ... @@ -81,11 +81,11 @@ typedef NS_OPTIONS(NSUInteger, ZFDisablePortraitGestureTypes) {
81 81 @interface ZFOrientationObserver : NSObject
82 82  
83 83 /// update the rotateView and containerView.
84   -- (void)updateRotateView:(ZFPlayerView *)rotateView
  84 +- (void)updateRotateView:(CNZFPlayerView *)rotateView
85 85 containerView:(UIView *)containerView;
86 86  
87 87 /// list play
88   -- (void)updateRotateView:(ZFPlayerView *)rotateView
  88 +- (void)updateRotateView:(CNZFPlayerView *)rotateView
89 89 rotateViewAtCell:(UIView *)cell
90 90 playerViewTag:(NSInteger)playerViewTag;
91 91  
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFOrientationObserver.m
  View file @d10bf4b
... ... @@ -78,7 +78,7 @@
78 78  
79 79 @interface ZFOrientationObserver () <ZFLandscapeViewControllerDelegate>
80 80  
81   -@property (nonatomic, weak) ZFPlayerView *view;
  81 +@property (nonatomic, weak) CNZFPlayerView *view;
82 82  
83 83 @property (nonatomic, assign, getter=isFullScreen) BOOL fullScreen;
84 84  
... ... @@ -122,14 +122,14 @@
122 122 return self;
123 123 }
124 124  
125   -- (void)updateRotateView:(ZFPlayerView *)rotateView
  125 +- (void)updateRotateView:(CNZFPlayerView *)rotateView
126 126 containerView:(UIView *)containerView {
127 127 self.rotateType = ZFRotateTypeNormal;
128 128 self.view = rotateView;
129 129 self.containerView = containerView;
130 130 }
131 131  
132   -- (void)updateRotateView:(ZFPlayerView *)rotateView rotateViewAtCell:(UIView *)cell playerViewTag:(NSInteger)playerViewTag {
  132 +- (void)updateRotateView:(CNZFPlayerView *)rotateView rotateViewAtCell:(UIView *)cell playerViewTag:(NSInteger)playerViewTag {
133 133 self.rotateType = ZFRotateTypeCell;
134 134 self.view = rotateView;
135 135 self.cell = cell;
... ... @@ -515,7 +515,7 @@
515 515 }
516 516 }
517 517  
518   -- (void)setView:(ZFPlayerView *)view {
  518 +- (void)setView:(CNZFPlayerView *)view {
519 519 if (view == _view) {
520 520 return;
521 521 }
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayer.h
  View file @d10bf4b
... ... @@ -30,9 +30,9 @@ FOUNDATION_EXPORT double ZFPlayerVersionNumber;
30 30 //! Project version string for ZFPlayer.
31 31 FOUNDATION_EXPORT const unsigned char ZFPlayerVersionString[];
32 32  
33   -#import "ZFPlayerController.h"
  33 +#import "CNZFPlayerController.h"
34 34 #import "ZFPlayerMediaControl.h"
35 35 #import "ZFKVOController.h"
36 36 #import "UIScrollView+ZFPlayer.h"
37   -#import "ZFPlayerLogManager.h"
  37 +#import "CNZFPlayerLogManager.h"
38 38 #import "ZFPlayerConst.h"
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerMediaControl.h
  View file @d10bf4b
... ... @@ -27,7 +27,7 @@
27 27 //#import "ZFOrientationObserver.h"
28 28 #import "ZFPlayerGestureControl.h"
29 29 #import "ZFReachabilityManager.h"
30   -@class ZFPlayerController;
  30 +@class CNZFPlayerController;
31 31  
32 32 NS_ASSUME_NONNULL_BEGIN
33 33  
... ... @@ -35,20 +35,20 @@ NS_ASSUME_NONNULL_BEGIN
35 35  
36 36 @required
37 37 /// Current playerController
38   -@property (nonatomic, weak) ZFPlayerController *player;
  38 +@property (nonatomic, weak) CNZFPlayerController *player;
39 39  
40 40 @optional
41 41  
42 42 #pragma mark - Playback state
43 43  
44 44 /// When the player prepare to play the video.
45   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer prepareToPlay:(NSURL *)assetURL;
  45 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer prepareToPlay:(NSURL *)assetURL;
46 46  
47 47 /// When th player playback state changed.
48   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer playStateChanged:(ZFPlayerPlaybackState)state;
  48 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer playStateChanged:(ZFPlayerPlaybackState)state;
49 49  
50 50 /// When th player loading state changed.
51   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer loadStateChanged:(ZFPlayerLoadState)state;
  51 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer loadStateChanged:(ZFPlayerLoadState)state;
52 52  
53 53 #pragma mark - progress
54 54  
... ... @@ -59,39 +59,39 @@ NS_ASSUME_NONNULL_BEGIN
59 59 @param currentTime the current play time.
60 60 @param totalTime the video total time.
61 61 */
62   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer
  62 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer
63 63 currentTime:(NSTimeInterval)currentTime
64 64 totalTime:(NSTimeInterval)totalTime;
65 65  
66 66 /**
67 67 When buffer progress changed.
68 68 */
69   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer
  69 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer
70 70 bufferTime:(NSTimeInterval)bufferTime;
71 71  
72 72 /**
73 73 When you are dragging to change the video progress.
74 74 */
75   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer
  75 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer
76 76 draggingTime:(NSTimeInterval)seekTime
77 77 totalTime:(NSTimeInterval)totalTime;
78 78  
79 79 /**
80 80 When play end.
81 81 */
82   -- (void)videoPlayerPlayEnd:(ZFPlayerController *)videoPlayer;
  82 +- (void)videoPlayerPlayEnd:(CNZFPlayerController *)videoPlayer;
83 83  
84 84 /**
85 85 When play failed.
86 86 */
87   -- (void)videoPlayerPlayFailed:(ZFPlayerController *)videoPlayer error:(id)error;
  87 +- (void)videoPlayerPlayFailed:(CNZFPlayerController *)videoPlayer error:(id)error;
88 88  
89 89 #pragma mark - lock screen
90 90  
91 91 /**
92 92 When set `videoPlayer.lockedScreen`.
93 93 */
94   -- (void)lockedVideoPlayer:(ZFPlayerController *)videoPlayer lockedScreen:(BOOL)locked;
  94 +- (void)lockedVideoPlayer:(CNZFPlayerController *)videoPlayer lockedScreen:(BOOL)locked;
95 95  
96 96 #pragma mark - Screen rotation
97 97  
... ... @@ -110,14 +110,14 @@ NS_ASSUME_NONNULL_BEGIN
110 110 /**
111 111 When the network changed
112 112 */
113   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer reachabilityChanged:(ZFReachabilityStatus)status;
  113 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer reachabilityChanged:(ZFReachabilityStatus)status;
114 114  
115 115 #pragma mark - The video size changed
116 116  
117 117 /**
118 118 When the video size changed
119 119 */
120   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size;
  120 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer presentationSizeChanged:(CGSize)size;
121 121  
122 122 #pragma mark - Gesture
123 123  
... ... @@ -172,37 +172,37 @@ NS_ASSUME_NONNULL_BEGIN
172 172 /**
173 173 When the player will appear in scrollView.
174 174 */
175   -- (void)playerWillAppearInScrollView:(ZFPlayerController *)videoPlayer;
  175 +- (void)playerWillAppearInScrollView:(CNZFPlayerController *)videoPlayer;
176 176  
177 177 /**
178 178 When the player did appear in scrollView.
179 179 */
180   -- (void)playerDidAppearInScrollView:(ZFPlayerController *)videoPlayer;
  180 +- (void)playerDidAppearInScrollView:(CNZFPlayerController *)videoPlayer;
181 181  
182 182 /**
183 183 When the player will disappear in scrollView.
184 184 */
185   -- (void)playerWillDisappearInScrollView:(ZFPlayerController *)videoPlayer;
  185 +- (void)playerWillDisappearInScrollView:(CNZFPlayerController *)videoPlayer;
186 186  
187 187 /**
188 188 When the player did disappear in scrollView.
189 189 */
190   -- (void)playerDidDisappearInScrollView:(ZFPlayerController *)videoPlayer;
  190 +- (void)playerDidDisappearInScrollView:(CNZFPlayerController *)videoPlayer;
191 191  
192 192 /**
193 193 When the player appearing in scrollView.
194 194 */
195   -- (void)playerAppearingInScrollView:(ZFPlayerController *)videoPlayer playerApperaPercent:(CGFloat)playerApperaPercent;
  195 +- (void)playerAppearingInScrollView:(CNZFPlayerController *)videoPlayer playerApperaPercent:(CGFloat)playerApperaPercent;
196 196  
197 197 /**
198 198 When the player disappearing in scrollView.
199 199 */
200   -- (void)playerDisappearingInScrollView:(ZFPlayerController *)videoPlayer playerDisapperaPercent:(CGFloat)playerDisapperaPercent;
  200 +- (void)playerDisappearingInScrollView:(CNZFPlayerController *)videoPlayer playerDisapperaPercent:(CGFloat)playerDisapperaPercent;
201 201  
202 202 /**
203 203 When the small float view show.
204 204 */
205   -- (void)videoPlayer:(ZFPlayerController *)videoPlayer floatViewShow:(BOOL)show;
  205 +- (void)videoPlayer:(CNZFPlayerController *)videoPlayer floatViewShow:(BOOL)show;
206 206  
207 207 @end
208 208  
... ...
CNLiveBBASMModule/Classes/CNBBASATool/Core/ZFPlayerMediaPlayback.h
  View file @d10bf4b
... ... @@ -23,7 +23,7 @@
23 23 // THE SOFTWARE.
24 24  
25 25 #import <Foundation/Foundation.h>
26   -#import "ZFPlayerView.h"
  26 +#import "CNZFPlayerView.h"
27 27 #import "ZFPlayerConst.h"
28 28  
29 29 NS_ASSUME_NONNULL_BEGIN
... ... @@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
32 32  
33 33 @required
34 34 /// The view must inherited `ZFPlayerView`,this view deals with some gesture conflicts.
35   -@property (nonatomic) ZFPlayerView *view;
  35 +@property (nonatomic) CNZFPlayerView *view;
36 36  
37 37 /// The player volume.
38 38 /// Only affects audio volume for the player instance and not for the device.
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNVideo/CNPlayerManager.h
  View file @d10bf4b
... ... @@ -7,7 +7,7 @@
7 7 //
8 8  
9 9 #import <Foundation/Foundation.h>
10   -#import "ZFPlayerController.h"
  10 +#import "CNZFPlayerController.h"
11 11  
12 12 NS_ASSUME_NONNULL_BEGIN
13 13  
... ... @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
15 15 + (instancetype)shareInstance;
16 16  
17 17 /// 当前活跃的播放器
18   -@property (nonatomic, weak) ZFPlayerController *currentActivePlayer;
  18 +@property (nonatomic, weak) CNZFPlayerController *currentActivePlayer;
19 19 @end
20 20  
21 21 NS_ASSUME_NONNULL_END
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNVideo/CNVideoVC.h
  View file @d10bf4b
... ... @@ -7,13 +7,13 @@
7 7 //
8 8  
9 9 #import <UIKit/UIKit.h>
10   -#import "ZFPlayerController.h"
  10 +#import "CNZFPlayerController.h"
11 11  
12 12 NS_ASSUME_NONNULL_BEGIN
13 13  
14 14 @interface CNVideoVC : UIViewController
15 15  
16   -@property (nonatomic, strong) ZFPlayerController *videoPlayer;
  16 +@property (nonatomic, strong) CNZFPlayerController *videoPlayer;
17 17 @property (nonatomic, weak) id delegate;
18 18  
19 19 // 加载视频数据
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNVideo/CNVideoVC.m
  View file @d10bf4b
... ... @@ -7,7 +7,7 @@
7 7 //
8 8  
9 9 #import "CNVideoVC.h"
10   -#import "ZFPlayerControlView.h"
  10 +#import "CNZFPlayerControlView.h"
11 11 #import "ZFAVPlayerManager.h"
12 12 #import "CNVideoModel.h"
13 13 #import <MJExtension/NSObject+MJKeyValue.h>
... ... @@ -15,7 +15,7 @@
15 15  
16 16 @interface CNVideoVC ()
17 17 @property (nonatomic, strong) UIView *containerView;
18   -@property (nonatomic, strong) ZFPlayerControlView *controlView;
  18 +@property (nonatomic, strong) CNZFPlayerControlView *controlView;
19 19 @property (nonatomic, strong) UIButton *playBtn;
20 20 @property (nonatomic, strong) CNVideoModel *playerModel;
21 21 @end
... ... @@ -28,7 +28,7 @@
28 28 [self.view addSubview:self.containerView];
29 29  
30 30 ZFAVPlayerManager *playerManager = [[ZFAVPlayerManager alloc] init];
31   - self.videoPlayer = [ZFPlayerController playerWithPlayerManager:playerManager containerView:self.containerView];
  31 + self.videoPlayer = [CNZFPlayerController playerWithPlayerManager:playerManager containerView:self.containerView];
32 32 self.videoPlayer.controlView = self.controlView;
33 33 self.videoPlayer.shouldAutoPlay = NO;
34 34  
... ... @@ -128,9 +128,9 @@
128 128 return UIInterfaceOrientationMaskPortrait;
129 129 }
130 130 #pragma mark - Getting
131   -- (ZFPlayerControlView *)controlView {
  131 +- (CNZFPlayerControlView *)controlView {
132 132 if (!_controlView) {
133   - _controlView = [ZFPlayerControlView new];
  133 + _controlView = [CNZFPlayerControlView new];
134 134 _controlView.fastViewAnimated = YES;
135 135 _controlView.autoHiddenTimeInterval = 5;
136 136 _controlView.autoFadeTimeInterval = 0.5;
... ...