2721

Example/OffcnLiveSDKiOS.xcodeproj/project.pbxproj

@@ -249,8 +249,8 @@
 				ORGANIZATIONNAME = "zhangyunjie  ";
 				TargetAttributes = {
 					6003F589195388D20070C39A = {
-						DevelopmentTeam = 8Q487MWDUF;
-						ProvisioningStyle = Automatic;
+						DevelopmentTeam = LA78A3696S;
+						ProvisioningStyle = Manual;
 					};
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
@@ -523,9 +523,9 @@
 			baseConfigurationReference = 93D1E234B11F13A8A49A11EB /* Pods-OffcnLiveSDKiOS_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 8Q487MWDUF;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = LA78A3696S;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Prefix.pch";
@@ -533,9 +533,9 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MODULE_NAME = ExampleApp;
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = offcn1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.questions;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = WXQuestionDev;
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
 			};
@@ -546,18 +546,18 @@
 			baseConfigurationReference = D6184155640B8A41D8A765B9 /* Pods-OffcnLiveSDKiOS_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 8Q487MWDUF;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = LA78A3696S;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Prefix.pch";
 				INFOPLIST_FILE = "OffcnLiveSDKiOS/OffcnLiveSDKiOS-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = offcn1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.eoffcn.questions;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = WXQuestionDev;
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
 			};

Example/OffcnLiveSDKiOS/OffcnLiveSDKiOS-Info.plist

@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -29,6 +24,11 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>

OffcnLiveSDKiOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'OffcnLiveSDKiOS'
-  s.version          = '2.7.2.0'
+  s.version          = '2.7.2.1'
   s.summary          = 'OffcnLiveSDKiOS.'
 
   s.description      = <<-DESC

OffcnLiveSDKiOS/Classes/OffcnDownloadManager.h

@@ -256,4 +256,8 @@ typedef void(^downloadM3u8CallBack)(BOOL isSuccess, NSError *error);
 - (void)downloadResource_nextUrlWithDocumentPath:(NSString *)documentPath password:(NSString *)password urlStr:(NSString *)urlStr;
 //白板回放退出房间移除下载的文件
 -(void)remuvePlaybackWhiteboardAllFileWithPassword:(NSString *)password documentPath:(NSString *)documentPath;
+
+
+//开启画中画获取m3u8_pipContent
+- (void)pip_downloadm3u8WithModel:(OffcnDownloadManagerModel *)model finished:(void(^)(BOOL success,NSString *m3u8_pipContent))finished;
 @end

OffcnLiveSDKiOS/Classes/OffcnLiveSDK.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "OffcnShareWindow.h"
 
-static const NSString *OffcnLiveSDKVersion = @"2.7.2.0";
+static const NSString *OffcnLiveSDKVersion = @"2.7.2.1";
 
 //事件通知
 #define kOffcnEventNotification @"kOffcnEventNotification"

OffcnLiveSDKiOS/Frameworks/ZGIJKMediaFramework.framework/Headers/ZGIJKAVMoviePlayerController.h

@@ -74,8 +74,8 @@
 
 @interface ZGIJKAVMoviePlayerController : NSObject <ZGIJKMediaPlayback,AVAssetResourceLoaderDelegate/*,AVPictureInPictureControllerDelegate*/>
 
-- (id)initWithContentURL:(NSURL *)aUrl;
-- (id)initWithContentURLString:(NSString *)aUrl;
+- (id)initWithContentURL:(NSURL *)aUrl picinpicDelegate:(id)picinpicDelegate;
+- (id)initWithContentURLString:(NSString *)aUrl picinpicDelegate:(id)picinpicDelegate;
 - (id)initWithContentWithKey:(NSString*)m3u8Context m3u8Key:(NSString*)m3u8Key picinpicDelegate:(id)picinpicDelegate;
 + (id)getInstance:(NSString *)aUrl;
 

OffcnLiveSDKiOS/Frameworks/ZGIJKMediaFramework.framework/Headers/ZGMoviePlayer.h

@@ -101,6 +101,8 @@ typedef enum ZGPlayerType {
 //avplayer 播放加密视频开启画中画功能
 - (BOOL)setM3u8ContextToAVPlayer:(NSString*)m3u8Context m3u8Key:(NSString*)m3u8Key picinpicDelegate:(id)picinpicDelegate;
 
+- (BOOL)setContentURLToAVPlayer:(NSURL *)aUrl picinpicDelegate:(id)picinpicDelegate;
+
 //开启画中画功能
 - (BOOL)startPictureinPicture;