iOS Team / CNLivePlayer · Commits

Commit d9bf2956c04ecf54871915f00fd67beb9fed5979

Authored by zhangxiaowen
1 parent a589af84

no message

Inline Side-by-side
Showing 2 changed files with 2 additions and 16 deletions
CNLivePlayer/Classes/Player/CNLivePlayer.m
  View file @d9bf295
@@ -42,7 +42,6 @@ NSString * const CNLiveAnchorStatusChangedNotification = @"CNLiveAnchorStatusCha @@ -42,7 +42,6 @@ NSString * const CNLiveAnchorStatusChangedNotification = @"CNLiveAnchorStatusCha
42 42
43 } 43 }
44 @property (nonatomic, strong, readwrite) UIView *view; 44 @property (nonatomic, strong, readwrite) UIView *view;
45 -@property (nonatomic, strong) UIImageView *imageView;  
46 @property (nonatomic, copy) NSString *videoUrl; 45 @property (nonatomic, copy) NSString *videoUrl;
47 46
48 @end 47 @end
@@ -214,8 +213,6 @@ NSString * const CNLiveAnchorStatusChangedNotification = @"CNLiveAnchorStatusCha @@ -214,8 +213,6 @@ NSString * const CNLiveAnchorStatusChangedNotification = @"CNLiveAnchorStatusCha
214 break; 213 break;
215 214
216 } 215 }
217 - self.imageView.image = [_player thumbnailImageAtCurrentTime];  
218 - self.imageView.hidden = NO;  
219 216
220 __weak typeof(self) weakSelf = self; 217 __weak typeof(self) weakSelf = self;
221 dispatch_async(dispatch_get_global_queue(0, 0), ^{ 218 dispatch_async(dispatch_get_global_queue(0, 0), ^{
@@ -684,23 +681,12 @@ NSString * const CNLiveAnchorStatusChangedNotification = @"CNLiveAnchorStatusCha @@ -684,23 +681,12 @@ NSString * const CNLiveAnchorStatusChangedNotification = @"CNLiveAnchorStatusCha
684 681
685 } 682 }
686 683
687 -- (UIImageView *)imageView {  
688 - if (!_imageView) {  
689 - _imageView = [[UIImageView alloc] initWithFrame:self.player.view.bounds];  
690 - _imageView.backgroundColor = [UIColor redColor];  
691 - [self.player.view addSubview:_imageView];  
692 - }  
693 - return _imageView;  
694 -  
695 -}  
696 -  
697 /* 准备视频播放 684 /* 准备视频播放
698 * 685 *
699 * MPMediaPlaybackIsPreparedToPlayDidChangeNotification， 播放器完成对视频文件的初始化时发送通知 686 * MPMediaPlaybackIsPreparedToPlayDidChangeNotification， 播放器完成对视频文件的初始化时发送通知
700 * 687 *
701 */ 688 */
702 - (void)prepareToPlay { 689 - (void)prepareToPlay {
703 - _imageView.hidden = YES;  
704 [_player prepareToPlay]; 690 [_player prepareToPlay];
705 691
706 } 692 }
CNLivePlayer/Classes/Player/CNLivePlayerConst.h
  View file @d9bf295
@@ -21,10 +21,10 @@ @@ -21,10 +21,10 @@
21 #define authUrl [NSString stringWithFormat:@"%@/platform/valid", [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2" : @"http://api.cnlive.com/open/api2"] 21 #define authUrl [NSString stringWithFormat:@"%@/platform/valid", [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2" : @"http://api.cnlive.com/open/api2"]
22 22
23 #pragma mark - 点播 23 #pragma mark - 点播
24 -#define vodUrl [CNLivePlayerManager manager].isTestEnvironment?@"http://test.open.cnlive.com/openapi/api2/vod_ips/vodplayByAPP":@"http://api.cnlive.com/open/api2/vod_ips/vodplayByAPP" 24 +#define vodUrl [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2/vod_ips/vodplayByAPP":@"http://api.cnlive.com/open/api2/vod_ips/vodplayByAPP"
25 25
26 #pragma mark - 直播 26 #pragma mark - 直播
27 -#define liveUrl [CNLivePlayerManager manager].isTestEnvironment?@"http://test.open.cnlive.com/openapi/api2/live_ips/liveplayByAPP":@"http://api.cnlive.com/open/api2/live_ips/liveplayByAPP" 27 +#define liveUrl [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2/live_ips/liveplayByAPP":@"http://api.cnlive.com/open/api2/live_ips/liveplayByAPP"
28 28
29 // 存储鉴权 29 // 存储鉴权
30 #define kCNLivePlayerSDKAuthentication @"kCNLivePlayerSDKAuthentication" 30 #define kCNLivePlayerSDKAuthentication @"kCNLivePlayerSDKAuthentication"