Skip to content

Commit

Permalink
Merge pull request #564 from iossun/master
Browse files Browse the repository at this point in the history 
Release v3.4.7
  • Loading branch information
@HeraShowFeng
HeraShowFeng authored Oct 8, 2021
2 parents dec2d89 + 533f389 commit a340905
Show file tree
Hide file tree
Showing 356 changed files with 3,230 additions and 9,632 deletions.
6 changes: 6 additions & 0 deletions APIDiffs/api-diffs-3.4.7.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# PLPlayerKit 3.4.6 to 3.4.7 API Differences

## General Headers

None

58 changes: 28 additions & 30 deletions Example/new/NiuPlayer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,9 @@
76E1E7452049224800D02790 /* Sources */,
76E1E7462049224800D02790 /* Frameworks */,
76E1E7472049224800D02790 /* Resources */,
E1270DD46BFDEF94C43E2879 /* [CP] Embed Pods Frameworks */,
5F1392422F014A78D7D7D138 /* [CP] Copy Pods Resources */,
76E1E799204923AB00D02790 /* Copy Files */,
87C27106053AD8212AE45676 /* Upload Bugsnag dSYM */,
348CD92A50A3034998219D78 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -391,57 +390,52 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
348CD92A50A3034998219D78 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh",
"${PODS_ROOT}/../../../Pod/Library/PLPlayerKit.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
5F1392422F014A78D7D7D138 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/JGProgressHUD/JGProgressHUD.bundle",
"${PODS_ROOT}/JGProgressHUD/JGProgressHUD/Resources/jg_hud_error.png",
"${PODS_ROOT}/JGProgressHUD/JGProgressHUD/Resources/jg_hud_error@2x.png",
"${PODS_ROOT}/JGProgressHUD/JGProgressHUD/Resources/jg_hud_error@3x.png",
"${PODS_ROOT}/JGProgressHUD/JGProgressHUD/Resources/jg_hud_success.png",
"${PODS_ROOT}/JGProgressHUD/JGProgressHUD/Resources/jg_hud_success@2x.png",
"${PODS_ROOT}/JGProgressHUD/JGProgressHUD/Resources/jg_hud_success@3x.png",
"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JGProgressHUD.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/jg_hud_error.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/jg_hud_error@2x.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/jg_hud_error@3x.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/jg_hud_success.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/jg_hud_success@2x.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/jg_hud_success@3x.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WeiboSDK.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-resources.sh\"\n";
showEnvVarsInLog = 0;
};
87C27106053AD8212AE45676 /* Upload Bugsnag dSYM */ = {
E1270DD46BFDEF94C43E2879 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh",
"${PODS_ROOT}/../../../Pod/Library/PLPlayerKit.framework",
);
name = "Upload Bugsnag dSYM";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/usr/bin/env ruby";
shellScript = "fork do\n Process.setsid\n STDIN.reopen(\"/dev/null\")\n STDOUT.reopen(\"/dev/null\", \"a\")\n STDERR.reopen(\"/dev/null\", \"a\")\n\n require 'shellwords'\n\n Dir[\"#{ENV[\"DWARF_DSYM_FOLDER_PATH\"]}/*/Contents/Resources/DWARF/*\"].each do |dsym|\n system(\"curl -F dsym=@#{Shellwords.escape(dsym)} -F projectRoot=#{Shellwords.escape(ENV[\"PROJECT_DIR\"])} https://upload.bugsnag.com/\")\n end\nend\n";
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -601,8 +595,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = GDFHW66V92;
ENABLE_BITCODE = YES;
ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = NiuPlayer/NiuPlayer.pch;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -615,10 +610,11 @@
"\"${PODS_ROOT}/Headers/Public/MMMaterialDesignSpinner\"",
"\"${PODS_ROOT}/Headers/Public/Masonry\"",
"\"${PODS_ROOT}/Headers/Public/WeiboSDK\"",
"\"$(SRCROOT)/../PLPlayerKit/PLPlayerKit/Public\"",
);
INFOPLIST_FILE = NiuPlayer/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.4.6;
MARKETING_VERSION = 3.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.qbox.niuplayer;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -631,8 +627,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = GDFHW66V92;
ENABLE_BITCODE = YES;
ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = NiuPlayer/NiuPlayer.pch;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -645,10 +642,11 @@
"\"${PODS_ROOT}/Headers/Public/MMMaterialDesignSpinner\"",
"\"${PODS_ROOT}/Headers/Public/Masonry\"",
"\"${PODS_ROOT}/Headers/Public/WeiboSDK\"",
"\"$(SRCROOT)/../PLPlayerKit/PLPlayerKit/Public\"",
);
INFOPLIST_FILE = NiuPlayer/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.4.6;
MARKETING_VERSION = 3.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.qbox.niuplayer;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
50 changes: 34 additions & 16 deletions Example/new/NiuPlayer/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,32 @@ - (void)applicationWillResignActive:(UIApplication *)application {
if(rootVC.selectedViewController){
switch (index) {
case 0:{
PLShortVideoViewController *shortVC = (PLShortVideoViewController *)rootVC.selectedViewController;
[shortVC onUIApplication:NO];
}
if ([rootVC.selectedViewController isKindOfClass:[PLShortVideoViewController class]]) {
PLShortVideoViewController *shortVC = (PLShortVideoViewController *)rootVC.selectedViewController;
[shortVC onUIApplication:NO];
}
break;
}
case 1:{
UINavigationController *navVC = rootVC.selectedViewController;
PLLongVideoViewController *longVideoVC = (PLLongVideoViewController *)navVC.topViewController;
[longVideoVC onUIApplication:NO];
if ([navVC.topViewController isKindOfClass:[PLLongVideoViewController class]]) {
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;

if ([liveVideoVC.presentedViewController isKindOfClass:[PLPlayViewController class]]) {
if (liveVideoVC.presentedViewController) {
PLPlayViewController *playerVC = (PLPlayViewController *)liveVideoVC.presentedViewController;
playerVC.player.enableRender = NO;
}
}

}
break;

Expand Down Expand Up @@ -91,23 +100,32 @@ - (void)applicationDidBecomeActive:(UIApplication *)application {
if(rootVC.selectedViewController){
switch (index) {
case 0:{
PLShortVideoViewController *shortVC = (PLShortVideoViewController *)rootVC.selectedViewController;
[shortVC onUIApplication:YES];
}
if ([rootVC.selectedViewController isKindOfClass:[PLShortVideoViewController class]]) {
PLShortVideoViewController *shortVC = (PLShortVideoViewController *)rootVC.selectedViewController;
[shortVC onUIApplication:NO];
}
break;
}
case 1:{
UINavigationController *navVC = rootVC.selectedViewController;
PLLongVideoViewController *longVideoVC = (PLLongVideoViewController *)navVC.topViewController;
[longVideoVC onUIApplication:YES];
if ([navVC.topViewController isKindOfClass:[PLLongVideoViewController class]]) {
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 = YES;

if ([liveVideoVC.presentedViewController isKindOfClass:[PLPlayViewController class]]) {
if (liveVideoVC.presentedViewController) {
PLPlayViewController *playerVC = (PLPlayViewController *)liveVideoVC.presentedViewController;
playerVC.player.enableRender = NO;
}
}

}
break;

Expand Down
8 changes: 4 additions & 4 deletions Example/new/NiuPlayer/Common/PLHttpSession.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

#import "PLHttpSession.h"

#define REQUEST_HOST @"https://api-demo.qnsdk.com"
#define PLAY_HOST @"https://demo-videos.qnsdk.com"
#define REQUEST_HOST @"http://api-demo.qnsdk.com"
#define PLAY_HOST @"http://demo-videos.qnsdk.com"

@implementation PLHttpSession

// @"https://api-demo.qnsdk.com/v1/kodo/bucket/demo-videos?prefix=shortvideo"
// @"http://api-demo.qnsdk.com/v1/kodo/bucket/demo-videos?prefix=shortvideo"
+ (void)requestShortMediaList:(void (^)(NSArray *, NSError *))completeBlock {

NSString *urlString = [REQUEST_HOST stringByAppendingPathComponent:@"v1/kodo/bucket/demo-videos?prefix=shortvideo"];
Expand All @@ -32,7 +32,7 @@ + (void)requestShortMediaList:(void (^)(NSArray *, NSError *))completeBlock {
}];
}

// @"https://api-demo.qnsdk.com/v1/kodo/bucket/demo-videos?prefix=movies"
// @"http://api-demo.qnsdk.com/v1/kodo/bucket/demo-videos?prefix=movies"
+ (void)requestLongMediaList:(void (^)(NSArray *, NSError *))completeBlock {

NSString *urlString = [REQUEST_HOST stringByAppendingPathComponent:@"v1/kodo/bucket/demo-videos?prefix=movies"];
Expand Down
2 changes: 1 addition & 1 deletion Example/new/NiuPlayer/Common/PLPlayViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ - (void)player:(nonnull PLPlayer *)player firstRender:(PLPlayerFirstRenderType)f
}
}

- (void)player:(nonnull PLPlayer *)player SEIData:(nullable NSData *)SEIData {
- (void)player:(nonnull PLPlayer *)player SEIData:(nullable NSData *)SEIData ts:(int64_t)ts {

}

Expand Down
4 changes: 2 additions & 2 deletions Example/new/NiuPlayer/Common/PLPlayerView.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ -(void)dealloc {

- (void)configureVideo:(BOOL)enableRender {
self.player.enableRender = enableRender;

// 避免在未更新画面渲染的情况下，动态翻转移动画布 2020-02-13 hera
if (!enableRender) {
[self removeFullStreenNotify];
Expand Down Expand Up @@ -1025,7 +1025,7 @@ - (void)player:(nonnull PLPlayer *)player firstRender:(PLPlayerFirstRenderType)f
self.durationLabel.text = [NSString stringWithFormat:@"%d:%02d:%02d", hour, min, sec];
}

- (void)player:(nonnull PLPlayer *)player SEIData:(nullable NSData *)SEIData {
- (void)player:(nonnull PLPlayer *)player SEIData:(nullable NSData *)SEIData ts:(int64_t)ts {

}

Expand Down
2 changes: 1 addition & 1 deletion Example/new/NiuPlayer/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
16 changes: 0 additions & 16 deletions Example/new/NiuPlayer/NiuPlayer/AppDelegate.h
View file

This file was deleted.

Loading

0 comments on commit a340905

Please sign in to comment.