Merge pull request #561 from iossun/master

Release v3.4.6
pili-engineering · Jul 13, 2021 · dec2d89 · dec2d89
2 parents 61485a5 + 74e5f21
commit dec2d89
Show file tree

Hide file tree

Showing 28 changed files with 2,086 additions and 1,762 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,5 +24,6 @@ DerivedData
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-#
-# Pods/
+#Pods
+Example/new/Pods
+Example/old/Pods
diff --git a/APIDiffs/api-diffs-3.4.6.md b/APIDiffs/api-diffs-3.4.6.md
@@ -0,0 +1,25 @@
+# PLPlayerKit 3.4.5 to 3.4.6 API Differences
+
+## General Headers    
+
+- *Modified*  `PLPlayerOption.h`
+
+  - *Added*   `extern NSString * _Nullable PLPlayerOptionKeyVideoFileNameEncode`
+
+- *Modified* `PLPlayer`
+
+  - *Added*  `@property (nonatomic, assign, readonly) int audioFPS`
+
+  - *Added*  `@property (nonatomic, assign, readonly) double audioBitrate`
+
+  - *Added* - (**void**)addCacheUrl:(NSString ***_Nullable**)url;
+
+  - *Added* - (**void**)deleteCacheUrl:(NSString ***_Nullable**)url;
+
+  - *Added* - (**void**)addIOCache:(NSString ***_Nullable**)url;
+
+  - *Added* - (**void**)deleteIOCache:(NSString ***_Nullable**)url;
+
+  - *Added* - (**void**)setIOCacheSize:(NSInteger)size;
+
+
diff --git a/Example/new/NiuPlayer.xcodeproj/project.pbxproj b/Example/new/NiuPlayer.xcodeproj/project.pbxproj
@@ -300,8 +300,8 @@
 				76E1E7472049224800D02790 /* Resources */,
 				5F1392422F014A78D7D7D138 /* [CP] Copy Pods Resources */,
 				76E1E799204923AB00D02790 /* Copy Files */,
-				E484F59884E4B8023E4E32B3 /* [CP] Embed Pods Frameworks */,
 				87C27106053AD8212AE45676 /* Upload Bugsnag dSYM */,
+				348CD92A50A3034998219D78 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -391,6 +391,24 @@
 			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;
@@ -426,26 +444,6 @@
 			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";
 			showEnvVarsInLog = 0;
 		};
-		E484F59884E4B8023E4E32B3 /* [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",
-				"${PODS_ROOT}/../../../Pod/Library/PLPlayerKit.framework.dSYM",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
-				"${DWARF_DSYM_FOLDER_PATH}/PLPlayerKit.framework.dSYM",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -620,7 +618,7 @@
 				);
 				INFOPLIST_FILE = NiuPlayer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.4.5;
+				MARKETING_VERSION = 3.4.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qbox.niuplayer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -650,7 +648,7 @@
 				);
 				INFOPLIST_FILE = NiuPlayer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.4.5;
+				MARKETING_VERSION = 3.4.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qbox.niuplayer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/Example/new/Podfile.lock b/Example/new/Podfile.lock
@@ -21,9 +21,9 @@ PODS:
   - JGProgressHUD (2.0.3)
   - Masonry (1.1.0)
   - MMMaterialDesignSpinner (0.2.5)
-  - PLPlayerKit (3.4.5):
-    - PLPlayerKit/iphoneos (= 3.4.5)
-  - PLPlayerKit/iphoneos (3.4.5)
+  - PLPlayerKit (3.4.6):
+    - PLPlayerKit/iphoneos (= 3.4.6)
+  - PLPlayerKit/iphoneos (3.4.6)
   - SDWebImage (4.4.5):
     - SDWebImage/Core (= 4.4.5)
   - SDWebImage/Core (4.4.5)
@@ -43,7 +43,7 @@ DEPENDENCIES:
   - WeiboSDK (>= 3.1.3)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - BlocksKit
     - Bugsnag
     - Crashlytics
@@ -66,10 +66,10 @@ SPEC CHECKSUMS:
   JGProgressHUD: 12b20a8f4ffe05258f8635c1ab92816e451f904d
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MMMaterialDesignSpinner: a548042720c2e5f04212048483085d7942ac3e81
-  PLPlayerKit: 808684cd063f695f91ef07ec0b1237523b0f111d
+  PLPlayerKit: 25795e0605b6ba1c19afb2e913e36ad6bca3bc98
   SDWebImage: ecc03494e973b93b80213649d32175f8d2d17d4d
   WeiboSDK: acb067053668102cf07d01aa7604350162c2e466
 
 PODFILE CHECKSUM: b8e4d3011adae7250551d6868e265422bdfbe1c0
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.10.1
diff --git a/Example/new/Pods/Local Podspecs/PLPlayerKit.podspec.json b/Example/new/Pods/Local Podspecs/PLPlayerKit.podspec.json
diff --git a/Example/new/Pods/Manifest.lock b/Example/new/Pods/Manifest.lock