no message

zhangxiaowen
1 parent d690c31f
Showing 5 changed files with 19 additions and 17 deletions
CNLivePlayer.podspec
CNLivePlayer/Classes/Player/CNLivePlayer.h
CNLivePlayer/Classes/Player/CNLivePlayer.m
Example/CNLivePlayer/CNLiveViewController.m
Example/Podfile
@@ -29,8 +29,9 @@ TODO: Add long description of the pod here.
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
   s.ios.deployment_target = '9.0'
-
+  # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.source_files = 'CNLivePlayer/Classes/**/*'
+  
   s.subspec 'Player' do |ss|
       ss.source_files = 'CNLivePlayer/Classes/Player/*.{h,m}'
   end
@@ -49,9 +50,9 @@ TODO: Add long description of the pod here.
   s.static_framework = true
   s.vendored_frameworks = 'CNLivePlayer/Classes/*.framework'
+  s.libraries = 'z', 'bz2', 'stdc++'
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  s.frameworks = 'UIKit', 'MediaPlayer'
+  s.frameworks = 'UIKit', 'MediaPlayer', 'VideoToolbox'
   s.dependency 'libksygpulive/KSYGPUResource'
   s.dependency 'libksygpulive/libksygpulive'
   s.dependency 'ksyhttpcache'
@@ -10,9 +10,19 @@
 #import <libksygpulive/KSYMoviePlayerController.h>
 #import "KSYMoviePlayerDefines.h"
+//缓存视频
+#import <KSYHTTPCache/KSYHTTPProxyService.h>
+#import <KSYHTTPCache/HTTPCacheDefines.h>
+
 // 播放器管理类
 #import "CNLivePlayerManager.h"
+//缓存url
+#import "CNLivePlayerCache.h"
+
+//常量
+#import "CNLivePlayerConst.h"
+
 NS_ASSUME_NONNULL_BEGIN
 typedef NS_ENUM(NSUInteger, CNLivePlayerType) {
     CNLivePlayerVod,   //点播
@@ -7,21 +7,11 @@
 //
 #import "CNLivePlayer.h"
-#import "CNLivePlayerManager.h"
-//缓存视频
-#import <KSYHTTPCache/KSYHTTPProxyService.h>
-#import <KSYHTTPCache/HTTPCacheDefines.h>
-
-//缓存url
-#import "CNLivePlayerCache.h"
 #import "CommonCrypto/CommonDigest.h"
 //数据请求
 #import "CNLivePlayerNetworkManager.h"
-//常量
-#import "CNLivePlayerConst.h"
 //工具
 #import "CNLivePlayerTools.h"
-
 //IM
 #import <CNLiveMsgTools/CNLiveMsgManager.h>
@@ -186,6 +176,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
 }
 - (void)setPlayerWithContentId:(NSString *)contentId type:(CNLivePlayerType)type authSuccess:(AuthSuccessBlock)authSuccessBlock authFailure:(AuthFailureBlock)authFailureBlock{
+    _retryTime = 0;
     _type = type;
     switch (type) {
         case CNLivePlayerVod:
@@ -643,7 +634,10 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
     if (!_contentType || _contentType.length == 0) {
         return;
     }
-    _statTimer = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(statTimerAction) userInfo:nil repeats:YES];
+    if(!_statTimer){
+        _statTimer = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(statTimerAction) userInfo:nil repeats:YES];
+
+    }
 }
@@ -52,8 +52,6 @@
     [self.view addSubview:btn];
-    
-    
 //    KSYMoviePlayerController *player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8"]];
 //    player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
 //    player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
@@ -8,6 +8,5 @@ target &#39;CNLivePlayer_Example&#39; do
   target 'CNLivePlayer_Tests' do
     inherit! :search_paths
-    
   end
 end