Skip to content

Commit dec2d89

Browse files
KivenhaoyuKivenhaoyu
authored
Merge pull request #561 from iossun/master
Release v3.4.6
2 parents 61485a5 + 74e5f21 commit dec2d89

File tree

28 files changed

+2086
-1762
lines changed

28 files changed

+2086
-1762
lines changed

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ DerivedData
2424
# We recommend against adding the Pods directory to your .gitignore. However
2525
# you should judge for yourself, the pros and cons are mentioned at:
2626
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
27-
#
28-
# Pods/
27+
#Pods
28+
Example/new/Pods
29+
Example/old/Pods

‎APIDiffs/api-diffs-3.4.6.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# PLPlayerKit 3.4.5 to 3.4.6 API Differences
2+
3+
## General Headers
4+
5+
- *Modified* `PLPlayerOption.h`
6+
7+
- *Added* `extern NSString * _Nullable PLPlayerOptionKeyVideoFileNameEncode`
8+
9+
- *Modified* `PLPlayer`
10+
11+
- *Added* `@property (nonatomic, assign, readonly) int audioFPS`
12+
13+
- *Added* `@property (nonatomic, assign, readonly) double audioBitrate`
14+
15+
- *Added* - (**void**)addCacheUrl:(NSString ***_Nullable**)url;
16+
17+
- *Added* - (**void**)deleteCacheUrl:(NSString ***_Nullable**)url;
18+
19+
- *Added* - (**void**)addIOCache:(NSString ***_Nullable**)url;
20+
21+
- *Added* - (**void**)deleteIOCache:(NSString ***_Nullable**)url;
22+
23+
- *Added* - (**void**)setIOCacheSize:(NSInteger)size;
24+
25+

‎Example/new/NiuPlayer.xcodeproj/project.pbxproj

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@
300300
76E1E7472049224800D02790 /* Resources */,
301301
5F1392422F014A78D7D7D138 /* [CP] Copy Pods Resources */,
302302
76E1E799204923AB00D02790 /* Copy Files */,
303-
E484F59884E4B8023E4E32B3 /* [CP] Embed Pods Frameworks */,
304303
87C27106053AD8212AE45676 /* Upload Bugsnag dSYM */,
304+
348CD92A50A3034998219D78 /* [CP] Embed Pods Frameworks */,
305305
);
306306
buildRules = (
307307
);
@@ -391,6 +391,24 @@
391391
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";
392392
showEnvVarsInLog = 0;
393393
};
394+
348CD92A50A3034998219D78 /* [CP] Embed Pods Frameworks */ = {
395+
isa = PBXShellScriptBuildPhase;
396+
buildActionMask = 2147483647;
397+
files = (
398+
);
399+
inputPaths = (
400+
"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh",
401+
"${PODS_ROOT}/../../../Pod/Library/PLPlayerKit.framework",
402+
);
403+
name = "[CP] Embed Pods Frameworks";
404+
outputPaths = (
405+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
406+
);
407+
runOnlyForDeploymentPostprocessing = 0;
408+
shellPath = /bin/sh;
409+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh\"\n";
410+
showEnvVarsInLog = 0;
411+
};
394412
5F1392422F014A78D7D7D138 /* [CP] Copy Pods Resources */ = {
395413
isa = PBXShellScriptBuildPhase;
396414
buildActionMask = 2147483647;
@@ -426,26 +444,6 @@
426444
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";
427445
showEnvVarsInLog = 0;
428446
};
429-
E484F59884E4B8023E4E32B3 /* [CP] Embed Pods Frameworks */ = {
430-
isa = PBXShellScriptBuildPhase;
431-
buildActionMask = 2147483647;
432-
files = (
433-
);
434-
inputPaths = (
435-
"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh",
436-
"${PODS_ROOT}/../../../Pod/Library/PLPlayerKit.framework",
437-
"${PODS_ROOT}/../../../Pod/Library/PLPlayerKit.framework.dSYM",
438-
);
439-
name = "[CP] Embed Pods Frameworks";
440-
outputPaths = (
441-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
442-
"${DWARF_DSYM_FOLDER_PATH}/PLPlayerKit.framework.dSYM",
443-
);
444-
runOnlyForDeploymentPostprocessing = 0;
445-
shellPath = /bin/sh;
446-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NiuPlayer/Pods-NiuPlayer-frameworks.sh\"\n";
447-
showEnvVarsInLog = 0;
448-
};
449447
/* End PBXShellScriptBuildPhase section */
450448

451449
/* Begin PBXSourcesBuildPhase section */
@@ -620,7 +618,7 @@
620618
);
621619
INFOPLIST_FILE = NiuPlayer/Info.plist;
622620
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
623-
MARKETING_VERSION = 3.4.5;
621+
MARKETING_VERSION = 3.4.6;
624622
PRODUCT_BUNDLE_IDENTIFIER = com.qbox.niuplayer;
625623
PRODUCT_NAME = "$(TARGET_NAME)";
626624
TARGETED_DEVICE_FAMILY = "1,2";
@@ -650,7 +648,7 @@
650648
);
651649
INFOPLIST_FILE = NiuPlayer/Info.plist;
652650
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
653-
MARKETING_VERSION = 3.4.5;
651+
MARKETING_VERSION = 3.4.6;
654652
PRODUCT_BUNDLE_IDENTIFIER = com.qbox.niuplayer;
655653
PRODUCT_NAME = "$(TARGET_NAME)";
656654
TARGETED_DEVICE_FAMILY = "1,2";

‎Example/new/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ PODS:
2121
- JGProgressHUD (2.0.3)
2222
- Masonry (1.1.0)
2323
- MMMaterialDesignSpinner (0.2.5)
24-
- PLPlayerKit (3.4.5):
25-
- PLPlayerKit/iphoneos (= 3.4.5)
26-
- PLPlayerKit/iphoneos (3.4.5)
24+
- PLPlayerKit (3.4.6):
25+
- PLPlayerKit/iphoneos (= 3.4.6)
26+
- PLPlayerKit/iphoneos (3.4.6)
2727
- SDWebImage (4.4.5):
2828
- SDWebImage/Core (= 4.4.5)
2929
- SDWebImage/Core (4.4.5)
@@ -43,7 +43,7 @@ DEPENDENCIES:
4343
- WeiboSDK (>= 3.1.3)
4444

4545
SPEC REPOS:
46-
https://github.com/cocoapods/specs.git:
46+
https://github.com/CocoaPods/Specs.git:
4747
- BlocksKit
4848
- Bugsnag
4949
- Crashlytics
@@ -66,10 +66,10 @@ SPEC CHECKSUMS:
6666
JGProgressHUD: 12b20a8f4ffe05258f8635c1ab92816e451f904d
6767
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
6868
MMMaterialDesignSpinner: a548042720c2e5f04212048483085d7942ac3e81
69-
PLPlayerKit: 808684cd063f695f91ef07ec0b1237523b0f111d
69+
PLPlayerKit: 25795e0605b6ba1c19afb2e913e36ad6bca3bc98
7070
SDWebImage: ecc03494e973b93b80213649d32175f8d2d17d4d
7171
WeiboSDK: acb067053668102cf07d01aa7604350162c2e466
7272

7373
PODFILE CHECKSUM: b8e4d3011adae7250551d6868e265422bdfbe1c0
7474

75-
COCOAPODS: 1.7.5
75+
COCOAPODS: 1.10.1

‎Example/new/Pods/Local Podspecs/PLPlayerKit.podspec.json

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/new/Pods/Manifest.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)