Merge pull request #113 from LZYongcn/master

release 3.2.0
pili-engineering · Sep 18, 2020 · 3cfa4f6 · 3cfa4f6
2 parents 610bd88 + d744010
commit 3cfa4f6
Show file tree

Hide file tree

Showing 1,086 changed files with 3,421 additions and 65,826 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,6 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
+
+**/Pods
+**/Podfile.lock
diff --git a/APIDiffs/api-diffs-3.2.0.md b/APIDiffs/api-diffs-3.2.0.md
@@ -0,0 +1,108 @@
+# PLShortVideoKit 3.1.1 to 3.2.0 API Differences
+
+## General Headers
+
+`PLSTypeDefines.h`
+
+- *Added*
+
+```objc
+typedef enum {
+    PLSTransitionTypeFade                 = 0,  // 淡入淡出
+    PLSTransitionTypeNone                 = 1,  // 无
+
+    PLSTransitionTypeFadeBlack            = 2,  // 闪黑    v3.2.0
+    PLSTransitionTypeFadeWhite            = 3,  // 闪白    v3.2.0
+    PLSTransitionTypeCircularCrop         = 4,  // 圆形    v3.2.0
+
+    PLSTransitionTypeSliderUp             = 5,  // 从上飞入 v3.2.0
+    PLSTransitionTypeSliderDown           = 6,  // 从下飞入 v3.2.0
+    PLSTransitionTypeSliderLeft           = 7,  // 从左飞入 v3.2.0
+    PLSTransitionTypeSliderRight          = 8,  // 从右飞入 v3.2.0
+
+    PLSTransitionTypeWipeUp               = 9,  // 从上擦除 v3.2.0
+    PLSTransitionTypeWipeDown             = 10, // 从下擦除 v3.2.0
+    PLSTransitionTypeWipeLeft             = 11, // 从左擦除 v3.2.0
+    PLSTransitionTypeWipeRight            = 12, // 从右擦除 v3.2.0
+
+} PLSTransitionType;
+```
+
+`PLSAVAssetExportSession.h`
+
+- *Added* 
+
+```objc
+@property(nonatomic, assign) int gopSize;
+```
+
+`PLSUploaderResponInfo.h`
+
+- *Added* 
+
+```objc
+@property (nonatomic, copy, readonly) NSString * _Nullable xClientId;
+
+- (instancetype _Nullable)initWithStatusCode:(int)statusCode
+                                       reqId:(NSString *_Nullable)reqId
+                                   xClientId:(NSString *_Nullable)xClientId
+                                        xlog:(NSString *_Nullable)xlog
+                                        xvia:(NSString *_Nullable)xvia
+                                       error:(NSError *_Nullable)error
+                                        host:(NSString *_Nullable)host
+                                    duration:(double)duration
+                                          id:(NSString *_Nullable)id
+                                   timeStamp:(UInt64)timeStamp
+                                    canceled:(BOOL)canceled
+                                          ok:(BOOL)ok
+                                      broken:(BOOL)broken
+                                    notQiniu:(BOOL)notQiniu;
+```
+
+
+- *Deprecated* 
+
+```objc
+@property (nonatomic, readonly) NSString * _Nullable serverIp- *Deprecated* 
+
+- (instancetype _Nullable)initWithStatusCode:(int)statusCode
+                                       reqId:(NSString *_Nullable)reqId
+                                        xlog:(NSString *_Nullable)xlog
+                                        xvia:(NSString *_Nullable)xvia
+                                       error:(NSError *_Nullable)error
+                                        host:(NSString *_Nullable)host
+                                    duration:(double)duration
+                                    serverIp:(NSString *_Nullable)serverIp
+                                          id:(NSString *_Nullable)id
+                                   timeStamp:(UInt64)timeStamp
+                                    canceled:(BOOL)canceled
+                                          ok:(BOOL)ok
+                                      broken:(BOOL)broken
+                                    notQiniu:(BOOL)notQiniu;
+```
+
+`PLSImageToMovieComposer.h`
+
+- *Added* 
+
+```objc
+- (void)previewVideoByPlayerItem;
+
+- (void)updatePreviewTransitionMedias:(NSInteger)index transitionType:(PLSTransitionType)transitionType;
+```
+
+`PLSImageVideoComposer.h`
+
+- *Added* 
+
+```objc
+@property (copy, nonatomic) void(^ _Nullable previewBlock)(AVPlayerItem* playerItem);
+
+@property (copy, nonatomic) void(^ _Nullable previewFailureBlock)(NSError* error);
+
+@property (assign, nonatomic) BOOL useGobalTransition;
+
+- (void)previewVideoByPlayerItem;
+
+- (void)updatePreviewTransitionMedias:(NSInteger)index transitionType:(PLSTransitionType)transitionType;
+```
diff --git a/PLShortVideoKit-Advanced.podspec b/PLShortVideoKit-Advanced.podspec
@@ -9,18 +9,18 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.1"
+  s.version      = "3.2.0"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-advanced-v3.1.1.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-advanced-v3.2.0.zip"}
   s.platform     = :ios
   s.requires_arc = true
 
   s.ios.deployment_target	= "8.0"
 
-  s.dependency 'Qiniu', '7.2.5'
+  s.dependency 'Qiniu', '7.4.4'
 
 
   s.subspec "ex-libMuseProcessor" do |ss1|

diff --git a/PLShortVideoKit-Basic.podspec b/PLShortVideoKit-Basic.podspec
@@ -9,18 +9,18 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.1"
+  s.version      = "3.2.0"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-basic-v3.1.1.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-basic-v3.2.0.zip"}
   s.platform     = :ios
   s.requires_arc = true
 
   s.ios.deployment_target	= "8.0"
 
-  s.dependency 'Qiniu', '7.2.5'
+  s.dependency 'Qiniu', '7.4.4'
 
 
   s.subspec "ex-libMuseProcessor" do |ss1|

diff --git a/PLShortVideoKit-Smart.podspec b/PLShortVideoKit-Smart.podspec
@@ -9,18 +9,18 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.1"
+  s.version      = "3.2.0"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-smart-v3.1.1.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-smart-v3.2.0.zip"}
   s.platform     = :ios
   s.requires_arc = true
 
   s.ios.deployment_target	= "8.0"
 
-  s.dependency 'Qiniu', '7.2.5'
+  s.dependency 'Qiniu', '7.4.4'
 
 
   s.subspec "ex-libMuseProcessor" do |ss1|

diff --git a/PLShortVideoKit.podspec b/PLShortVideoKit.podspec
@@ -9,19 +9,18 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.1"
+  s.version      = "3.2.0"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-profession-v3.1.1.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-profession-v3.2.0.zip"}
   s.platform     = :ios
   s.requires_arc = true
 
   s.ios.deployment_target	= "8.0"
 
-  s.dependency 'Qiniu', '7.2.5'
-
+  s.dependency 'Qiniu', '7.4.4'
 
   s.subspec "ex-libMuseProcessor" do |ss1|
     ss1.vendored_framework		= "Pod/Library/Profession/PLShortVideoKit.framework"