Merge pull request #76 from anhaoxiong/master

release v1.16.1
pili-engineering · Jan 28, 2019 · 56d00c8 · 56d00c8
2 parents 3fd3ed5 + e726648
commit 56d00c8
Show file tree

Hide file tree

Showing 84 changed files with 1,482 additions and 6,192 deletions.
diff --git a/APIDiffs/api-diffs-1.16.1.md b/APIDiffs/api-diffs-1.16.1.md
@@ -0,0 +1,24 @@
+# PLShortVideoKit 1.16.0 to 1.16.1 API Differences
+
+## General Headers
+
+```
+PLShortVideoRecorder.h
+```
+
+- *Added* + (void)checkAuthentication:(void(^ __nonnull)(PLSAuthenticationResult result))resultBlock;;
+
+```
+PLSTypeDefines.h
+```
+
+- *Added* PLSAuthenticationResult;
+
+
+```
+AVAsset+PLSExtendProperty.h
+```
+
+- *Added* @property (assign, nonatomic, readonly) UInt32 pls_channel;
+
+- *Added* @property (assign, nonatomic, readonly) Float64 pls_sampleRate;
diff --git a/Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj b/Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj
@@ -977,7 +977,6 @@
 				0A9435791E6CA2E2008845A3 /* Frameworks */,
 				0A94357A1E6CA2E2008845A3 /* Resources */,
 				B051BAB51EADFEF900385FF0 /* ShellScript */,
-				F12800A47717371B5B955FDD /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1223,24 +1222,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Fabric/run\" 356922ded861e8764b53656f328bf3e7610fb59b 4e8f96a6c525321b1833e0fdb19f396702d2cb0b6e581fdf80efde45b2a3bfc1\n\n\nshortVersion=$(/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\")\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print :CFBundleVersion\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\")\n\ngitVersion=$(git log -1 --pretty=format:\"git-%cd-%h\" --date=short 2> /dev/null)\nbuildNumber=\"$shortVersion.$gitVersion\"\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\"\n\n";
 		};
-		F12800A47717371B5B955FDD /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-PLShortVideoKitDemo/Pods-PLShortVideoKitDemo-frameworks.sh",
-				"${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PLShortVideoKitDemo/Pods-PLShortVideoKitDemo-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1422,7 +1403,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = GDFHW66V92;
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo",
@@ -1453,7 +1434,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = GDFHW66V92;
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo",

diff --git a/Example/PLShortVideoKitDemo/DubViewController.m b/Example/PLShortVideoKitDemo/DubViewController.m
@@ -10,7 +10,6 @@
 #import "PLSProgressBar.h"
 #import "PLShortVideoKit/PLShortVideoKit.h"
 
-#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
 #define PLS_SCREEN_WIDTH CGRectGetWidth([UIScreen mainScreen].bounds)
 #define PLS_SCREEN_HEIGHT CGRectGetHeight([UIScreen mainScreen].bounds)
@@ -113,7 +112,7 @@ - (void)setupBaseToolboxView {
 
     // 标题
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 0, 100, 64)];
-    if (iPhoneX) {
+    if (iPhoneX_SERIES) {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
     } else {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);

diff --git a/Example/PLShortVideoKitDemo/EditViewController.m b/Example/PLShortVideoKitDemo/EditViewController.m
@@ -28,7 +28,6 @@
 #import <Photos/Photos.h>
 
 #define AlertViewShow(msg) [[[UIAlertView alloc] initWithTitle:@"warning" message:[NSString stringWithFormat:@"%@", msg] delegate:nil cancelButtonTitle:@"ok" otherButtonTitles:nil] show]
-#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
 #define PLS_RGBCOLOR_ALPHA(r,g,b,a) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:(a)]
 #define PLS_SCREEN_WIDTH CGRectGetWidth([UIScreen mainScreen].bounds)
@@ -253,7 +252,7 @@ - (void)viewDidLoad {
 }
 
 - (CGFloat)bottomFixSpace {
-    return iPhoneX ? 30 : 0;
+    return iPhoneX_SERIES ? 30 : 0;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -387,7 +386,7 @@ - (void)setupBaseToolboxView {
 
     // 标题
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 0, 100, 64)];
-    if (iPhoneX) {
+    if (iPhoneX_SERIES) {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
     } else {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);
@@ -654,7 +653,7 @@ - (void)setupEditToolboxView {
     // 配音
     button = [self toolBoxButtonWithSelector:@selector(dubAudioButtonEvent:)
                                       startX:button.frame.origin.x + button.frame.size.width + 20
-                                       title:@"配音图"];
+                                       title:@"配音"];
 
     // 视频倍速
     button = [self toolBoxButtonWithSelector:@selector(videoSpeedButtonEvent:)

diff --git a/Example/PLShortVideoKitDemo/GifFormatViewController.m b/Example/PLShortVideoKitDemo/GifFormatViewController.m
@@ -13,7 +13,6 @@
 #import "PlayViewController.h"
 
 
-#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
 #define PLS_BaseToolboxView_HEIGHT 64
 #define PLS_SCREEN_WIDTH CGRectGetWidth([UIScreen mainScreen].bounds)
@@ -62,7 +61,7 @@ - (void)setupBaseToolboxView {
 
     // 标题
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 0, 100, 64)];
-    if (iPhoneX) {
+    if (iPhoneX_SERIES) {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
     } else {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);

diff --git a/Example/PLShortVideoKitDemo/Info.plist b/Example/PLShortVideoKitDemo/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.16.0</string>
+	<string>1.16.1</string>
 	<key>CFBundleVersion</key>
-	<string>1.16.0.git-2018-12-14-9cc7ee0</string>
+	<string>1.16.1.git-2019-01-28-eac39a6</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Example/PLShortVideoKitDemo/MovieTransCodeViewController.m b/Example/PLShortVideoKitDemo/MovieTransCodeViewController.m
@@ -14,7 +14,6 @@
 #import "EditViewController.h"
 
 #define AlertViewShow(msg) [[[UIAlertView alloc] initWithTitle:@"warning" message:[NSString stringWithFormat:@"%@", msg] delegate:nil cancelButtonTitle:@"ok" otherButtonTitles:nil] show]
-#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
 #define PLS_BaseToolboxView_HEIGHT 64
 #define PLS_SCREEN_WIDTH CGRectGetWidth([UIScreen mainScreen].bounds)
@@ -160,7 +159,7 @@ - (void)setupBaseToolboxView {
 
     // 标题
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 0, 100, 64)];
-    if (iPhoneX) {
+    if (iPhoneX_SERIES) {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
     } else {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);

diff --git a/Example/PLShortVideoKitDemo/PhotoAlbumViewController.m b/Example/PLShortVideoKitDemo/PhotoAlbumViewController.m
@@ -13,7 +13,6 @@
 #import "EditViewController.h"
 
 #define AlertViewShow(msg) [[[UIAlertView alloc] initWithTitle:@"warning" message:[NSString stringWithFormat:@"%@", msg] delegate:nil cancelButtonTitle:@"ok" otherButtonTitles:nil] show]
-#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
 #define PLS_SCREEN_WIDTH CGRectGetWidth([UIScreen mainScreen].bounds)
 #define PLS_SCREEN_HEIGHT CGRectGetHeight([UIScreen mainScreen].bounds)
@@ -454,7 +453,7 @@ - (void)setupBaseToolboxView {
 
     // 标题
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 0, 100, 64)];
-    if (iPhoneX) {
+    if (iPhoneX_SERIES) {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
     } else {
         titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);