Merge pull request #413 from HeraShowFeng/update_v3.3.3

update PLPlayerKit to v3.3.3 in release

APIDiffs/api-diffs-3.3.3.md

@@ -0,0 +1,5 @@
+# PLPlayerKit 3.3.2 to 3.3.3 API Differences
+
+## General Headers    
+
+None

Example/new/NiuPlayer.xcodeproj/project.pbxproj

@@ -602,7 +602,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = GDFHW66V92;
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				GCC_PREFIX_HEADER = NiuPlayer/NiuPlayer.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -631,7 +631,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = GDFHW66V92;
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				GCC_PREFIX_HEADER = NiuPlayer/NiuPlayer.pch;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

Example/new/NiuPlayer/AppDelegate.m

@@ -8,6 +8,9 @@
 
 #import "AppDelegate.h"
 #import "PLRootTabBarViewController.h"
+#import "PLShortVideoViewController.h"
+#import "PLLongVideoViewController.h"
+#import "PLLiveViewController.h"
 
 @interface AppDelegate ()
 
@@ -37,6 +40,36 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 - (void)applicationWillResignActive:(UIApplication *)application {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
     // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    PLRootTabBarViewController *rootVC = (PLRootTabBarViewController*)self.window.rootViewController;
+    NSInteger index = rootVC.selectedIndex;
+    if(rootVC.selectedViewController){
+        switch (index) {
+            case 0:{
+                PLShortVideoViewController *shortVC = (PLShortVideoViewController *)rootVC.selectedViewController;
+                [shortVC onUIApplication:NO];
+            }
+                break;
+            case 1:{
+                UINavigationController *navVC = rootVC.selectedViewController;
+                PLLongVideoViewController *longVideoVC = (PLLongVideoViewController *)navVC.topViewController;
+                [longVideoVC onUIApplication:NO];
+            }
+                break;
+            case 2:{
+                UINavigationController *navVC = rootVC.selectedViewController;
+                PLLiveViewController *liveVideoVC = (PLLiveViewController *)navVC.topViewController;
+                if (liveVideoVC.presentedViewController) {
+                    PLPlayViewController *playerVC = (PLPlayViewController *)liveVideoVC.presentedViewController;
+                    playerVC.player.enableRender = NO;
+                }
+            }
+                break;
+
+            default:
+                break;
+        }
+    }
+    NSLog(@"------ applicationWillResignActive ------");
 }
 
 
@@ -53,6 +86,36 @@ - (void)applicationWillEnterForeground:(UIApplication *)application {
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    PLRootTabBarViewController *rootVC = (PLRootTabBarViewController*)self.window.rootViewController;
+    NSInteger index = rootVC.selectedIndex;
+    if(rootVC.selectedViewController){
+        switch (index) {
+            case 0:{
+                PLShortVideoViewController *shortVC = (PLShortVideoViewController *)rootVC.selectedViewController;
+                [shortVC onUIApplication:YES];
+            }
+                break;
+            case 1:{
+                UINavigationController *navVC = rootVC.selectedViewController;
+                PLLongVideoViewController *longVideoVC = (PLLongVideoViewController *)navVC.topViewController;
+                [longVideoVC onUIApplication:YES];
+            }
+                break;
+            case 2:{
+                UINavigationController *navVC = rootVC.selectedViewController;
+                PLLiveViewController *liveVideoVC = (PLLiveViewController *)navVC.topViewController;
+                if (liveVideoVC.presentedViewController) {
+                    PLPlayViewController *playerVC = (PLPlayViewController *)liveVideoVC.presentedViewController;
+                    playerVC.player.enableRender = YES;
+                }
+            }
+                break;
+
+            default:
+                break;
+        }
+    }
+    NSLog(@"------ applicationDidBecomeActive ------");
 }
 
 

Example/new/NiuPlayer/Common/PLPlayerView.h

@@ -33,6 +33,7 @@
 
 - (void)resume;
 
+- (void)configureVideo:(BOOL)enableRender;
 @end
 
 

Example/new/NiuPlayer/Common/PLPlayerView.m

@@ -71,6 +71,10 @@ -(void)dealloc {
     [self unsetupPlayer];
 }
 
+- (void)configureVideo:(BOOL)enableRender {
+    self.player.enableRender = enableRender;
+}
+
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {

Example/new/NiuPlayer/LiveVideo/PLLiveViewController.h

@@ -10,4 +10,5 @@
 
 @interface PLLiveViewController : PLBaseViewController
 
+- (void)onUIApplication:(BOOL)active;
 @end

Example/new/NiuPlayer/LongVideo/PLLongMediaTableViewCell.h

@@ -30,6 +30,9 @@
 
 - (void)stop;
 
+- (void)configureVideo:(BOOL)enableRender;
+
+
 + (CGFloat)headerViewHeight;
 
 @end

Example/new/NiuPlayer/LongVideo/PLLongMediaTableViewCell.m

@@ -138,6 +138,10 @@ - (void)stop {
     [self.playerView stop];
 }
 
+- (void)configureVideo:(BOOL)enableRender {
+    [self.playerView configureVideo:enableRender];
+}
+
 - (void)playerViewEnterFullScreen:(PLPlayerView *)playerView {
 
     UIView *superView = [UIApplication sharedApplication].delegate.window.rootViewController.view;

Example/new/NiuPlayer/LongVideo/PLLongVideoViewController.h

@@ -10,4 +10,5 @@
 
 @interface PLLongVideoViewController : PLBaseViewController
 
+- (void)onUIApplication:(BOOL)active;
 @end

Example/new/NiuPlayer/LongVideo/PLLongVideoViewController.m

@@ -29,6 +29,12 @@ @interface PLLongVideoViewController ()
 
 @implementation PLLongVideoViewController
 
+- (void)onUIApplication:(BOOL)active {
+    if (self.playingCell) {
+        [self.playingCell configureVideo:active];
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
 

Example/new/NiuPlayer/ShortVideo/PLShortVideoViewController.h

@@ -14,4 +14,6 @@ UIPageViewControllerDataSource
 >
 
 - (void)reloadController;
+- (void)onUIApplication:(BOOL)active;
+
 @end

Example/new/NiuPlayer/ShortVideo/PLShortVideoViewController.m

@@ -18,11 +18,17 @@ @interface PLShortVideoViewController ()
 @property (nonatomic, strong) NSArray *mediaArray;
 @property (nonatomic, assign) NSInteger index;
 @property (nonatomic, strong) PLBaseViewController *emptyController;
-
+@property (nonatomic, strong) PLShortPlayerViewController *shortPlayerVC;
 @end
 
 @implementation PLShortVideoViewController
 
+- (void)onUIApplication:(BOOL)active {
+    if (self.shortPlayerVC) {
+        self.shortPlayerVC.player.enableRender = active;
+    }
+}
+
 - (void)viewDidLoad {
 
     [super viewDidLoad];
@@ -85,6 +91,7 @@ - (void)reloadController {
             self.index = 0;
         }
 
+        self.shortPlayerVC = playerController;
         [self setViewControllers:@[playerController] direction:(UIPageViewControllerNavigationDirectionForward) animated:NO completion:^(BOOL finished) {
         }];
     } else {

Example/new/Podfile.lock

@@ -14,19 +14,19 @@ PODS:
   - BlocksKit/UIKit (2.2.5):
     - BlocksKit/Core
     - BlocksKit/DynamicDelegate
-  - Bugsnag (5.16.0)
-  - Crashlytics (3.10.3):
-    - Fabric (~> 1.7.8)
-  - Fabric (1.7.8)
+  - Bugsnag (5.16.3)
+  - Crashlytics (3.10.7):
+    - Fabric (~> 1.7.11)
+  - Fabric (1.7.11)
   - JGProgressHUD (2.0.3)
   - Masonry (1.1.0)
   - MMMaterialDesignSpinner (0.2.5)
-  - PLPlayerKit (3.3.2):
-    - PLPlayerKit/iphoneos (= 3.3.2)
-  - PLPlayerKit/iphoneos (3.3.2)
-  - SDWebImage (4.4.1):
-    - SDWebImage/Core (= 4.4.1)
-  - SDWebImage/Core (4.4.1)
+  - PLPlayerKit (3.3.3):
+    - PLPlayerKit/iphoneos (= 3.3.3)
+  - PLPlayerKit/iphoneos (3.3.3)
+  - SDWebImage (4.4.2):
+    - SDWebImage/Core (= 4.4.2)
+  - SDWebImage/Core (4.4.2)
   - WeiboSDK (3.1.3)
 
 DEPENDENCIES:
@@ -42,22 +42,34 @@ DEPENDENCIES:
   - SDWebImage
   - WeiboSDK (>= 3.1.3)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - BlocksKit
+    - Bugsnag
+    - Crashlytics
+    - Fabric
+    - JGProgressHUD
+    - Masonry
+    - MMMaterialDesignSpinner
+    - SDWebImage
+    - WeiboSDK
+
 EXTERNAL SOURCES:
   PLPlayerKit:
-    :path: ../../
+    :path: "../../"
 
 SPEC CHECKSUMS:
   BlocksKit: 7f422b971407001178d181a43b99014ea2591fe6
-  Bugsnag: e195a21dae67e32a37567689ff8e0863e4a17e09
-  Crashlytics: 2aea305161a2122492698c75af27f2b98aa49a25
-  Fabric: fba4684a95df789565b0b27fc5b6e68f1755af32
+  Bugsnag: d4f14e5503b716dfe015c347426b058ad4d6a688
+  Crashlytics: ccaac42660eb9351b9960c0d66106b0bcf99f4fa
+  Fabric: f233c9492b3bbc1f04e3882986740f7988a58edb
   JGProgressHUD: 12b20a8f4ffe05258f8635c1ab92816e451f904d
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MMMaterialDesignSpinner: a548042720c2e5f04212048483085d7942ac3e81
-  PLPlayerKit: 233a71c4dc5ec9047e58536d693842d1b260fc60
-  SDWebImage: 47e9b5b925cbce75946c23f0c42dd19464189af4
+  PLPlayerKit: 296fe6c77c5d0b6d649ceeee9fab73485cb4c78f
+  SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
   WeiboSDK: acb067053668102cf07d01aa7604350162c2e466
 
 PODFILE CHECKSUM: b8e4d3011adae7250551d6868e265422bdfbe1c0
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3