Merge pull request #80 from HeraShowFeng/v2.2.0

release version v2.2.0

APIDiffs/api-diffs-2.2.0.md

@@ -0,0 +1,11 @@
+# PLShortVideoKit 2.1.0 to 2.2.0 API Differences
+
+## General Headers
+
+```
+PLSVideoMixConfiguration.h
+```
+
+- *Added* @property (assign, nonatomic) NSInteger camermZIndex;
+
+- *Added* @property (assign, nonatomic) NSInteger sampleZIndex;

Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj

@@ -1010,6 +1010,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				"zh-Hant",

Example/PLShortVideoKitDemo.xcodeproj/xcshareddata/xcschemes/PLShortVideoKitDemo.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0A94357B1E6CA2E2008845A3"
+               BuildableName = "PLShortVideoKitDemo.app"
+               BlueprintName = "PLShortVideoKitDemo"
+               ReferencedContainer = "container:PLShortVideoKitDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0A94357B1E6CA2E2008845A3"
+            BuildableName = "PLShortVideoKitDemo.app"
+            BlueprintName = "PLShortVideoKitDemo"
+            ReferencedContainer = "container:PLShortVideoKitDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0A94357B1E6CA2E2008845A3"
+            BuildableName = "PLShortVideoKitDemo.app"
+            BlueprintName = "PLShortVideoKitDemo"
+            ReferencedContainer = "container:PLShortVideoKitDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0A94357B1E6CA2E2008845A3"
+            BuildableName = "PLShortVideoKitDemo.app"
+            BlueprintName = "PLShortVideoKitDemo"
+            ReferencedContainer = "container:PLShortVideoKitDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/PLShortVideoKitDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/PLShortVideoKitDemo/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0.git-2019-05-14-c38f21d</string>
+	<string>2.2.0.git-2019-07-12-d3a6074</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

Example/Podfile.lock

@@ -5,13 +5,13 @@ PODS:
   - FLAnimatedImage (1.0.12)
   - HappyDNS (0.3.14)
   - Masonry (1.0.2)
-  - PLShortVideoKit (2.1.0):
-    - PLShortVideoKit/ex-libMuseProcessor (= 2.1.0)
-    - PLShortVideoKit/libMuseProcessor (= 2.1.0)
+  - PLShortVideoKit (2.2.0):
+    - PLShortVideoKit/ex-libMuseProcessor (= 2.2.0)
+    - PLShortVideoKit/libMuseProcessor (= 2.2.0)
     - Qiniu (= 7.2.5)
-  - PLShortVideoKit/ex-libMuseProcessor (2.1.0):
+  - PLShortVideoKit/ex-libMuseProcessor (2.2.0):
     - Qiniu (= 7.2.5)
-  - PLShortVideoKit/libMuseProcessor (2.1.0):
+  - PLShortVideoKit/libMuseProcessor (2.2.0):
     - Qiniu (= 7.2.5)
   - Qiniu (7.2.5):
     - HappyDNS (~> 0.3)
@@ -43,9 +43,9 @@ SPEC CHECKSUMS:
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   HappyDNS: dc6a164ee81979093123c241c6353bcf0218add6
   Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
-  PLShortVideoKit: 9d8207a06bacbfedbf8b719b009e6c7762d70bd9
+  PLShortVideoKit: 2cd567eaa83a4451945a2db630dfae95c1d5f763
   Qiniu: 909b408ee489ea54827e9717be90b94bc9dfbc48
 
 PODFILE CHECKSUM: 464a1d9cdafee0a2337603af681aa59f2814b116
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.7.2