Merge pull request #151 from ShengQiangLiu/v3.1.1_release

v3.1.1 release
pili-engineering · May 31, 2024 · fa6e77d · fa6e77d
2 parents e47b1b5 + 3185b6b
commit fa6e77d
Show file tree

Hide file tree

Showing 30 changed files with 16,631 additions and 28 deletions.
diff --git a/APIDiffs/api-diffs-3.1.1.md b/APIDiffs/api-diffs-3.1.1.md
@@ -0,0 +1,12 @@
+# PLMediaStreamingKit 3.1.0 to 3.1.1 API Differences
+
+```
+PLMediaStreamingSession.h
+```
+
+- *Added* method `- (void)reloadVideoCaptureConfiguration:(PLVideoCaptureConfiguration *)videoCaptureConfiguration;`
+
+## General Headers
+
+
+
diff --git a/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj b/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj
@@ -215,7 +215,7 @@
 		B6FC33901D93C301004EEE29 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		B6FC33B21D93C470004EEE29 /* PLAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLAppDelegate.h; sourceTree = "<group>"; };
 		B6FC33B31D93C470004EEE29 /* PLAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLAppDelegate.m; sourceTree = "<group>"; };
-		B6FC33B51D93C603004EEE29 /* PLMediaStreamingKit.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PLMediaStreamingKit.podspec; path = ../PLMediaStreamingKit.podspec; sourceTree = "<group>"; };
+		B6FC33B51D93C603004EEE29 /* PLMediaStreamingKit.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PLMediaStreamingKit.podspec; path = ../PLMediaStreamingKit.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		BE66EB89300B2711005819E0 /* Pods-BroadcastUploadExtensionSetupUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BroadcastUploadExtensionSetupUI.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BroadcastUploadExtensionSetupUI/Pods-BroadcastUploadExtensionSetupUI.debug.xcconfig"; sourceTree = "<group>"; };
 		C84F5E2AD19F1CCCE4AA7DD6 /* libPods-BroadcastUploadExtensionSetupUI.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BroadcastUploadExtensionSetupUI.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F444AD22AE92F8FC574B218F /* Pods-BroadcastUploadExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BroadcastUploadExtension.release.xcconfig"; path = "Pods/Target Support Files/Pods-BroadcastUploadExtension/Pods-BroadcastUploadExtension.release.xcconfig"; sourceTree = "<group>"; };
@@ -480,9 +480,9 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				B651FF8E1D93D99B00D1C578 /* ShellScript */,
 				C199A29A2A579362E89B2F18 /* [CP] Embed Pods Frameworks */,
 				AAD08ACB25F0D6FC00AB98AA /* Embed App Extensions */,
+				B651FF8E1D93D99B00D1C578 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -722,7 +722,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${PODS_ROOT}/Fabric/run 356922ded861e8764b53656f328bf3e7610fb59b 4e8f96a6c525321b1833e0fdb19f396702d2cb0b6e581fdf80efde45b2a3bfc1";
+			shellScript = "${PODS_ROOT}/Fabric/run 356922ded861e8764b53656f328bf3e7610fb59b 4e8f96a6c525321b1833e0fdb19f396702d2cb0b6e581fdf80efde45b2a3bfc1\n";
 		};
 		C199A29A2A579362E89B2F18 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -910,7 +910,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/PLMediaStreamingKitDemo/Weixin",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.PLMediaStreamingKitDemo;
 				PRODUCT_NAME = PLMediaStreamingKitDemo;
@@ -939,7 +939,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/PLMediaStreamingKitDemo/Weixin",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.PLMediaStreamingKitDemo;

diff --git a/Example/PLMediaStreamingKitDemo/PLInitViewController.m b/Example/PLMediaStreamingKitDemo/PLInitViewController.m
@@ -58,7 +58,7 @@ - (void)viewDidLoad {
     // 适配顶部
     CGFloat space = 24;
     if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
-        PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax || PL_iPhone14PMax) {
+        PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax || PL_iPhone14PMax || PL_iPhone14) {
         space = 44;
     }
     _topSpace = space + 4;

diff --git a/Example/PLMediaStreamingKitDemo/PLMediaStreamingKitDemo-Prefix.pch b/Example/PLMediaStreamingKitDemo/PLMediaStreamingKitDemo-Prefix.pch
@@ -45,6 +45,7 @@
 #define PL_iPhone12Pro ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1170, 2532), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PL_iPhone12PMax ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1284, 2778), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PL_iPhone14PMax ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1290, 2796), [[UIScreen mainScreen] currentMode].size) : NO)
+#define PL_iPhone14 ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1179, 2556), [[UIScreen mainScreen] currentMode].size) : NO)
 
 
 // 自定义 model
@@ -58,6 +59,6 @@
 
 // 推流 SDK
 #import <PLMediaStreamingKit/PLMediaStreamingKit.h>
-#define PL_MEDIA_STREAM_VERSION @"v3.1.0"
+#define PL_MEDIA_STREAM_VERSION @"v3.1.1"
 
 #endif
diff --git a/Example/PLMediaStreamingKitDemo/PLStreamViewController.m b/Example/PLMediaStreamingKitDemo/PLStreamViewController.m
@@ -240,7 +240,7 @@ - (void)viewDidLoad {
     // UI 适配顶部
     CGFloat space = 24;
     if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
-        PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax || PL_iPhone14PMax) {
+        PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax || PL_iPhone14PMax || PL_iPhone14) {
         space = 44;
     }
     _topSpace = space + 4;

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -3,11 +3,11 @@ PODS:
     - Fabric (~> 1.10.2)
   - Fabric (1.10.2)
   - Masonry (1.1.0)
-  - PLMediaStreamingKit (3.1.0):
-    - PLMediaStreamingKit/ex-HappyDNS (= 3.1.0)
-    - PLMediaStreamingKit/HappyDNS (= 3.1.0)
-  - PLMediaStreamingKit/ex-HappyDNS (3.1.0)
-  - PLMediaStreamingKit/HappyDNS (3.1.0)
+  - PLMediaStreamingKit (3.1.1):
+    - PLMediaStreamingKit/ex-HappyDNS (= 3.1.1)
+    - PLMediaStreamingKit/HappyDNS (= 3.1.1)
+  - PLMediaStreamingKit/ex-HappyDNS (3.1.1)
+  - PLMediaStreamingKit/HappyDNS (3.1.1)
 
 DEPENDENCIES:
   - Crashlytics
@@ -29,7 +29,7 @@ SPEC CHECKSUMS:
   Crashlytics: 9220f5bc89e7a618df411b4f639389dbfb0e03d2
   Fabric: ea977e3cd9c20425516d3dafd3bf8c941c51223f
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
-  PLMediaStreamingKit: a0bd94a5465d0afd3b55af41fca08f87c89f1a42
+  PLMediaStreamingKit: c9189aefaef1b8f90a53a93df1f961eddcb5c778
 
 PODFILE CHECKSUM: 01b839d9eedb8dc4ae7438d2253f169c3d8deb5b
 

diff --git a/Example/Pods/Local Podspecs/PLMediaStreamingKit.podspec.json b/Example/Pods/Local Podspecs/PLMediaStreamingKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/PLMediaStreamingKit-Universal.podspec b/PLMediaStreamingKit-Universal.podspec
@@ -9,12 +9,12 @@
 
 Pod::Spec.new do |s|
   s.name             = "PLMediaStreamingKit"
-  s.version          = "3.1.0"
+  s.version          = "3.1.1"
   s.summary          = "Pili iOS media streaming framework via RTMP."
   s.homepage         = "https://github.com/pili-engineering/PLMediaStreamingKit"
   s.license          = 'Apache License, Version 2.0'
   s.author           = { "pili" => "pili@qiniu.com" }
-  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.1.0-universal.zip"}
+  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.1.1-universal.zip"}
 
   s.platform     = :ios
   s.ios.deployment_target = '8.0'

diff --git a/PLMediaStreamingKit.podspec b/PLMediaStreamingKit.podspec
@@ -9,12 +9,12 @@
 
 Pod::Spec.new do |s|
   s.name             = "PLMediaStreamingKit"
-  s.version          = "3.1.0"
+  s.version          = "3.1.1"
   s.summary          = "Pili iOS media streaming framework via RTMP."
   s.homepage         = "https://github.com/pili-engineering/PLMediaStreamingKit"
   s.license          = 'Apache License, Version 2.0'
   s.author           = { "pili" => "pili@qiniu.com" }
-  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.1.0-iphoneos.zip"}
+  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.1.1-iphoneos.zip"}
 
   s.platform     = :ios
   s.ios.deployment_target = '8.0'

diff --git a/...Universal/PLMediaStreamingKit.framework.dSYM/Contents/Resources/DWARF/PLMediaStreamingKit b/...Universal/PLMediaStreamingKit.framework.dSYM/Contents/Resources/DWARF/PLMediaStreamingKit