no message

zhangxiaowen
1 parent 08b73c03
Showing 7 changed files with 208 additions and 14 deletions
CNLivePlayer/Classes/Database/CNLivePlayerDBModel.h
CNLivePlayer/Classes/Database/CNLivePlayerDBTool.m
CNLivePlayer/Classes/Player/CNLivePlayer.h
CNLivePlayer/Classes/Player/CNLivePlayer.m
CNLivePlayer/Classes/Player/CNLivePlayerUrl.h
Example/CNLivePlayer/CNLiveAppDelegate.m
Example/CNLivePlayer/CNLivePlayerController.m
@@ -11,9 +11,10 @@
 NS_ASSUME_NONNULL_BEGIN
  
 @interface CNLivePlayerDBModel : NSObject
-
+//contentId:rate
 @property (nullable, nonatomic, copy) NSString *contentId;
 @property (nullable, nonatomic, copy) NSString *url;
+@property (nullable, nonatomic, copy) NSString *proxyUrl;
 @property (nonatomic, assign) BOOL finish;
 - (CNLivePlayerDBModel *)initWithContenId:(NSString *)contentId url:(NSString *)url;
  
@@ -61,7 +61,7 @@
 #pragma mark - 自定义操作
 - (void)createTable{
     [self openDB:^(int result, FMDatabase *db) {
-        NSString * sql = @"CREATE TABLE DATATABLE (contentId varchar, url varchar, finish int)";
+        NSString * sql = @"CREATE TABLE DATATABLE (contentId varchar, url varchar, finish bit)";
         BOOL res = [db executeUpdate:sql];
         if (!res) {
             NSLog(@"建表失败");
@@ -111,7 +111,7 @@
 - (BOOL)updateInTable:(NSString *)contentId{
     __block BOOL isResult = NO;
     [self openDB:^(int result, FMDatabase *db) {
-        NSString * check = [NSString stringWithFormat:@"UPDATE DATATABLE SET finish = true  where contentId = '%@'",contentId];
+        NSString * check = [NSString stringWithFormat:@"UPDATE DATATABLE SET finish = 1  where contentId = '%@'",contentId];
         isResult = [db executeUpdate:check];
     }];
     return isResult;
@@ -161,6 +161,79 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  */
 @property(nonatomic, assign) NSTimeInterval currentPlaybackTime;
  
+/**
+ * 当前视频总时长
+ * 视频总时长，单位是秒。
+ * 如果是直播视频源，总时长为0.
+ * 如果该信息未知，总时长默认为0.
+ */
+@property (nonatomic, readonly) NSTimeInterval duration;
+
+/**
+ @abstract 当前视频宽高
+ @discussion 获取信息
+ 
+ * 监听MPMovieNaturalSizeAvailableNotification
+ * 播放过程中，宽高信息可能会产生更改
+ 
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+@property (nonatomic, readonly) CGSize naturalSize;
+
+/**
+ @abstract 当前视频自带旋转（逆时针）角度
+ @discussion  rotateDegress 是人为旋转角度，naturalRotate是文件meta信息中自带的旋转角度
+ @warning 该方法由金山云引入，不是原生系统接口
+ @since Available in KSYMoviePlayerController 2.2.0 and later.
+ */
+@property (nonatomic, readonly) NSInteger naturalRotate;
+
+/**
+ @abstract 当前播放器的播放状态（只读）。
+ @discussion 可以通过该属性获取视频播放情况：
+ 
+ <pre><code>
+ typedef NS_ENUM(NSInteger, MPMoviePlaybackState) {
+ MPMoviePlaybackStateStopped,           // 播放停止
+ MPMoviePlaybackStatePlaying,           // 正在播放
+ MPMoviePlaybackStatePaused,            // 播放暂停
+ MPMoviePlaybackStateInterrupted,       // 播放被打断
+ MPMoviePlaybackStateSeekingForward,    // 向前seeking中
+ MPMoviePlaybackStateSeekingBackward    // 向后seeking中
+ } NS_DEPRECATED_IOS(3_2, 9_0);
+ </code></pre>
+ @discussion 通知：
+ 
+ * MPMoviePlayerPlaybackDidFinishNotification，当播放完成时提供通知
+ * MPMoviePlayerPlaybackStateDidChangeNotification，当播放状态变化时提供通知
+ 
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+// Returns the current playback state of the movie player.
+@property (nonatomic, readonly) MPMoviePlaybackState playbackState;
+
+
+/**
+ @abstract 当前网络加载情况
+ @discussion 可以通过该属性获取视频加载情况：
+ 
+ <pre><code>
+ typedef NS_OPTIONS(NSUInteger, MPMovieLoadState) {
+ MPMovieLoadStateUnknown        = 0,        // 加载情况未知
+ MPMovieLoadStatePlayable       = 1 << 0,   // 加载完成，可以播放
+ MPMovieLoadStatePlaythroughOK  = 1 << 1,   // 加载完成，如果shouldAutoplay为YES，将自动开始播放
+ MPMovieLoadStateStalled        = 1 << 2,   // 如果视频正在加载中
+ } NS_DEPRECATED_IOS(3_2, 9_0);
+ </code></pre>
+ @discussion 通知：
+ 
+ * MPMoviePlayerLoadStateDidChangeNotification，当加载状态变化时提供通知
+ 
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+// Returns the network load state of the movie player.
+@property (nonatomic, readonly) MPMovieLoadState loadState;
+
 #pragma mark - 方法
 /*
  * 获取主播状态（离开/已结束)
@@ -218,6 +291,22 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  */
 - (UIImage *)thumbnailImageAtCurrentTime;
  
+/**
+ @abstract 重新启动拉流
+ @param aUrl 视频播放地址，该地址可以是本地地址或者服务器地址.如果为nil，则使用前一次播放地址
+ @discussion 调用场景如下：
+ 
+ * 当播放器调用方发现卡顿时，可以主动调用
+ * 当估计出更优质的拉流ip时，可以主动调用
+ * 当发生WiFi/3G网络切换时，可以主动调用
+ * 当播放器回调体现播放完成时，可以主动调用
+ * 播放器SDK不会自动调用reload功能
+ 
+ @warning 该方法由金山云引入，不是原生系统接口
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+- (void)reload:(NSURL *)aUrl;
+
 @end
  
 NS_ASSUME_NONNULL_END
@@ -321,8 +321,8 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
             if(!strongSelf.player){
                 NSString *proxyUrl = [[CNLiveHTTPProxyService manager] getProxyUrl:strongSelf.videoUrl];
                 strongSelf.player = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:PLAYER_OpenCache?proxyUrl:strongSelf.videoUrl]];
-                [strongSelf.view addSubview:self.player.view];
-                strongSelf.player.view.frame = self.view.bounds;
+                [strongSelf.view addSubview:strongSelf.player.view];
+                strongSelf.player.view.frame = strongSelf.view.bounds;
                 strongSelf.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
                 strongSelf.player.shouldEnableKSYStatModule = NO;
                 if (PLAYER_TestEnvironment) {
@@ -379,7 +379,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
                                 @"timestamp": [CNLivePlayerTools getTimestamp],
                                 @"appId": PLAYER_AppID};
  
-    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:authUrl parameter:parameter];
+    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:AuthUrl parameter:parameter];
  
     __weak typeof(self) weakSelf = self;
     [[CNLivePlayerNetworkManager manager] authenticate:videoUrl success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
@@ -442,7 +442,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
                          @"sid": PLAYER_UserId,
                          @"uid": [CNLivePlayerTools getUidForTimestamp:stamp]};
  
-    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:vodUrl parameter:parameter];
+    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:VodUrl parameter:parameter];
  
     __weak typeof(self) weakSelf = self;
     [[CNLivePlayerNetworkManager manager] getVideoURL:videoUrl success:^(NSString * _Nullable videoURL, NSInteger code) {
@@ -499,7 +499,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
                                  @"sid": PLAYER_UserId,
                                  @"uid": [CNLivePlayerTools getUidForTimestamp:timestamp]};
  
-    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:liveUrl parameter:parameter];
+    NSString *videoUrl = [CNLivePlayerTools encryptionSignWithUrl:LiveUrl parameter:parameter];
  
     // 拿到302跳转后的播放地址
     NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:videoUrl]];
@@ -890,6 +890,90 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
  
 }
  
+/**
+ * 当前视频总时长
+ * 视频总时长，单位是秒。
+ * 如果是直播视频源，总时长为0.
+ * 如果该信息未知，总时长默认为0.
+ */
+- (NSTimeInterval)duration{
+    return _player.duration;
+
+}
+
+/**
+ @abstract 当前视频宽高
+ @discussion 获取信息
+ 
+ * 监听MPMovieNaturalSizeAvailableNotification
+ * 播放过程中，宽高信息可能会产生更改
+ 
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+- (CGSize)naturalSize{
+    return _player.naturalSize;
+}
+
+/**
+ @abstract 当前视频自带旋转（逆时针）角度
+ @discussion  rotateDegress 是人为旋转角度，naturalRotate是文件meta信息中自带的旋转角度
+ @warning 该方法由金山云引入，不是原生系统接口
+ @since Available in KSYMoviePlayerController 2.2.0 and later.
+ */
+- (NSInteger)naturalRotate{
+    return _player.naturalRotate;
+}
+
+/**
+ @abstract 当前播放器的播放状态（只读）。
+ @discussion 可以通过该属性获取视频播放情况：
+ 
+ <pre><code>
+ typedef NS_ENUM(NSInteger, MPMoviePlaybackState) {
+ MPMoviePlaybackStateStopped,           // 播放停止
+ MPMoviePlaybackStatePlaying,           // 正在播放
+ MPMoviePlaybackStatePaused,            // 播放暂停
+ MPMoviePlaybackStateInterrupted,       // 播放被打断
+ MPMoviePlaybackStateSeekingForward,    // 向前seeking中
+ MPMoviePlaybackStateSeekingBackward    // 向后seeking中
+ } NS_DEPRECATED_IOS(3_2, 9_0);
+ </code></pre>
+ @discussion 通知：
+ 
+ * MPMoviePlayerPlaybackDidFinishNotification，当播放完成时提供通知
+ * MPMoviePlayerPlaybackStateDidChangeNotification，当播放状态变化时提供通知
+ 
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+// Returns the current playback state of the movie player.
+- (MPMoviePlaybackState)playbackState{
+    return _player.playbackState;
+}
+
+/**
+ @abstract 当前网络加载情况
+ @discussion 可以通过该属性获取视频加载情况：
+ 
+ <pre><code>
+ typedef NS_OPTIONS(NSUInteger, MPMovieLoadState) {
+ MPMovieLoadStateUnknown        = 0,        // 加载情况未知
+ MPMovieLoadStatePlayable       = 1 << 0,   // 加载完成，可以播放
+ MPMovieLoadStatePlaythroughOK  = 1 << 1,   // 加载完成，如果shouldAutoplay为YES，将自动开始播放
+ MPMovieLoadStateStalled        = 1 << 2,   // 如果视频正在加载中
+ } NS_DEPRECATED_IOS(3_2, 9_0);
+ </code></pre>
+ @discussion 通知：
+ 
+ * MPMoviePlayerLoadStateDidChangeNotification，当加载状态变化时提供通知
+ 
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+// Returns the network load state of the movie player.
+- (MPMovieLoadState)loadState{
+    return _player.loadState;
+}
+
+
 #pragma mark - 方法
 /*
  * 准备视频播放
@@ -942,4 +1026,23 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
  
 }
  
+/**
+ @abstract 重新启动拉流
+ @param aUrl 视频播放地址，该地址可以是本地地址或者服务器地址.如果为nil，则使用前一次播放地址
+ @discussion 调用场景如下：
+ 
+ * 当播放器调用方发现卡顿时，可以主动调用
+ * 当估计出更优质的拉流ip时，可以主动调用
+ * 当发生WiFi/3G网络切换时，可以主动调用
+ * 当播放器回调体现播放完成时，可以主动调用
+ * 播放器SDK不会自动调用reload功能
+ 
+ @warning 该方法由金山云引入，不是原生系统接口
+ @since Available in KSYMoviePlayerController 1.0 and later.
+ */
+- (void)reload:(NSURL *)aUrl {
+    [_player reload:aUrl];
+    
+}
+
 @end
@@ -18,12 +18,12 @@
 #define StatAppVersion  ([[[NSBundle mainBundle] infoDictionary] objectForKey: @"CFBundleShortVersionString"])
  
 #pragma mark - 鉴权
-#define authUrl [NSString stringWithFormat:@"%@/platform/valid", [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2" : @"http://api.cnlive.com/open/api2"]
+#define AuthUrl [NSString stringWithFormat:@"%@/platform/valid", [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2" : @"http://api.cnlive.com/open/api2"]
  
 #pragma mark - 点播
-#define vodUrl [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2/vod_ips/vodplayByAPP":@"http://api.cnlive.com/open/api2/vod_ips/vodplayByAPP"
+#define VodUrl [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2/vod_ips/vodplayByAPP":@"http://api.cnlive.com/open/api2/vod_ips/vodplayByAPP"
  
 #pragma mark - 直播
-#define liveUrl [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2/live_ips/liveplayByAPP":@"http://api.cnlive.com/open/api2/live_ips/liveplayByAPP"
+#define LiveUrl [CNLivePlayerManager manager].isTestEnvironment ? @"http://test.open.cnlive.com/openapi/api2/live_ips/liveplayByAPP":@"http://api.cnlive.com/open/api2/live_ips/liveplayByAPP"
  
 #endif /* CNLivePlayerUrl_h */
@@ -18,7 +18,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
-    [CNLivePlayerManager setAppId:CNLivePlayer_AppId appKey:CNLivePlayer_AppKey isTestEnvironment:YES openCache:NO];
+    [CNLivePlayerManager setAppId:CNLivePlayer_AppId appKey:CNLivePlayer_AppKey isTestEnvironment:YES];
  
     return YES;
 } 
@@ -24,13 +24,14 @@
  
     // Do any additional setup after loading the view.
  
-    _player = [[CNLivePlayer alloc]initVodPlayerWithVideoId:@"82_c8ff347048414b7295cef882f8361073" authSuccess:^{
+    self.player = [[CNLivePlayer alloc]initVodPlayerWithVideoId:@"82_c8ff347048414b7295cef882f8361073" authSuccess:^{
         _player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
         [_player prepareToPlay];
-        [self.view addSubview:_player.view];
     } authFailure:^(NSDictionary * _Nonnull errorInfo) {
  
     }];
+    [self.view addSubview:self.player.view];
+
  
     //1066_716fabeaafb64236b60ecf74167c5c96
     //82_c8ff347048414b7295cef882f8361073