no message

zhangxiaowen
1 parent ee67e19b
Showing 12 changed files with 237 additions and 188 deletions
CNLivePlayer.podspec
CNLivePlayer/Classes/DataRequest/CNLivePlayerCache.h
CNLivePlayer/Classes/DataRequest/CNLivePlayerCache.m
CNLivePlayer/Classes/DataRequest/CNLivePlayerNetworkManager.h
CNLivePlayer/Classes/DataRequest/CNLivePlayerNetworkManager.m
CNLivePlayer/Classes/Player/CNLivePlayer.h
CNLivePlayer/Classes/Player/CNLivePlayer.m
CNLivePlayer/Classes/Player/CNLivePlayerConst.h
CNLivePlayer/Classes/Player/CNLivePlayerManager.m
CNLivePlayer/Classes/Tools/CNLivePlayerTools.h
CNLivePlayer/Classes/Tools/CNLivePlayerTools.m
Example/CNLivePlayer.xcodeproj/project.pbxproj
@@ -47,10 +47,13 @@ TODO: Add long description of the pod here.
       ss.source_files = 'CNLivePlayer/Classes/Tools/*.{h,m}'
   end
+  s.static_framework = true
+  
   # s.public_header_files = 'Pod/Classes/**/*.h'
   s.frameworks = 'UIKit', 'MediaPlayer'
   s.dependency 'libksygpulive/KSYGPUResource'
   s.dependency 'libksygpulive/libksygpulive'
+  s.dependency 'ksyhttpcache'
   s.dependency 'GPUImage'
   s.dependency 'YYCache'
@@ -68,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN
  * 磁盘最大缓存开销
  * 默认是30*1024*1024
  */
-+ (void)setCostLimit:(NSInteger)costLimit;
++ (void)player_SetCostLimit:(NSInteger)costLimit;
 @end
@@ -18,7 +18,7 @@ static YYCache *_dataCache;
     [super initialize];
     // 实例化方式一
     _dataCache = [[YYCache alloc] initWithName:PlayerCache];
-    [CNLivePlayerCache setCostLimit:1024*1024*20];
+    [CNLivePlayerCache player_SetCostLimit:1024*1024*30];
 }
@@ -29,7 +29,6 @@ static YYCache *_dataCache;
  * @param key 保存的key
  */
 + (void)player_SaveDataCache:(id)data forKey:(NSString *)key {
-    // [[self sharedManager]setObject:data forKey:key];
     // 默认会开启线程缓存
     [_dataCache setObject:data forKey:key withBlock:nil];
@@ -111,7 +110,9 @@ static YYCache *_dataCache;
  * 磁盘最大缓存开销
  * 默认是30*1024*1024
  */
-+ (void)setCostLimit:(NSInteger)costLimit {
++ (void)player_SetCostLimit:(NSInteger)costLimit {
     [_dataCache.diskCache setCostLimit:costLimit];//磁盘最大缓存开销
+    
 }
+
 @end
@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
+typedef void(^GetVideoURLSuccessBlock)(NSString * _Nullable videoURL, NSInteger code);
 @interface CNLivePlayerNetworkManager : NSObject
 /**
@@ -51,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  获取视频url
  */
-+ (void)getVideoURL:(nullable NSString *)URL success:(nullable void (^)(NSString *_Nullable videoURL, NSInteger code))success;
++ (void)getVideoURL:(nullable NSString *)URL success:(GetVideoURLSuccessBlock)success;
 @end
@@ -26,8 +26,6 @@ static  NSTimeInterval TimeoutInterval = 30.0 ;
  */
 static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
-typedef void(^GetVideoURLSuccessBlock)(NSString * _Nullable videoURL, NSInteger code);
-
 @interface CNLivePlayerNetworkManager()<NSURLSessionDelegate>
 @property (nonatomic, assign) BOOL result;
 @property (nonatomic, copy) GetVideoURLSuccessBlock successBlock;
@@ -119,7 +117,8 @@ static CNLivePlayerNetworkManager *_manager = nil;
         dispatch_async(dispatch_get_main_queue(), ^{
             if (error) {
                 failure(response,error);
-            }else{
+            }
+            else{
                 if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
                     NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
                     if (httpResponse.statusCode < 400) {
@@ -129,7 +128,8 @@ static CNLivePlayerNetworkManager *_manager = nil;
                         NSError *failureError = [NSError errorWithDomain:NSURLErrorDomain code:httpResponse.statusCode userInfo:httpResponse.allHeaderFields];
                         failure(httpResponse, failureError);
                     }
-                } else {
+                }
+                else {
                     failure(response, error);
                 }
             }
@@ -176,7 +176,7 @@ static CNLivePlayerNetworkManager *_manager = nil;
 /**
  *  获取视频url
  */
-+ (void)getVideoURL:(NSString *)URL success:(void (^)(NSString * _Nullable, NSInteger))success {
++ (void)getVideoURL:(nullable NSString *)URL success:(GetVideoURLSuccessBlock)success {
     [CNLivePlayerNetworkManager manager].successBlock = success;
     _manager.result = NO;
@@ -17,10 +17,33 @@
 #import "CNLivePlayerManager.h"
 NS_ASSUME_NONNULL_BEGIN
+typedef NS_ENUM(NSUInteger, CNLivePlayerType) {
+    CNLivePlayerVod, //点播
+    CNLivePlayerLive //直播
+
+};
 @interface CNLivePlayer : NSObject
+/*
+ * 播放器类型
+ */
+@property (nonatomic, assign) CNLivePlayerType type;
+/*
+ * 播放器
+ */
 @property (nonatomic, strong) KSYMoviePlayerController *player;
+//
+///* 初始化点播播放器  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
+// *
+// * contentId           点播视频Id
+// * authSuccess       初始化成功block
+// * authFailed        初始化失败block 回调一个errorInfo的字典
+// *
+// */
+//- (instancetype)initPlayerWithType:(CNLivePlayerType)type contentId:(NSString *)contentId authSuccess:(void(^)(void))authSuccessBlock authFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock;
+//
+//- (void)setPlayerWithType:(CNLivePlayerType)type contentId:(NSString *)contentId;
 /* 初始化点播播放器  初始化成功后才能对播放器进行设置（如：自动播放、是否开启硬件解码等）和调用准备播放视频方法（prepareToPlay）
  *
@@ -8,6 +8,11 @@
 #import "CNLivePlayer.h"
 #import "CNLivePlayerManager.h"
+//缓存视频
+#import <KSYHTTPCache/KSYHTTPProxyService.h>
+#import <KSYHTTPCache/HTTPCacheDefines.h>
+
+//缓存url
 #import "CNLivePlayerCache.h"
 #import "CommonCrypto/CommonDigest.h"
 //数据请求
@@ -112,18 +117,42 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
     });
 }
+- (void)dealloc {
+    [self removeMovieNotificationObservers];
+    [self removeRCloudNotificationObservers];
+    
+}
+
+- (void)destroyPlayer {
+    if (_statTimer) {
+        [_statTimer invalidate];
+        _statTimer = nil;
+    }
+    
+    if (_player) {
+        _player = nil;
+    }
+    
+    [self removeMovieNotificationObservers];
+    [self removeRCloudNotificationObservers];
+    
+}
+
 #pragma mark - 查找本地是否有缓存url
 - (void)getVideoId:(NSString *)videoId authSuccess:(void (^)(void))authSuccessBlock authFailed:(void (^)(NSDictionary *errorDic))authFailedBlock {
     NSString *key = [NSString stringWithFormat:@"%@:%@",_contentType,videoId];
     id data = [CNLivePlayerCache player_ReadCache:key];
-    if (data) {
+    //1.判断是否存在缓存url
+    if (data && [data isKindOfClass:[NSString class]]) {
+        __weak typeof(self) weakSelf = self;
         dispatch_async(dispatch_get_main_queue(), ^{
-            self.videoUrl = (NSString *)data;
-            self.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:self.videoUrl]];
-            [self.view addSubview:self.player.view];
-            self.player.view.frame = self.view.bounds;
-            self.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
-            self.player.shouldEnableKSYStatModule = NO;
+            __strong typeof(self) strongSelf = weakSelf;
+            strongSelf.videoUrl = (NSString *)data;
+            strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:strongSelf.videoUrl]];
+            [strongSelf.view addSubview:self.player.view];
+            strongSelf.player.view.frame = self.view.bounds;
+            strongSelf.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
+            strongSelf.player.shouldEnableKSYStatModule = NO;
             if (PLAYER_TestEnvironment) {
                 NSLog(@"CNLivePlayer-->缓存数据,播放器初始化成功，可以对播放器进行设置并准备播放");
             }
@@ -131,42 +160,98 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
         });
     } else {
+        //2.判断是否鉴权
         NSDictionary *privilegeDic = [[NSUserDefaults standardUserDefaults] objectForKey:kCNLivePlayerSDKAuthentication];
         if(privilegeDic&&[privilegeDic[@"resultCode"] isEqualToString:@"0"]){
+            //3.存在鉴权成功,直接请求url
             if([_contentType isEqualToString:@"vod"]){
-                [self getVodVideoURLSuccess:authSuccessBlock authFailed:authFailedBlock];
+                [self getVodVideoURLSuccess:authSuccessBlock failure:authFailedBlock];
             }else{
-                [self getLiveVideoURLSuccess:authSuccessBlock authFailed:authFailedBlock];
+                [self getLiveVideoURLSuccess:authSuccessBlock failure:authFailedBlock];
             }
         }else{
             __weak typeof(self) weakSelf = self;
-            //鉴权
+            //4.不存在鉴权成功,先请求鉴权
             [weakSelf authenticateSuccess:^{
+                //5.鉴权成功,再请求url
                 __strong typeof(self) strongSelf = weakSelf;
                 if([strongSelf->_contentType isEqualToString:@"vod"]){
-                    [self getVodVideoURLSuccess:authSuccessBlock authFailed:authFailedBlock];
+                    [strongSelf getVodVideoURLSuccess:authSuccessBlock failure:authFailedBlock];
                 }else{
-                    [self getLiveVideoURLSuccess:authSuccessBlock authFailed:authFailedBlock];
+                    [strongSelf getLiveVideoURLSuccess:authSuccessBlock failure:authFailedBlock];
                 }
-            } authenticateFailed:authFailedBlock];
+            } failure:authFailedBlock];
         }
     }
 }
-#pragma mark - 获取点播视频url
-- (void)getVodVideoURLSuccess:(void(^)(void))authSuccessBlock authFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock {
+#pragma mark - 鉴权
+- (void)authenticateSuccess:(void(^)(void))authSuccessBlock failure:(void(^)(NSDictionary *errorInfo))authFailedBlock {
+    
+    NSDictionary *parameter = @{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
+                                @"timestamp": [CNLivePlayerTools getTimestamp],
+                                @"appId": PLAYER_AppID};
+    
+    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:authUrl parameter:parameter];
+    
+    __weak typeof(self) weakSelf = self;
+    [[CNLivePlayerNetworkManager manager] authenticate:videoUrl success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
+        __strong typeof(self) strongSelf = weakSelf;
+        if(!responseObject||![responseObject isKindOfClass:[NSDictionary class]]){
+            authFailedBlock ? authFailedBlock(responseObject) : nil;
+            
+        }
+        
+        NSDictionary *authErrorDic = @{@"code":responseObject[@"errorCode"],
+                                       @"resultCode":@"0",
+                                       @"errorMessage":responseObject[@"errorMessage"]};
+        [[NSUserDefaults standardUserDefaults] setObject:authErrorDic forKey:kCNLivePlayerSDKAuthentication];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+        if ([responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            authSuccessBlock ? authSuccessBlock() : nil;
+            
+        }
+        else {
+            if (PLAYER_TestEnvironment) {
+                NSLog(@"CNLivePlayer-->播放器初始化失败，失败原因：%@", authErrorDic);
+            }
+            authFailedBlock ? authFailedBlock(responseObject) : nil;
+            [CNLivePlayerTools errorStat:authErrorDic[@"errorMessage"] contentId:strongSelf->_activityId ? strongSelf->_activityId : strongSelf->_contentId idName:strongSelf->_idName];
+            
+        }
+        
+    } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        __strong typeof(self) strongSelf = weakSelf;
+        NSDictionary *authErrorDic = @{@"code":[NSString stringWithFormat:@"%ld", error.code],
+                                       @"resultCode":@"1",
+                                       @"errorMessage":[NSString stringWithFormat:@"%@", error.localizedDescription]};
+        [[NSUserDefaults standardUserDefaults] setObject:authErrorDic forKey:kCNLivePlayerSDKAuthentication];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+        
+        if (PLAYER_TestEnvironment) {
+            NSLog(@"CNLivePlayer-->播放器初始化失败，失败原因：%@", authErrorDic);
+        }
+        authFailedBlock ? authFailedBlock(authErrorDic) : nil;
+        [CNLivePlayerTools errorStat:authErrorDic[@"errorMessage"] contentId:strongSelf->_activityId ? strongSelf->_activityId : strongSelf->_contentId idName:strongSelf->_idName];
+        
+    }];
+    
+}
+#pragma mark - 获取点播视频url
+- (void)getVodVideoURLSuccess:(void(^)(void))authSuccessBlock failure:(void(^)(NSDictionary *errorInfo))authFailedBlock {
+    NSString *stamp = [CNLivePlayerTools getTimestamp];
     NSDictionary *parameter = @{@"appId": PLAYER_AppID,
                          @"vId": _contentId,
-                         @"timestamp": [CNLivePlayerTools getTimestamp],
+                         @"timestamp": stamp,
                          @"isHLS": @"1",
                          @"plat": @"i",
                          @"playType": _isAudio ? @"a": @"v",
@@ -175,7 +260,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
                          @"tag": PLAYER_Tag,
                          @"from": @"apple",
                          @"sid": PLAYER_UserId,
-                         @"uid": [CNLivePlayerTools getUidForStat:[NSDate date]]};
+                         @"uid": [CNLivePlayerTools getUidForStat:stamp]};
     NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:vodUrl parameter:parameter];
@@ -184,7 +269,9 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
         __strong typeof(self) strongSelf = weakSelf;
 //        NSString *key = [NSString stringWithFormat:@"%@:%@",strongSelf->_contentType, strongSelf->_contentId];
 //        [CNLivePlayerCache player_SaveDataCache:videoURL forKey:key];
+        __weak typeof(self) weakSelf = strongSelf;
         dispatch_async(dispatch_get_main_queue(), ^{
+            __strong typeof(self) strongSelf = weakSelf;
             strongSelf.videoUrl = videoUrl;
             strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:videoUrl]];
             [strongSelf.view addSubview:strongSelf.player.view];
@@ -192,7 +279,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
             strongSelf.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
             strongSelf.player.shouldEnableKSYStatModule = NO;
-            [strongSelf statSDK];
+            [CNLivePlayerTools statSDKWithContentId:strongSelf->_activityId ? strongSelf->_activityId : strongSelf->_contentId idName:strongSelf->_idName];
             if (PLAYER_TestEnvironment) {
                 NSLog(@"CNLivePlayer-->请求数据,点播播放器初始化成功，可以对播放器进行设置并准备播放");
@@ -206,7 +293,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
 }
 #pragma mark - 获取直播视频url
-- (void)getLiveVideoURLSuccess:(void(^)(void))authSuccessBlock authFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock {
+- (void)getLiveVideoURLSuccess:(void(^)(void))authSuccessBlock failure:(void(^)(NSDictionary *errorInfo))authFailedBlock {
     NSString *timestamp = [CNLivePlayerTools getTimestamp];
     NSDictionary *parameter = @{@"appId": PLAYER_AppID,
                                  @"channelId": _contentId,
@@ -220,7 +307,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
                                  @"tag": PLAYER_Tag,
                                  @"from": @"apple",
                                  @"sid": PLAYER_UserId,
-                                 @"uid": [CNLivePlayerTools getUidForStat:[NSDate date]]};
+                                 @"uid": [CNLivePlayerTools getUidForStat:timestamp]};
     NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:liveUrl parameter:parameter];
@@ -229,26 +316,31 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
     [urlRequest setHTTPMethod:@"GET"];
     [urlRequest setTimeoutInterval:30];
+    __weak typeof(self) weakSelf = self;
     [NSURLConnection sendAsynchronousRequest:urlRequest queue:[[NSOperationQueue alloc] init] completionHandler:^(NSURLResponse * _Nullable response, NSData * _Nullable data, NSError * _Nullable connectionError) {
-        __weak typeof(self) weakSelf = self;
+        __strong typeof(self) strongSelf = weakSelf;
+        NSString *url = nil;
+        if (connectionError) {
+            NSError *error = connectionError.userInfo[NSUnderlyingErrorKey];
+            NSString *videoUrl302 = error.userInfo[NSURLErrorFailingURLStringErrorKey];
+            if (!videoUrl302 || ![videoUrl302 isKindOfClass:[NSString class]] || videoUrl302.length <= 0) {
+                videoUrl302 = nil;
+            }
+            url = videoUrl302;
+            
+        } else if (response) {
+            url = response.URL.absoluteString;
+            
+        } else {
+            url = videoUrl;
+            
+        }
+        NSString *key = [NSString stringWithFormat:@"%@:%@",strongSelf->_contentType, strongSelf->_contentId];
+        [CNLivePlayerCache player_SaveDataCache:url forKey:key];
+        
+        __weak typeof(self) weakSelf = strongSelf;
         dispatch_async(dispatch_get_main_queue(), ^{
             __strong typeof(self) strongSelf = weakSelf;
-            NSString *url = nil;
-            if (connectionError) {
-                NSError *error = connectionError.userInfo[NSUnderlyingErrorKey];
-                NSString *videoUrl302 = error.userInfo[NSURLErrorFailingURLStringErrorKey];
-                if (!videoUrl302 || ![videoUrl302 isKindOfClass:[NSString class]] || videoUrl302.length <= 0) {
-                    videoUrl302 = nil;
-                }
-                url = videoUrl302;
-                
-            } else if (response) {
-                url = response.URL.absoluteString;
-                
-            } else {
-                url = videoUrl;
-
-            }
             strongSelf.videoUrl = url;
             strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:url]];
             [strongSelf.view addSubview:strongSelf.player.view];
@@ -256,11 +348,8 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
             strongSelf.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
             strongSelf.player.shouldEnableKSYStatModule = NO;
-            NSString *key = [NSString stringWithFormat:@"%@:%@",strongSelf->_contentType, strongSelf->_contentId];
-            [CNLivePlayerCache player_SaveDataCache:url forKey:key];
-            
-            [strongSelf statSDK];
-            
+            [CNLivePlayerTools statSDKWithContentId:strongSelf->_activityId ? strongSelf->_activityId : strongSelf->_contentId idName:strongSelf->_idName];
+
             if (PLAYER_TestEnvironment) {
                 NSLog(@"CNLivePlayer-->请求数据,直播播放器初始化成功，可以对播放器进行设置并准备播放");
             }
@@ -272,66 +361,15 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
     }];
 }
-#pragma mark - 鉴权
-- (void)authenticateSuccess:(void(^)(void))authSuccessBlock authenticateFailed:(void(^)(NSDictionary *errorInfo))authFailedBlock {
-    
-    NSDictionary *parameter = @{@"platform_id": [NSBundle mainBundle].bundleIdentifier,
-                                @"timestamp": [CNLivePlayerTools getTimestamp],
-                                @"appId": PLAYER_AppID};
-
-    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:authUrl parameter:parameter];
-
-
-    [[CNLivePlayerNetworkManager manager] authenticate:videoUrl success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
-        
-        if(!responseObject||![responseObject isKindOfClass:[NSDictionary class]]){
-            authFailedBlock ? authFailedBlock(responseObject) : nil;
-            
-        }
-        
-        NSDictionary *authErrorDic = @{@"code":responseObject[@"errorCode"],
-                                       @"resultCode":@"0",
-                                       @"errorMessage":responseObject[@"errorMessage"]};
-        [[NSUserDefaults standardUserDefaults] setObject:authErrorDic forKey:kCNLivePlayerSDKAuthentication];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        
-        if ([responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            authSuccessBlock ? authSuccessBlock() : nil;
-            
-        }
-        else {
-            if (PLAYER_TestEnvironment) {
-                NSLog(@"CNLivePlayer-->播放器初始化失败，失败原因：%@", authErrorDic);
-            }
-            authFailedBlock ? authFailedBlock(responseObject) : nil;
-            [self errorStat:authErrorDic[@"errorMessage"]];
-        }
-        
-    } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        
-        NSDictionary *authErrorDic = @{@"code":[NSString stringWithFormat:@"%ld", error.code],
-                                       @"resultCode":@"1",
-                                       @"errorMessage":[NSString stringWithFormat:@"%@", error.localizedDescription]};
-        [[NSUserDefaults standardUserDefaults] setObject:authErrorDic forKey:kCNLivePlayerSDKAuthentication];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        
-        if (PLAYER_TestEnvironment) {
-            NSLog(@"CNLivePlayer-->播放器初始化失败，失败原因：%@", authErrorDic);
-        }
-        authFailedBlock ? authFailedBlock(authErrorDic) : nil;
-        [self errorStat:authErrorDic[@"errorMessage"]];
-        
-    }];
-    
-}
-
 #pragma mark - 注册通知
 - (void)addMovieNotificationObservers {
+    // 视频加载状态
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(loadStateDidChange:)
                                                  name:MPMoviePlayerLoadStateDidChangeNotification
                                                object:nil];
+    // 视频播放结束
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(moviePlayBackDidFinish:)
                                                  name:MPMoviePlayerPlaybackDidFinishNotification
@@ -342,6 +380,18 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
                                                  name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
                                                object:nil];
+    // 缓存状态
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(mediaCacheDidChanged:)
+                                                 name:CacheStatusNotification
+                                               object:nil];
+    
+    // 缓存出错
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(mediaCacheErrorDidChanged:)
+                                                 name:CacheErrorNotification
+                                               object:nil];
+    
 }
 - (void)addRCloudNotificationObservers {
@@ -351,17 +401,16 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
 }
 - (void)removeMovieNotificationObservers {
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:MPMoviePlayerLoadStateDidChangeNotification
-                                                  object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:MPMoviePlayerLoadStateDidChangeNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:MPMoviePlayerPlaybackDidFinishNotification object:nil];
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:MPMoviePlayerPlaybackDidFinishNotification
-                                                  object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:CacheStatusNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:CacheErrorNotification object:nil];
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
-                                                  object:nil];
 }
 - (void)removeRCloudNotificationObservers {
@@ -391,6 +440,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
             [self mediaIsPreparedToPlayDidChange:nil];
         }
     }
+    
 }
 - (void)moviePlayBackDidFinish:(NSNotification *)notification {
@@ -418,7 +468,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
         case MPMovieFinishReasonPlaybackError://视频异常探针
         {
-            [self errorStat:notification.userInfo.description];
+            [CNLivePlayerTools errorStat:notification.userInfo.description contentId:_activityId ? _activityId : _contentId idName:_idName];
         }
             break;
@@ -426,6 +476,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
             break;
     }
+    
 }
 - (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification {
@@ -441,27 +492,6 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
 }
-- (void)dealloc {
-    [self removeMovieNotificationObservers];
-    [self removeRCloudNotificationObservers];
-    
-}
-
-- (void)destroyPlayer {
-    if (_statTimer) {
-        [_statTimer invalidate];
-        _statTimer = nil;
-    }
-    
-    if (_player) {
-        _player = nil;
-    }
-    
-    [self removeMovieNotificationObservers];
-    [self removeRCloudNotificationObservers];
-    
-}
-
 #pragma mark - 播放时长计算
 - (void)statTimerAction{
     if (!_contentType || _contentType.length == 0) {
@@ -470,21 +500,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
     _playTime++;
     NSString *stamp = [CNLivePlayerTools getTimestamp];
-    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1001&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools uidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, [NSString stringWithFormat:@"%d_30", _playTime], StatAppVersion,_contentId, _idName];
-    [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
-    
-}
-
-#pragma mark - 工具方法
-- (void)errorStat:(NSString *)errorString {
-    NSString *stamp = [CNLivePlayerTools getTimestamp];
-    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1000&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools uidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, errorString, StatAppVersion, _activityId ? _activityId : _contentId, _idName];
-    [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
-    
-}
-- (void)statSDK {
-    NSString *stamp = [CNLivePlayerTools getTimestamp];
-    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1400&uri=&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools uidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, StatAppVersion, _activityId ? _activityId : _contentId , _idName];
+    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1001&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, [NSString stringWithFormat:@"%ld_30", (long)_playTime], StatAppVersion,_contentId, _idName];
     [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
 }
@@ -516,6 +532,7 @@ NSString * const CNLiveAnchorStatusChangedNotification = @&quot;CNLiveAnchorStatusCha
  */
 - (void)prepareToPlay {
     [_player prepareToPlay];
+    
 }
 @end
@@ -10,7 +10,7 @@
 #define CNLivePlayerConst_h
 #pragma mark - 版本号
-#define PlayerSDKVersion @"0.0.1"     //SDK版本
+#define PlayerSDKVersion @"0.0.1"     //播放器SDK版本
 #pragma mark - 探针
 #define StatUrl [CNLivePlayerManager manager].isTestEnvironment?@"http://app.sta.cnlive.com/app.jpg": @"http://app.sta.cnlive.com/app.jpg"
@@ -58,9 +58,9 @@ static CNLivePlayerManager * _instance = nil;
 }
 - (void)setAppId:(NSString *)appId appKey:(NSString *)appKey isTestEnvironment:(BOOL)isTestEnvironment {
-    self.appId  = appId ? [NSString stringWithFormat:@"%@",appId] : @"";
-    self.appKey = appKey ? [NSString stringWithFormat:@"%@",appKey] : @"";
-    self.isTestEnvironment = isTestEnvironment;
+    [CNLivePlayerManager manager].appId  = appId ? [NSString stringWithFormat:@"%@",appId] : @"";
+    [CNLivePlayerManager manager].appKey = appKey ? [NSString stringWithFormat:@"%@",appKey] : @"";
+    [CNLivePlayerManager manager].isTestEnvironment = isTestEnvironment;
 }
 + (NSString *)getVersion {
@@ -17,10 +17,10 @@
 + (NSString *)signvalue:(NSDictionary*)parameter;
-//获取uuid
-+ (NSString *)getUidForStat:(NSDate *)date;
-
-+ (NSString *)uidForStat:(NSString *)date;
+/**
+ * 获取UUID
+ */
++ (NSString *)getUidForStat:(NSString *)date;
 //错误信息
 + (NSError *)customErrorWithResponseObject:(id)responseObject errorInfo:(NSString *)errorInfo;
@@ -36,4 +36,9 @@
 + (NSString *)getTimestamp;
+#pragma mark - 方法
++ (void)errorStat:(NSString *)errorString contentId:(NSString *)contentId idName:(NSString *)idName;
+
++ (void)statSDKWithContentId:(NSString *)contentId idName:(NSString *)idName;
+
 @end
@@ -62,32 +62,7 @@
 }
 #pragma mark - UUID
-+ (NSString *)getUidForStat:(NSDate *)date {
-    NSString *uid = @"";
-    
-    NSUserDefaults *defauts = [NSUserDefaults standardUserDefaults];
-    
-    if ([defauts objectForKey:@"kCNLiveUserDefaultsUIDKey"]) {
-        uid = [[defauts objectForKey:@"kCNLiveUserDefaultsUIDKey"] copy];
-        return uid;
-    }
-    else {
-        
-        NSString *stamp = [NSString stringWithFormat:@"%.3f", [date  timeIntervalSince1970]];
-        stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
-
-        NSString *idfv = [[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""];
-        uid = [NSString stringWithFormat:@"%@_%@", idfv, stamp];
-        
-        [defauts setObject:uid forKey:@"kCNLiveUserDefaultsUIDKey"];
-        [defauts synchronize];
-    }
-    
-    return uid;
-    
-}
-
-+ (NSString *)uidForStat:(NSString *)date {
++ (NSString *)getUidForStat:(NSString *)date {
     NSString *uid = @"";
@@ -127,7 +102,7 @@
     return error;
 }
-
+#pragma mark - 字符串判空
 + (BOOL)isEmptyString:(NSString *)string {
     if (!string || ![string isKindOfClass:[NSString class]] || string.length == 0 || [string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]].length == 0) {
         return YES;
@@ -135,10 +110,26 @@
     return NO;
 }
+#pragma mark - 获取时间戳
 + (NSString *)getTimestamp{
     NSInteger time = [[NSDate date] timeIntervalSince1970];
     NSString *timestamp = [NSString stringWithFormat:@"%ld", (long)time];
     return timestamp;
 }
+
+#pragma mark - 方法
++ (void)errorStat:(NSString *)errorString contentId:(NSString *)contentId idName:(NSString *)idName{
+    NSString *stamp = [CNLivePlayerTools getTimestamp];
+    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1000&uri=%@&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, errorString, StatAppVersion, contentId, idName];
+    [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
+    
+}
++ (void)statSDKWithContentId:(NSString *)contentId idName:(NSString *)idName {
+    NSString *stamp = [CNLivePlayerTools getTimestamp];
+    NSString *url = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1001_%@&eventid=1400&uri=&sid=&plat=i_%@&objid=%@_%@", StatUrl, StatVersion, [CNLivePlayerTools getUidForStat:stamp], stamp, PLAYER_AppID, PlayerSDKVersion, StatAppVersion, contentId , idName];
+    [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]] delegate:nil];
+    
+}
+
 @end
@@ -348,7 +348,8 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLivePlayer_Example/Pods-CNLivePlayer_Example-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/CNLivePlayer/CNLivePlayer.framework",
+				"${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework",
+				"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
 				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
 				"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
 				"${BUILT_PRODUCTS_DIR}/libksygpulive/libksygpulive.framework",
@@ -357,7 +358,8 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePlayer.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libksygpulive.framework",
@@ -477,6 +479,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -485,6 +488,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				WARNING_CFLAGS = "";
 			};
 			name = Debug;
 		};
@@ -510,6 +514,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -518,6 +523,7 @@
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
+				WARNING_CFLAGS = "";
 			};
 			name = Release;
 		};
@@ -534,6 +540,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
+				WARNING_CFLAGS = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -551,6 +558,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
+				WARNING_CFLAGS = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;