Merge pull request #130 from Kivenhaoyu/release-v3.0.2

v3.0.2 release
pili-engineering · Sep 18, 2020 · dfa625c · dfa625c
2 parents 3e6fedf + 2173ca2
commit dfa625c
Show file tree

Hide file tree

Showing 23 changed files with 405 additions and 407 deletions.
diff --git a/APIDiffs/api-diffs-3.0.2.md b/APIDiffs/api-diffs-3.0.2.md
@@ -0,0 +1,3 @@
+# PLMediaStreamingKit 3.0.1 to 3.0.2 API Differences
+
+## General Headers
diff --git a/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj b/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj
@@ -710,7 +710,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/PLMediaStreamingKitDemo/Weixin",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.2;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pili-engineering.PLMediaStreamingKit";
 				PRODUCT_NAME = PLMediaStreamingKitDemo;
@@ -736,7 +736,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/PLMediaStreamingKitDemo/Weixin",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pili-engineering.PLMediaStreamingKit";

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -3,9 +3,9 @@ PODS:
     - Fabric (~> 1.10.1)
   - Fabric (1.10.1)
   - Masonry (1.1.0)
-  - PLMediaStreamingKit (3.0.1):
-    - PLMediaStreamingKit/iphoneos (= 3.0.1)
-  - PLMediaStreamingKit/iphoneos (3.0.1)
+  - PLMediaStreamingKit (3.0.2):
+    - PLMediaStreamingKit/iphoneos (= 3.0.2)
+  - PLMediaStreamingKit/iphoneos (3.0.2)
 
 DEPENDENCIES:
   - Crashlytics
@@ -14,7 +14,7 @@ DEPENDENCIES:
   - PLMediaStreamingKit (from `../`)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - Crashlytics
     - Fabric
     - Masonry
@@ -27,8 +27,8 @@ SPEC CHECKSUMS:
   Crashlytics: 5aa8e90dcbf2f34898b4f5a0037787531246cca0
   Fabric: f6f21452846788bb44595d73e9909d79d328e617
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
-  PLMediaStreamingKit: e458493ea7eff3ad7f1c0476fa4a4c9e43d99afd
+  PLMediaStreamingKit: 20e0dac77a93e488c8b06bfabf8fdb0fc61f07b5
 
 PODFILE CHECKSUM: 8d7c89f30111bbbfa14ac3d29f6dd4c6e565c1c5
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.7.5
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/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/PLMediaStreamingKit/PLMediaStreamingKit.xcconfig b/Example/Pods/Target Support Files/PLMediaStreamingKit/PLMediaStreamingKit.xcconfig
diff --git a/...get Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo-frameworks.sh b/...get Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo-frameworks.sh
diff --git a/...et Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo.debug.xcconfig b/...et Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo.debug.xcconfig
diff --git a/... Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo.release.xcconfig b/... Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo.release.xcconfig
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.0.1"
+  s.version          = "3.0.2"
   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" => "[email protected]" }
-  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.1-universal.zip"}
+  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.2-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.0.1"
+  s.version          = "3.0.2"
   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" => "[email protected]" }
-  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.1-iphoneos.zip"}
+  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.2-iphoneos.zip"}
 
   s.platform     = :ios
   s.ios.deployment_target = '8.0'

diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLAudioSession.h b/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLAudioSession.h
@@ -9,6 +9,8 @@
 #import <AVFoundation/AVFoundation.h>
 #import <Foundation/Foundation.h>
 
+typedef void (^PermissionBlock)(BOOL granted);
+
 NS_ASSUME_NONNULL_BEGIN
 
 /*! Proxy class for AVAudioSession that adds a locking mechanism similar to

diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLMediaStreamingSession.h b/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLMediaStreamingSession.h
@@ -154,11 +154,11 @@ NS_ASSUME_NONNULL_BEGIN
              当videoStreamingConfiguration 和 audioStreamingConfiguration 同时为 nil 时为纯连麦模式。
              当初始化方法会优先使用后置摄像头，如果发现设备没有后置摄像头，会判断是否有前置摄像头，如果都没有，便会返回 nil。
  */
-- (instancetype)initWithVideoCaptureConfiguration:(PLVideoCaptureConfiguration *)videoCaptureConfiguration
-                        audioCaptureConfiguration:(PLAudioCaptureConfiguration *)audioCaptureConfiguration
-                      videoStreamingConfiguration:(PLVideoStreamingConfiguration *)videoStreamingConfiguration
-                      audioStreamingConfiguration:(PLAudioStreamingConfiguration *)audioStreamingConfiguration
-                                           stream:(PLStream *)stream NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithVideoCaptureConfiguration:(nullable PLVideoCaptureConfiguration *)videoCaptureConfiguration
+                        audioCaptureConfiguration:(nullable PLAudioCaptureConfiguration *)audioCaptureConfiguration
+                      videoStreamingConfiguration:(nullable PLVideoStreamingConfiguration *)videoStreamingConfiguration
+                      audioStreamingConfiguration:(nullable PLAudioStreamingConfiguration *)audioStreamingConfiguration
+                                           stream:(nullable PLStream *)stream NS_DESIGNATED_INITIALIZER;
 
 /*!
  @abstract 初始化方法
@@ -180,12 +180,12 @@ NS_ASSUME_NONNULL_BEGIN
              如果你对 dns 解析部分不清楚，可以直接使用
  -initWithVideoCaptureConfiguration:audioCaptureConfiguration:videoStreamingConfiguration:audioStreamingConfiguration:stream 来初始化 PLMediaStreamingSession 对象
  */
-- (instancetype)initWithVideoCaptureConfiguration:(PLVideoCaptureConfiguration *)videoCaptureConfiguration
-                        audioCaptureConfiguration:(PLAudioCaptureConfiguration *)audioCaptureConfiguration
-                      videoStreamingConfiguration:(PLVideoStreamingConfiguration *)videoStreamingConfiguration
-                      audioStreamingConfiguration:(PLAudioStreamingConfiguration *)audioStreamingConfiguration
-                                           stream:(PLStream *)stream
-                                              dns:(QNDnsManager *)dns;
+- (instancetype)initWithVideoCaptureConfiguration:(nullable PLVideoCaptureConfiguration *)videoCaptureConfiguration
+                        audioCaptureConfiguration:(nullable PLAudioCaptureConfiguration *)audioCaptureConfiguration
+                      videoStreamingConfiguration:(nullable PLVideoStreamingConfiguration *)videoStreamingConfiguration
+                      audioStreamingConfiguration:(nullable PLAudioStreamingConfiguration *)audioStreamingConfiguration
+                                           stream:(nullable PLStream *)stream
+                                              dns:(nullable QNDnsManager *)dns;
 
 /*!
  @abstract 初始化方法
@@ -208,12 +208,12 @@ NS_ASSUME_NONNULL_BEGIN
              如果你对 dns 解析部分不清楚，可以直接使用
  -initWithVideoCaptureConfiguration:audioCaptureConfiguration:videoStreamingConfiguration:audioStreamingConfiguration:stream 来初始化 PLMediaStreamingSession 对象
  */
-- (instancetype)initWithVideoCaptureConfiguration:(PLVideoCaptureConfiguration *)videoCaptureConfiguration
-                        audioCaptureConfiguration:(PLAudioCaptureConfiguration *)audioCaptureConfiguration
-                      videoStreamingConfiguration:(PLVideoStreamingConfiguration *)videoStreamingConfiguration
-                      audioStreamingConfiguration:(PLAudioStreamingConfiguration *)audioStreamingConfiguration
-                                           stream:(PLStream *)stream
-                                              dns:(QNDnsManager *)dns
+- (instancetype)initWithVideoCaptureConfiguration:(nullable PLVideoCaptureConfiguration *)videoCaptureConfiguration
+                        audioCaptureConfiguration:(nullable PLAudioCaptureConfiguration *)audioCaptureConfiguration
+                      videoStreamingConfiguration:(nullable PLVideoStreamingConfiguration *)videoStreamingConfiguration
+                      audioStreamingConfiguration:(nullable PLAudioStreamingConfiguration *)audioStreamingConfiguration
+                                           stream:(nullable PLStream *)stream
+                                              dns:(nullable QNDnsManager *)dns
                                       eaglContext:(EAGLContext *)eaglContext;
 
 /*!

diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLStreamingSession.h b/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLStreamingSession.h
@@ -259,9 +259,9 @@ typedef void (^PLStreamDiagnosisResultHandler)(NSString * _Nullable diagnosisRes
  
  @since      v1.1.7
  */
-- (instancetype)initWithVideoStreamingConfiguration:(PLVideoStreamingConfiguration *)videoStreamingConfiguration
-                        audioStreamingConfiguration:(PLAudioStreamingConfiguration *)audioStreamingConfiguration
-                                             stream:(PLStream *)stream;
+- (instancetype)initWithVideoStreamingConfiguration:(nullable PLVideoStreamingConfiguration *)videoStreamingConfiguration
+                        audioStreamingConfiguration:(nullable PLAudioStreamingConfiguration *)audioStreamingConfiguration
+                                             stream:(nullable PLStream *)stream;
 
 /*!
  @method     initWithVideoStreamingConfiguration:audioStreamingConfiguration:stream:dns:
@@ -287,10 +287,10 @@ typedef void (^PLStreamDiagnosisResultHandler)(NSString * _Nullable diagnosisRes
  
  @since      v1.0.0
  */
-- (instancetype)initWithVideoStreamingConfiguration:(PLVideoStreamingConfiguration *)videoStreamingConfiguration
-                        audioStreamingConfiguration:(PLAudioStreamingConfiguration *)audioStreamingConfiguration
-                                             stream:(PLStream *)stream
-                                                dns:(QNDnsManager *)dns;
+- (instancetype)initWithVideoStreamingConfiguration:(nullable PLVideoStreamingConfiguration *)videoStreamingConfiguration
+                        audioStreamingConfiguration:(nullable PLAudioStreamingConfiguration *)audioStreamingConfiguration
+                                             stream:(nullable PLStream *)stream
+                                                dns:(nullable QNDnsManager *)dns;
 
 /*!
  @method     destroy

diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework/Info.plist b/Pod/Library-Universal/PLMediaStreamingKit.framework/Info.plist
diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework/PLMediaStreamingKit b/Pod/Library-Universal/PLMediaStreamingKit.framework/PLMediaStreamingKit
diff --git a/Pod/Library/PLMediaStreamingKit.framework/Headers/PLAudioSession.h b/Pod/Library/PLMediaStreamingKit.framework/Headers/PLAudioSession.h
@@ -9,6 +9,8 @@
 #import <AVFoundation/AVFoundation.h>
 #import <Foundation/Foundation.h>
 
+typedef void (^PermissionBlock)(BOOL granted);
+
 NS_ASSUME_NONNULL_BEGIN
 
 /*! Proxy class for AVAudioSession that adds a locking mechanism similar to